From 8314fa956e3cb9554b185d144215932f27a5b3a4 Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 22 Aug 2013 14:24:50 +0000 Subject: [PATCH] Speedup Makefiles git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30418 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_deal_ii_add_test.cmake | 4 ++++ deal.II/cmake/scripts/run_test.cmake | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake index 39434867ed..8b80bf7741 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake @@ -111,10 +111,14 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff ) + IF(CMAKE_GENERATOR MATCHES "Makefiles") + SET(_test_suffix "/fast") + ENDIF() ADD_TEST(NAME ${_category}/${_test} COMMAND ${CMAKE_COMMAND} -DTEST=${_test} + -DTEST_SUFFIX=${_test_suffix} -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/scripts/run_test.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_test} diff --git a/deal.II/cmake/scripts/run_test.cmake b/deal.II/cmake/scripts/run_test.cmake index f0a6a438cd..c488a1e3a6 100644 --- a/deal.II/cmake/scripts/run_test.cmake +++ b/deal.II/cmake/scripts/run_test.cmake @@ -1,13 +1,14 @@ # -# The following variables have to be set: +# TODO: The following variables have to be set: # # TEST +# TEST_SUFFIX # DEAL_II_BINARY_DIR # -MACRO(CALLBACK _target _msg_success _msg_error) +MACRO(CALLBACK _target _target_suffix _msg_success _msg_error) EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} - --build ${DEAL_II_BINARY_DIR} --target ${_target} + --build ${DEAL_II_BINARY_DIR} --target ${_target}${_target_suffix} RESULT_VARIABLE _result_code OUTPUT_VARIABLE _output ) @@ -24,15 +25,15 @@ MACRO(CALLBACK _target _msg_success _msg_error) ENDMACRO() -CALLBACK(${TEST} +CALLBACK(${TEST} "${TEST_SUFFIX}" "Build successful" "BUILD FAILED" ) -CALLBACK(${TEST}.run +CALLBACK(${TEST} ".run" "Run successful" "RUN FAILED" ) -CALLBACK(${TEST}.diff +CALLBACK(${TEST} ".diff" "Diff successful" "DIFF FAILED" ) -- 2.39.5