Testsuite: Remove test override location mechanism.

git-svn-id: https://svn.dealii.org/trunk@31833 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 8c3843a2fb3955223a588511a3ff3ab912ac8e4e..c4a2b90a1eddd4deadeb96f1900bcb857d784953 100644 (file)
--- a/deal.II/cmake/macros/macro_add_test.cmake
+++ b/deal.II/cmake/macros/macro_add_test.cmake
@@ -31,12 +31,9 @@
 #     DEAL_II_ADD_TEST(category test_name comparison_file [ARGN])
 #
 # This macro assumes that a source file "./tests/category/<test_name>.cc"
-# as well as the comparison file "./tests/category/<comparison_file>" is
-# available in the testsuite. The output of compiled source file is
-# compared against the file comparison file.
-#
-# [ARGN] is an optional list of additional output lines passed down to the
-# run_test.cmake script and printed at the beginning of the test output.
+# as well as the comparison file "<comparison_file>" is available in the
+# testsuite. The output of compiled source file is compared against the
+# file comparison file.
 #
 # This macro gets the following options from the comparison file name (have
 # a look at the testsuite documentation for details):
@@ -246,7 +243,6 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file)
           -DTRGT=${_diff_target}
           -DTEST=${_test_full}
           -DEXPECT=${_expect}
-          -DADDITIONAL_OUTPUT=${ARGN}
           -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR}
           -DGUARD_FILE=${CMAKE_CURRENT_BINARY_DIR}/${_target}/interrupt_guard.cc
           -P ${DEAL_II_SOURCE_DIR}/cmake/scripts/run_test.cmake
@@ -263,7 +259,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file)
       # when compiling the not yet existent executable that is shared
       # between the different tests.
       #
-      # Luckily CMake has a mechanism to force a test to be run when
+      # Luckily CMake has a mechanism to force a test to be run after
       # another has finished (and both are scheduled):
       #
       IF(NOT "${_n_cpu}" STREQUAL "0")

diff --git a/deal.II/cmake/macros/macro_pickup_tests.cmake b/deal.II/cmake/macros/macro_pickup_tests.cmake
index 45b69eddce6171e86b21f5220efe21e7b45fd636..5db7a1a1b177af48cdd3e029f83b1513aed467c4 100644 (file)
--- a/deal.II/cmake/macros/macro_pickup_tests.cmake
+++ b/deal.II/cmake/macros/macro_pickup_tests.cmake
@@ -82,18 +82,6 @@ The feature \"DEAL_II_${_feature}\" does not exist.\n"
       ENDIF()
     ENDFOREACH()
 
-    #
-    # Respect TEST_OVERRIDE_LOCATION:
-    #
-
-    SET(_add_output)
-    IF(EXISTS ${TEST_OVERRIDE_LOCATION}/${_category}/${_test})
-      SET(_add_output
-        "!!NOTE!! Comparison file overriden by ${TEST_OVERRIDE_LOCATION}/${_category}/${_test}"
-        )
-      SET(_comparison "${TEST_OVERRIDE_LOCATION}/${_category}/${_test}")
-    ENDIF()
-
     IF(_define_test)
       STRING(REGEX REPLACE "\\..*" "" _test ${_test})
       DEAL_II_ADD_TEST(${_category} ${_test} ${_comparison} ${_add_output})

diff --git a/deal.II/cmake/scripts/run_test.cmake b/deal.II/cmake/scripts/run_test.cmake
index cb815aae64db82112f075b63b382875370e6f5fc..47b7db7f87b2cf0160f85084d9e50f02fb884913 100644 (file)
--- a/deal.II/cmake/scripts/run_test.cmake
+++ b/deal.II/cmake/scripts/run_test.cmake
@@ -28,8 +28,6 @@
 #            (return value 0)
 #            Possible values are CONFIGURE, BUILD, RUN, DIFF, PASSED
 #
-#   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}_bck is put back
 #                in place as ${GUARD_FILE} and on exit ${GUARD_FILE} is
@@ -90,10 +88,6 @@ ENDIF()
 
 MESSAGE("Test ${TEST}: ${_stage}")
 
-FOREACH(_line ${ADDITIONAL_OUTPUT})
-  MESSAGE("Test ${TEST}: ${_line}")
-ENDFOREACH()
-
 MESSAGE("===============================   OUTPUT BEGIN  ===============================")
 
 IF("${_stage}" STREQUAL "PASSED")

diff --git a/deal.II/doc/developers/testsuite.html b/deal.II/doc/developers/testsuite.html
index 2cbdfad8d8587a893a941b4bc3fa132113e45ab8..88a52cce3401a136332810961491f8632876766f 100644 (file)
--- a/deal.II/doc/developers/testsuite.html
+++ b/deal.II/doc/developers/testsuite.html
@@ -176,11 +176,6 @@ TEST_TIME_LIMIT
 TEST_PICKUP_REGEX
   - A regular expression to select only a subset of tests during setup.
     An empty string is interpreted as a catchall (this is the default).
-
-TEST_OVERRIDE_LOCATION
-  - If TEST_OVERRIDE_LOCATION is set, a comparison file category/test.output
-    will be substituted by ${TEST_OVERRIDE_LOCATION}/category/test.output if
-    the latter exists.
 </pre>
     </p>