From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Wed, 16 Oct 2013 09:36:21 +0000 (+0000)
Subject: Bugfix: remove stale failing_* files, provide some more information in failing RUN... 
X-Git-Tag: v8.1.0~570^2~50
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34714d1bc2bbe8510e837cc56ed144037d62615b;p=dealii.git

Bugfix: remove stale failing_* files, provide some more information in failing RUN and DIFF stages

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 d72051027c..bf6c32a37e 100644
--- 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)