From 0327e183440bc7c91aeb11f7bd1b2a282a8f8e0a Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 12 Feb 2022 14:42:57 -0600 Subject: [PATCH] CMake: allow to use TEST_PICKUP_REGEX with run_performance_tests.cmake --- tests/run_performance_tests.cmake | 1 - tests/run_testsuite.cmake | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/run_performance_tests.cmake b/tests/run_performance_tests.cmake index 5727922957..d10643c466 100644 --- a/tests/run_performance_tests.cmake +++ b/tests/run_performance_tests.cmake @@ -11,7 +11,6 @@ SET_IF_EMPTY(SKIP_SUMBISSION TRUE) SET(CMAKE_BUILD_TYPE Release) SET(DEAL_II_COMPILE_EXAMPLES FALSE) -SET(TEST_PICKUP_REGEX "^performance") SET(ENABLE_PERFORMANCE_TESTS TRUE) diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake index 6652789304..56be0e6395 100644 --- a/tests/run_testsuite.cmake +++ b/tests/run_testsuite.cmake @@ -537,11 +537,15 @@ IF("${_res}" STREQUAL "0") " ) ENDIF() + + SET(_target setup_tests_performance) + ELSE() + SET(_target setup_tests) ENDIF() - MESSAGE("-- Running setup_tests") + MESSAGE("-- Running ${_target}") EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} - --build . --target setup_tests + --build . --target ${_target} -- ${MAKEOPTS} WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} OUTPUT_QUIET -- 2.39.5