From cd25e3a7415b54df921fc6cc66d202014ab0012d Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 24 Oct 2013 19:53:18 +0000 Subject: [PATCH] Comment code, rename guard files git-svn-id: https://svn.dealii.org/trunk@31408 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_add_test.cmake | 14 ++++++++++---- deal.II/cmake/scripts/run_test.cmake | 4 ++-- deal.II/tests/all-headers/CMakeLists.txt | 14 ++++++++++---- deal.II/tests/build_tests/CMakeLists.txt | 14 ++++++++++---- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/deal.II/cmake/macros/macro_add_test.cmake b/deal.II/cmake/macros/macro_add_test.cmake index 517f39e692..fc95f00172 100644 --- a/deal.II/cmake/macros/macro_add_test.cmake +++ b/deal.II/cmake/macros/macro_add_test.cmake @@ -130,13 +130,19 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file) IF(NOT TARGET ${_target}) # only add the target once + # + # Add a "guard file" rule: The purpose of interrupt_guard.cc is to + # force a complete rerun of this test (BUILD, RUN and DIFF stage) + # if interrupt_guard.cc is removed by run_test.cmake due to an + # interruption. + # ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_target}/timeout_guard.cc - COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/${_target}/timeout_guard.cc + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_target}/interrupt_guard.cc + COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/${_target}/interrupt_guard.cc ) ADD_EXECUTABLE(${_target} EXCLUDE_FROM_ALL ${_test_name}.cc - ${CMAKE_CURRENT_BINARY_DIR}/${_target}/timeout_guard.cc + ${CMAKE_CURRENT_BINARY_DIR}/${_target}/interrupt_guard.cc ) SET_TARGET_PROPERTIES(${_target} PROPERTIES @@ -225,7 +231,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file) -DEXPECT=${_expect} -DADDITIONAL_OUTPUT=${ARGN} -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} - -DGUARD_FILE=${CMAKE_CURRENT_BINARY_DIR}/${_target}/timeout_guard.cc + -DGUARD_FILE=${CMAKE_CURRENT_BINARY_DIR}/${_target}/interrupt_guard.cc -P ${DEAL_II_SOURCE_DIR}/cmake/scripts/run_test.cmake WORKING_DIRECTORY ${_test_directory} ) diff --git a/deal.II/cmake/scripts/run_test.cmake b/deal.II/cmake/scripts/run_test.cmake index 42e4922362..13c6252d3a 100644 --- a/deal.II/cmake/scripts/run_test.cmake +++ b/deal.II/cmake/scripts/run_test.cmake @@ -31,9 +31,9 @@ # ADDITIONAL_OUTPUT - A list of additional output lines that should be printed # # GUARD_FILE - used to detect a forced interruption of this script: On -# startup the backed up file ${GUARD_FILE}_back is put back +# startup the backed up file ${GUARD_FILE}_bck is put back # in place as ${GUARD_FILE} and on exit ${GUARD_FILE} is -# backed up as ${GUARD_FILE}_back. If on startup a stale +# backed up as ${GUARD_FILE}_bck. If on startup a stale # ${GUARD_FILE} is found, it is deleted. # diff --git a/deal.II/tests/all-headers/CMakeLists.txt b/deal.II/tests/all-headers/CMakeLists.txt index 62fd18c942..f1aa8509a7 100644 --- a/deal.II/tests/all-headers/CMakeLists.txt +++ b/deal.II/tests/all-headers/CMakeLists.txt @@ -51,14 +51,20 @@ FOREACH(_full_file ${_header}) IF( "${TEST_PICKUP_REGEX}" STREQUAL "" OR _test MATCHES "${TEST_PICKUP_REGEX}" ) + # + # Add a "guard file" rule: The purpose of interrupt_guard.cc is to + # force a complete rerun of this test (BUILD stage) if + # interrupt_guard.cc is removed by run_test.cmake due to an + # interruption. + # ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_target}_timeout_guard.cc - COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/${_target}_timeout_guard.cc + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_target}_interrupt_guard.cc + COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/${_target}_interrupt_guard.cc ) # Add an object library for each header file and build configuration: ADD_LIBRARY(${_target} OBJECT EXCLUDE_FROM_ALL test_header.cc - ${CMAKE_CURRENT_BINARY_DIR}/${_target}_timeout_guard.cc + ${CMAKE_CURRENT_BINARY_DIR}/${_target}_interrupt_guard.cc ) SET_TARGET_PROPERTIES(${_target} PROPERTIES @@ -84,7 +90,7 @@ FOREACH(_full_file ${_header}) ADD_TEST(NAME ${_test} COMMAND ${CMAKE_COMMAND} -DTRGT=${_target}.build -DTEST=${_test} -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} - -DGUARD_FILE=${CMAKE_CURRENT_BINARY_DIR}/${_target}_timeout_guard.cc + -DGUARD_FILE=${CMAKE_CURRENT_BINARY_DIR}/${_target}_interrupt_guard.cc -P ${DEAL_II_SOURCE_DIR}/cmake/scripts/run_test.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/deal.II/tests/build_tests/CMakeLists.txt b/deal.II/tests/build_tests/CMakeLists.txt index 6916213740..8847d559e9 100644 --- a/deal.II/tests/build_tests/CMakeLists.txt +++ b/deal.II/tests/build_tests/CMakeLists.txt @@ -74,10 +74,16 @@ FOREACH(_step_full ${_steps}) ENDIF() ENDFOREACH() + # + # Add a "guard file" rule: The purpose of interrupt_guard is to force + # a complete rerun of this test (CONFIGURE, BUILD and RUN stage) if + # interrupt_guard is removed by run_test.cmake due to an + # interruption. + # ADD_CUSTOM_COMMAND( - OUTPUT ${_step_dir}/timeout_guard + OUTPUT ${_step_dir}/interrupt_guard COMMAND ${CMAKE_COMMAND} -E make_directory ${_step_dir} - COMMAND touch ${_step_dir}/timeout_guard + COMMAND touch ${_step_dir}/interrupt_guard ) # A rule how to copy the example step to the current directory: @@ -87,7 +93,7 @@ FOREACH(_step_full ${_steps}) ${_files} ${DEAL_II_TARGET_DEBUG} ${DEAL_II_TARGET_RELEASE} - ${_step_dir}/timeout_guard + ${_step_dir}/interrupt_guard ) # And a rule on how to configure the example step: @@ -175,7 +181,7 @@ FOREACH(_step_full ${_steps}) ADD_TEST(NAME ${_test} COMMAND ${CMAKE_COMMAND} -DTRGT=${_target} -DTEST=${_test} -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} - -DGUARD_FILE=${_step_dir}/timeout_guard + -DGUARD_FILE=${_step_dir}/interrupt_guard -P ${DEAL_II_SOURCE_DIR}/cmake/scripts/run_test.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) -- 2.39.5