CMake: allow to use TEST_PICKUP_REGEX with run_performance_tests.cmake

diff --git a/tests/run_performance_tests.cmake b/tests/run_performance_tests.cmake
index 572792295731dc18f1be4bdd20458ac3da61fb37..d10643c4660ea137cdcc1ec4b8c97ae067d44fe5 100644 (file)
--- 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 665278930437e37af3ed811eede3640edb31c2dc..56be0e6395451cdf35a0689815ed20865ac3e9ce 100644 (file)
--- 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