]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
quicktests: revert part of r31930
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 8 Dec 2013 02:49:30 +0000 (02:49 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 8 Dec 2013 02:49:30 +0000 (02:49 +0000)
git-svn-id: https://svn.dealii.org/trunk@31935 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/tests/quick_tests/CMakeLists.txt

index 37ff9f5df2a20a4b32a9f6de70f0e76009f44056..2a37c13820a3c69f8b41c879d500f8cbc7799d24 100644 (file)
@@ -39,6 +39,7 @@ MACRO(make_quicktest test_basename build_name mpi_run)
     SET(_command mpirun -n ${mpi_run} ./${_target})
   ENDIF()
   ADD_CUSTOM_TARGET(${_target}.run
+    DEPENDS kill-${_target}-OK
     DEPENDS ${_target}
     COMMAND
       ${_command} > ${_target}-OK 2>&1
@@ -50,6 +51,16 @@ MACRO(make_quicktest test_basename build_name mpi_run)
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
 
+  # this is a hack to make sure the -OK file is deleted
+  # even if compilation fails.
+  ADD_CUSTOM_TARGET(kill-${_target}-OK
+        COMMAND rm -f ${_target}-OK 
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+  # make sure kill is run before running the task
+  ADD_DEPENDENCIES(${_target} kill-${_target}-OK)
+
   ADD_TEST(NAME ${_target}
     COMMAND ${CMAKE_COMMAND} -DTRGT=${_target}.run -DTEST=${_target}
       -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR}

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.