From 0407486316439429615ba62040f01119f0e82237 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Wed, 28 Sep 2016 10:08:12 -0400
Subject: [PATCH] tests: Rename CONFIG_TESTING_ALBUM_ARTWORK to
 CONFIG_TESTING_ARTWORK

This makes the flag a little easier to toggle for testing.  I also
rename the compiler option for consistency.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 CMakeLists.txt          | 2 +-
 tests/CMakeLists.txt    | 4 ++--
 tests/core/tags/album.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d26c7c58..a9a5dda6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(Ocarina)
 option(CONFIG_DEBUG "Compile with debugging symbols" OFF)
 option(CONFIG_TESTING_VERBOSE "Enable verbose output when running tests" OFF)
 option(CONFIG_TESTING_GUI "Enable running GUI tests (requires an X server)" ON)
-option(CONFIG_TESTING_ALBUM_ARTWORK "Enable album art fetching tests" ON)
+option(CONFIG_TESTING_ARTWORK "Enable album artwork fetching tests" ON)
 
 # Configure settings
 set(CONFIG_MAJOR 6)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6263086e..c06ad2fe 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_definitions(${DEBUG_OPTIONS} -DCONFIG_TESTING)
-if (CONFIG_TESTING_ALBUM_ARTWORK)
-	add_definitions(${DEBUG_OPTIONS} -DCONFIG_ALBUM_ART_TEST)
+if (CONFIG_TESTING_ARTWORK)
+	add_definitions(${DEBUG_OPTIONS} -DCONFIG_TESTING_ARTWORK)
 endif()
 
 # Handle files that depend on CONFIG_TESTING_DIR
diff --git a/tests/core/tags/album.c b/tests/core/tags/album.c
index 226c47f0..d43e87e8 100644
--- a/tests/core/tags/album.c
+++ b/tests/core/tags/album.c
@@ -124,7 +124,7 @@ static void test_album_db()
 	db_deinit(&album_db);
 }
 
-#ifdef CONFIG_ALBUM_ART_TEST
+#ifdef CONFIG_TESTING_ARTWORK
 static void test_album_artwork()
 {
 	struct album *ocarina, *majora, *wind, *ocarina_3d;
@@ -176,7 +176,7 @@ static void test_album_artwork()
 	g_free(m_path);
 	g_free(w_path);
 }
-#endif /* CONFIG_ALBUM_ART_TEST */
+#endif /* CONFIG_TESTING_ARTWORK */
 
 int main(int argc, char **argv)
 {
@@ -190,9 +190,9 @@ int main(int argc, char **argv)
 	g_test_add_func("/Core/Tags/Album", test_album);
 	g_test_add_func("/Core/Tags/Album/Comparison", test_album_compare);
 	g_test_add_func("/Core/Tags/Album/Database", test_album_db);
-#ifdef CONFIG_ALBUM_ART_TEST
+#ifdef CONFIG_TESTING_ARTWORK
 	g_test_add_func("/Core/Tags/Album/Artwork", test_album_artwork);
-#endif /* CONFIG_ALBUM_ART_TEST */
+#endif /* CONFIG_TESTING_ARTWORK */
 	ret = g_test_run();
 
 	album_db_deinit();