From 1926cb35d77f4eaa8d2b23aac8ded01a5c181aa7 Mon Sep 17 00:00:00 2001
From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 18 Sep 2013 14:14:15 +0000
Subject: [PATCH] Bugfixes

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30790 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/run_testsuite.cmake             |  6 ++++++
 tests/build_tests/CMakeLists.txt        | 22 +++++++++++++++-------
 tests/cmake/macros/macro_add_test.cmake | 13 +++++++------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/deal.II/run_testsuite.cmake b/deal.II/run_testsuite.cmake
index bb9f9e766b..77541abdcc 100644
--- a/deal.II/run_testsuite.cmake
+++ b/deal.II/run_testsuite.cmake
@@ -71,6 +71,12 @@ ENDIF()
 
 MESSAGE("-- DEAL_II_NO_JOBS: ${DEAL_II_NO_JOBS}")
 
+SET(CMAKE_EXTRA_SUBMIT_FILES
+  ${CTEST_BINARY_DIRECTORY}/detailed.log
+  # TODO
+  )
+
+
 
 ########################################################################
 #                                                                      #
diff --git a/tests/build_tests/CMakeLists.txt b/tests/build_tests/CMakeLists.txt
index 804b046790..bfd0d9217b 100644
--- a/tests/build_tests/CMakeLists.txt
+++ b/tests/build_tests/CMakeLists.txt
@@ -132,11 +132,6 @@ FOREACH(_step_full ${_steps})
               && rm -f ${_step_dir}/failing_run_output
               && echo "${_test}: RUN stage not invoked due to failing BUILD"
               && exit 1)
-        COMMAND
-             echo "${_test}: CONFIGURE successful."
-          && echo "${_test}: BUILD successful."
-          && echo "${_test}: RUN successful."
-          && echo "${_test}: PASSED."
         WORKING_DIRECTORY ${_step_dir}
         DEPENDS ${_step_dir}/build_output
         )
@@ -145,11 +140,24 @@ FOREACH(_step_full ${_steps})
       IF(_match)
         # Add a full test (CONFIGURE, BUILD, RUN):
         SET(_target ${_category}-${_step}.${_build_lowercase}.run)
-        ADD_CUSTOM_TARGET(${_target} DEPENDS ${_step_dir}/run_output)
+        ADD_CUSTOM_TARGET(${_target}
+          COMMAND
+               echo "${_test}: CONFIGURE successful."
+            && echo "${_test}: BUILD successful."
+            && echo "${_test}: RUN successful."
+            && echo "${_test}: PASSED."
+          DEPENDS ${_step_dir}/run_output
+          )
       ELSE()
         # Add a minimal test (CONFIGURE, BUILD):
         SET(_target ${_category}-${_step}.${_build_lowercase}.build)
-        ADD_CUSTOM_TARGET(${_target} DEPENDS ${_step_dir}/build_output)
+        ADD_CUSTOM_TARGET(${_target}
+          COMMAND
+               echo "${_test}: CONFIGURE successful."
+            && echo "${_test}: BUILD successful."
+            && echo "${_test}: PASSED."
+          DEPENDS ${_step_dir}/build_output
+          )
       ENDIF()
 
       # And finally add the test:
diff --git a/tests/cmake/macros/macro_add_test.cmake b/tests/cmake/macros/macro_add_test.cmake
index 639bc90288..89180d642f 100644
--- a/tests/cmake/macros/macro_add_test.cmake
+++ b/tests/cmake/macros/macro_add_test.cmake
@@ -157,11 +157,6 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu)
               && echo "${_test_full}: DIFF failed. Output:"
               && cat ${_test_directory}/failing_diff
               && exit 1)
-        COMMAND
-             echo "${_test_full}: BUILD successful."
-          && echo "${_test_full}: RUN successful."
-          && echo "${_test_full}: DIFF successful."
-          && echo "${_test_full}: PASSED."
         WORKING_DIRECTORY
           ${_test_directory}
         DEPENDS
@@ -169,7 +164,13 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu)
           ${_comparison_file}
         )
 
-      ADD_CUSTOM_TARGET(${_diff_target} DEPENDS ${_test_directory}/diff)
+      ADD_CUSTOM_TARGET(${_diff_target} DEPENDS ${_test_directory}/diff
+        COMMAND
+             echo "${_test_full}: BUILD successful."
+          && echo "${_test_full}: RUN successful."
+          && echo "${_test_full}: DIFF successful."
+          && echo "${_test_full}: PASSED."
+        )
 
       #
       # And finally add the test:
-- 
2.39.5