Bugfix: remove stale failing_* files, provide some more information in failing RUN...

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31251 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/macros/macro_add_test.cmake b/deal.II/cmake/macros/macro_add_test.cmake
index d72051027c087a408df0fad3b524a1e28a96ec8e..bf6c32a37ee2eb4f2b4eb9fd07124f234b029ee2 100644 (file)
--- a/deal.II/cmake/macros/macro_add_test.cmake
+++ b/deal.II/cmake/macros/macro_add_test.cmake
@@ -123,13 +123,15 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu)
       #
 
       ADD_CUSTOM_COMMAND(OUTPUT ${_test_directory}/output
+        COMMAND rm -f ${_test_directory}/failing_output
         COMMAND touch ${_test_directory}/output
         COMMAND
           ${_run_command}
           || (mv ${_test_directory}/output
                  ${_test_directory}/failing_output
               && echo "${_test_full}: BUILD successful."
-              && echo "${_test_full}: RUN failed. Output:"
+              && echo "${_test_full}: RUN failed. ------ Result: ${_test_directory}/failing_output"
+              && echo "${_test_full}: RUN failed. ------ Partial output:"
               && cat ${_test_directory}/failing_output
               && exit 1)
         COMMAND
@@ -142,6 +144,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu)
           ${DEAL_II_SOURCE_DIR}/cmake/scripts/normalize.pl
         )
       ADD_CUSTOM_COMMAND(OUTPUT ${_test_directory}/diff
+        COMMAND rm -f ${_test_directory}/failing_diff
         COMMAND touch ${_test_directory}/diff
         COMMAND
           ${TEST_DIFF}
@@ -154,6 +157,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu)
               && echo "${_test_full}: RUN successful."
               && echo "${_test_full}: DIFF failed. ------ Source: ${_comparison_file}"
               && echo "${_test_full}: DIFF failed. ------ Result: ${_test_directory}/output"
+              && echo "${_test_full}: DIFF failed. ------ Diff:   ${_test_directory}/failing_diff"
               && echo "${_test_full}: DIFF failed. ------ Diffs as follows:"
               && cat ${_test_directory}/failing_diff
               && exit 1)