From: maier Date: Fri, 23 Aug 2013 05:06:23 +0000 (+0000) Subject: Bugfix X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=872affb7850ecc4c0825e49109a2a1f117da6dd0;p=dealii-svn.git Bugfix git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30447 0785d39b-7218-0410-832d-ea1e28bc413d --- 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 b88892fdde..bb85118091 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake @@ -81,7 +81,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) # - # Add a top level target to run the test and compare the output: + # Add a top level target to run the test... # ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output COMMAND ${_full_test} @@ -93,6 +93,9 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) DEPENDS ${_full_test} ${CMAKE_SOURCE_DIR}/cmake/scripts/normalize.pl ) + # + # and compare the output: + # SET(_comparison ${CMAKE_CURRENT_SOURCE_DIR}/${_test_name}) IF(EXISTS ${_comparison}.${_build_lowercase}.output) SET(_comparison ${_comparison}.${_build_lowercase}.output) @@ -100,16 +103,28 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) SET(_comparison ${_comparison}.output) ENDIF() - ADD_CUSTOM_TARGET(${_full_test}.diff + + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff + COMMAND + # TODO: Refactor... + ${DEAL_II_TEST_DIFF} + ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output + ${_comparison} + > ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff + || mv + ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff + ${CMAKE_CURRENT_BINARY_DIR}/${_test}/failing_diff COMMAND ${DEAL_II_TEST_DIFF} ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output ${_comparison} - > ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output ${_comparison} ) + ADD_CUSTOM_TARGET(${_full_test}.diff + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff + ) # diff --git a/deal.II/cmake/scripts/run_test.cmake b/deal.II/cmake/scripts/run_test.cmake index 44ffaafe0e..56943a46f4 100644 --- a/deal.II/cmake/scripts/run_test.cmake +++ b/deal.II/cmake/scripts/run_test.cmake @@ -12,16 +12,16 @@ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} ) IF("${_result_code}" STREQUAL "0") - MESSAGE("*** ***") - MESSAGE("${TEST}: Diff successful") - MESSAGE(${_output}) - MESSAGE("*** ***") + MESSAGE("${TEST}: BUILD successful") + MESSAGE("${TEST}: RUN successful") + MESSAGE("${TEST}: DIFF successful") ELSE() - MESSAGE("*** ***") - MESSAGE("${TEST}: Diff failed:") + MESSAGE("*** ***") MESSAGE(${_output}) - MESSAGE("*** ***") + # TODO: Be a bit more verbose ;-) + MESSAGE("${TEST}: TEST failed") + MESSAGE("*** ***") MESSAGE(FATAL_ERROR "*** Test aborted.") ENDIF() diff --git a/tests/fe/fe_face_orientation_nedelec_010.output b/tests/fe/fe_face_orientation_nedelec_010.output index 5933716ced..fad073357a 100644 --- a/tests/fe/fe_face_orientation_nedelec_010.output +++ b/tests/fe/fe_face_orientation_nedelec_010.output @@ -1,5 +1,4 @@ -32 DEAL::0 0 0 DEAL::0 0 0 DEAL::0 0 0