simplify dependency handling of unit tests

FluidSynth · Apr 21, 2018 · c433fc8 · c433fc8
1 parent 7987446
commit c433fc8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/cmake_admin/FluidUnitTest.cmake b/cmake_admin/FluidUnitTest.cmake
@@ -11,5 +11,10 @@ macro ( ADD_FLUID_TEST _test )
     $<TARGET_PROPERTY:libfluidsynth,INCLUDE_DIRECTORIES> # include all other header search paths needed by libfluidsynth (esp. glib)
     )
 
+    # add the test to ctest
     ADD_TEST(NAME ${_test} COMMAND ${_test})
+
+    # append the current unit test to check-target as dependency
+    add_dependencies(check ${_test})
+
 endmacro ( ADD_FLUID_TEST )
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -4,6 +4,10 @@ project(fluidsynth-test)
 ENABLE_TESTING()
 include ( FluidUnitTest )
 
+# first define the test target, used by the macros below
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>  --output-on-failure)
+
+
 ## add unit tests here ##
 ADD_FLUID_TEST(test_sample_cache)
 ADD_FLUID_TEST(test_sfont_loading)
@@ -14,26 +18,3 @@ if ( LIBSNDFILE_HASVORBIS )
     ADD_FLUID_TEST(test_sf3_sfont_loading)
     ADD_FLUID_TEST(test_sf3_defsfont_preset_iteration)
 endif ( LIBSNDFILE_HASVORBIS )
-
-
-if ( LIBSNDFILE_HASVORBIS )
-    add_custom_target(check
-    COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>  --output-on-failure
-    DEPENDS
-    test_sample_cache
-    test_sfont_loading
-    test_defsfont_preset_iteration
-    test_sample_rate_change
-    test_sf3_sfont_loading
-    test_sf3_defsfont_preset_iteration
-    )
-else ( LIBSNDFILE_HASVORBIS )
-    add_custom_target(check
-    COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>  --output-on-failure
-    DEPENDS
-    test_sample_cache
-    test_sfont_loading
-    test_defsfont_preset_iteration
-    test_sample_rate_change
-    )
-endif ( LIBSNDFILE_HASVORBIS )