From b1790e54589cdfd122c5b319c8067162db04bfae Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 21 Aug 2013 05:44:28 +0000 Subject: [PATCH] I want output ;-) git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30365 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_deal_ii_add_test.cmake | 4 ++++ deal.II/cmake/scripts/run_test.cmake | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 9968a5124e..72fb1420f0 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake @@ -95,6 +95,10 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output ${CMAKE_CURRENT_SOURCE_DIR}/${_test_name}.output > ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff + # and a second time to get the output: + COMMAND ${DEAL_II_TEST_DIFF} + ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output + ${CMAKE_CURRENT_SOURCE_DIR}/${_test_name}.output DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output ${CMAKE_CURRENT_SOURCE_DIR}/${_test_name}.output diff --git a/deal.II/cmake/scripts/run_test.cmake b/deal.II/cmake/scripts/run_test.cmake index 7763aa739c..5d6e84f2f8 100644 --- a/deal.II/cmake/scripts/run_test.cmake +++ b/deal.II/cmake/scripts/run_test.cmake @@ -7,7 +7,7 @@ MACRO(CALLBACK _target _msg_success _msg_error) EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} - --build ${DEAL_II_BINARY_DIR} --target ${_target} + --build ${DEAL_II_BINARY_DIR} --target ${_target}/fast RESULT_VARIABLE _result_code OUTPUT_VARIABLE _output ) -- 2.39.5