diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 03bb103c4..51e769f42 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,13 +23,11 @@ add_subdirectory(unit) add_subdirectory(integration) -add_custom_target(tests - DEPENDS unit-tests integration-tests -) +add_custom_target(tests) +add_dependencies(tests unit-tests) -add_custom_target(run-tests - DEPENDS run-unit-tests run-integration-tests -) +add_custom_target(run-tests) +add_dependencies(run-tests run-unit-tests run-integration-tests) set(VALGRIND "valgrind --leak-check=full --show-leak-kinds=all --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp") @@ -38,5 +36,5 @@ add_custom_target(run-valgrind COMMAND ${VALGRIND} $ -t 2 ${CMAKE_SOURCE_DIR}/etc/websocket-loopback.conf ws1 COMMAND ${VALGRIND} $ mixed -v 4 -l 10 COMMAND ${VALGRIND} $ stats < <($ mixed -l 5) - DEPENDS villas-node villas-pipe villas-signal villas-hook ) +add_dependencies(run-valgrind villas-node villas-pipe villas-signal villas-hook) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 1bae9350b..3af2ff45a 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -52,6 +52,8 @@ if(CRITERION_FOUND) add_custom_target(run-unit-tests COMMAND $ ${CRITERION_OPTS} - DEPENDS unit-tests + USES_TERMINAL ) + + add_dependencies(run-unit-tests unit-tests) endif()