]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Bugfix
authorMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 23 Aug 2013 05:06:23 +0000 (05:06 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Fri, 23 Aug 2013 05:06:23 +0000 (05:06 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30447 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_deal_ii_add_test.cmake
deal.II/cmake/scripts/run_test.cmake
tests/fe/fe_face_orientation_nedelec_010.output

index b88892fddee92817da8d198dc434ae16d71cf698..bb85118091534e4f49e359cdf7e5e624d13a77f1 100644 (file)
@@ -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
+        )
 
 
       #
index 44ffaafe0e3b93b4fed0a60e145f9279c6c35ac8..56943a46f47326dde79b068bef3d7f4eaa4efbc3 100644 (file)
@@ -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()
index 5933716ced4c9481d40a713329bea04c7242170e..fad073357a2fb728823b7ef4f1f261f471236dc9 100644 (file)
@@ -1,5 +1,4 @@
 
-32
 DEAL::0  0  0  
 DEAL::0  0  0  
 DEAL::0  0  0  

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.