From cc139b610109aaca721fc7a38156f593bd2a641a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 4 Jul 2018 15:09:53 +0200 Subject: [PATCH] cmake: fix target dependencies for tests --- tests/CMakeLists.txt | 9 +++------ tests/integration/CMakeLists.txt | 1 + tests/unit/CMakeLists.txt | 3 +++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 51e769f42..b0dea03f8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -20,15 +20,12 @@ # along with this program. If not, see . ################################################################################### +add_custom_target(tests) +add_custom_target(run-tests) + add_subdirectory(unit) add_subdirectory(integration) -add_custom_target(tests) -add_dependencies(tests unit-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") add_custom_target(run-valgrind diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index 1cd7fb6df..9b90fd751 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -31,3 +31,4 @@ add_custom_target(run-integration-tests villas-signal villas-hook ) +add_dependencies(run-tests run-integration-tests) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 3af2ff45a..7945614f8 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -55,5 +55,8 @@ if(CRITERION_FOUND) USES_TERMINAL ) + add_dependencies(tests unit-tests) + add_dependencies(run-tests run-unit-tests) + add_dependencies(run-unit-tests unit-tests) endif()