anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Anna Schumaker 2016-09-28 10:08:12 -04:00
parent 9a216fee1e
commit 0407486316
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -5,7 +5,7 @@ project(Ocarina)
option(CONFIG_DEBUG "Compile with debugging symbols" OFF) option(CONFIG_DEBUG "Compile with debugging symbols" OFF)
option(CONFIG_TESTING_VERBOSE "Enable verbose output when running tests" 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_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 # Configure settings
set(CONFIG_MAJOR 6) set(CONFIG_MAJOR 6)

4
tests/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_definitions(${DEBUG_OPTIONS} -DCONFIG_TESTING) add_definitions(${DEBUG_OPTIONS} -DCONFIG_TESTING)
if (CONFIG_TESTING_ALBUM_ARTWORK) if (CONFIG_TESTING_ARTWORK)
add_definitions(${DEBUG_OPTIONS} -DCONFIG_ALBUM_ART_TEST) add_definitions(${DEBUG_OPTIONS} -DCONFIG_TESTING_ARTWORK)
endif() endif()
# Handle files that depend on CONFIG_TESTING_DIR # Handle files that depend on CONFIG_TESTING_DIR

8
tests/core/tags/album.c
View File

@ -124,7 +124,7 @@ static void test_album_db()
db_deinit(&album_db); db_deinit(&album_db);
} }
#ifdef CONFIG_ALBUM_ART_TEST #ifdef CONFIG_TESTING_ARTWORK
static void test_album_artwork() static void test_album_artwork()
{ {
struct album *ocarina, *majora, *wind, *ocarina_3d; struct album *ocarina, *majora, *wind, *ocarina_3d;
@ -176,7 +176,7 @@ static void test_album_artwork()
g_free(m_path); g_free(m_path);
g_free(w_path); g_free(w_path);
} }
#endif /* CONFIG_ALBUM_ART_TEST */ #endif /* CONFIG_TESTING_ARTWORK */
int main(int argc, char **argv) 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", test_album);
g_test_add_func("/Core/Tags/Album/Comparison", test_album_compare); g_test_add_func("/Core/Tags/Album/Comparison", test_album_compare);
g_test_add_func("/Core/Tags/Album/Database", test_album_db); 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); g_test_add_func("/Core/Tags/Album/Artwork", test_album_artwork);
#endif /* CONFIG_ALBUM_ART_TEST */ #endif /* CONFIG_TESTING_ARTWORK */
ret = g_test_run(); ret = g_test_run();
album_db_deinit(); album_db_deinit();