From 85f41c7cf8ef32e150c53ae326eaa1b555dacb81 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 4 Jul 2023 10:08:59 -0500 Subject: [PATCH] Quick tests: now that we have interactive output run debug and release variants --- tests/CMakeLists.txt | 4 +--- tests/run_quick_tests.cmake | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ce5d7a0e44..b07dc512a3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -168,10 +168,8 @@ endforeach() # Define a top-level "test" target that runs our quick tests wrapper. # -# Use the first available build type (this prefers debug mode if available): -list(GET DEAL_II_BUILD_TYPES 0 _my_build) add_custom_target(test - COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=${_my_build} -P ${CMAKE_CURRENT_SOURCE_DIR}/run_quick_tests.cmake + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/run_quick_tests.cmake WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMENT "Running quicktests..." USES_TERMINAL diff --git a/tests/run_quick_tests.cmake b/tests/run_quick_tests.cmake index e242ce2617..201bbee322 100644 --- a/tests/run_quick_tests.cmake +++ b/tests/run_quick_tests.cmake @@ -50,15 +50,10 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18) ) endif() -# -# Always restrict quick tests with specified build type, but run the step -# and affinity quick tests in all available configuration: -# - string(TOLOWER "${CMAKE_BUILD_TYPE}" _build_type) execute_process(COMMAND ${CMAKE_CTEST_COMMAND} -j${_n_processors} -C ${CMAKE_BUILD_TYPE} --force-new-ctest-process - -R "quick_tests/(step.debug|step.release|affinity|.*.${_build_type})" + -R "quick_tests/" --output-on-failure ${_redirect_output} RESULT_VARIABLE _return_value -- 2.39.5