]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 18 Sep 2013 14:14:15 +0000 (14:14 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 18 Sep 2013 14:14:15 +0000 (14:14 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30790 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/run_testsuite.cmake
tests/build_tests/CMakeLists.txt
tests/cmake/macros/macro_add_test.cmake

index bb9f9e766b8b5891bd3003b63a00f09245c7765a..77541abdcc73d4d227207bc6a68711be19093365 100644 (file)
@@ -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
+  )
+
+
 
 ########################################################################
 #                                                                      #
index 804b04679095232e9c5afa86b5d9b91f934de806..bfd0d9217bc8f17fae125248cf16ea5e2497e309 100644 (file)
@@ -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:
index 639bc902887da18b41a86e8a2e11ce2b8891cf08..89180d642fad12d1b2bb0951baeeaadc063a42eb 100644 (file)
@@ -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:

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.