Testsuite: The testsuite needs at least cmake version 2.8.9. Clean up some comments

git-svn-id: https://svn.dealii.org/trunk@31885 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/macros/macro_pickup_tests.cmake b/deal.II/cmake/macros/macro_pickup_tests.cmake
index 69a3950b976a5b176f10305586bb15cd1ef29004..4c702545f3d66ae9d0b4fd76754ef3a36e7695dd 100644 (file)
--- a/deal.II/cmake/macros/macro_pickup_tests.cmake
+++ b/deal.II/cmake/macros/macro_pickup_tests.cmake
@@ -20,10 +20,6 @@
 # If TEST_PICKUP_REGEX is set, only tests matching the regex will be
 # processed.
 #
-# 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.
-#
 # Usage:
 #     DEAL_II_PICKUP_TESTS()
 #

diff --git a/deal.II/cmake/scripts/run_testsuite.cmake b/deal.II/cmake/scripts/run_testsuite.cmake
index 6eb07138209a6f27f1b375daacccfde4e7d08bc0..f4605d67600b3048edb419619c4d71c7637c8032 100644 (file)
--- a/deal.II/cmake/scripts/run_testsuite.cmake
+++ b/deal.II/cmake/scripts/run_testsuite.cmake
@@ -95,7 +95,6 @@
 #   TEST_DIFF
 #   TEST_TIME_LIMIT
 #   TEST_PICKUP_REGEX
-#   TEST_OVERRIDE_LOCATION
 #
 # For details, consult the ./README file.
 #

diff --git a/deal.II/cmake/setup_testsubproject.cmake b/deal.II/cmake/setup_testsubproject.cmake
index e40a16751700f65e930f1ed370307c5cbf864f17..b1bd6bf6ee52aebe0419067e7818a4ea891cdfb5 100644 (file)
--- a/deal.II/cmake/setup_testsubproject.cmake
+++ b/deal.II/cmake/setup_testsubproject.cmake
@@ -29,7 +29,6 @@
 # environment or command line:
 #
 #     TEST_DIFF
-#     TEST_OVERRIDE_LOCATION
 #     TEST_PICKUP_REGEX
 #     TEST_TIME_LIMIT
 #
@@ -51,14 +50,13 @@ FOREACH(_var
   TEST_DIFF
   TEST_TIME_LIMIT
   TEST_PICKUP_REGEX
-  TEST_OVERRIDE_LOCATION
   )
   # Environment wins:
   IF(DEFINED ENV{${_var}})
     SET(${_var} $ENV{${_var}})
   ENDIF()
   IF(NOT "${_var}" STREQUAL "")
-    SET(${_var} "${${_var}}" CACHE STRING "")
+    SET(${_var} "${${_var}}" CACHE STRING "" FORCE)
   ENDIF()
 ENDFOREACH()
 

diff --git a/deal.II/cmake/setup_testsuite.cmake b/deal.II/cmake/setup_testsuite.cmake
index 9dc9756a7429d28186d9cae0df1d398b1e5b23f0..98580373d0b469910c31ec04726fc45d0ac7268a 100644 (file)
--- a/deal.II/cmake/setup_testsuite.cmake
+++ b/deal.II/cmake/setup_testsuite.cmake
@@ -91,8 +91,7 @@ SET(_options)
 LIST(APPEND _options -DDEAL_II_SOURCE_DIR=${CMAKE_SOURCE_DIR})
 LIST(APPEND _options -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR})
 FOREACH(_var
-    DIFF_DIR NUMDIFF_DIR TEST_DIFF TEST_OVERRIDE_LOCATION TEST_PICKUP_REGEX
-    TEST_TIME_LIMIT
+    DIFF_DIR NUMDIFF_DIR TEST_DIFF TEST_PICKUP_REGEX TEST_TIME_LIMIT
     )
   # always undefine:
   LIST(APPEND _options "-U${_var}")

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 164fdebe42bdb57ca85240df1e5a413fe07ff28c..d2e24f415ee8ca9bd426f049e0b1b3b2a58f668b 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 PROJECT(testsuite NONE)
 
 MESSAGE(FATAL_ERROR "\n

diff --git a/tests/a-framework/CMakeLists.txt b/tests/a-framework/CMakeLists.txt
index c2ca3dd75d5b54919e0407d87e607aad21c1e6ae..bf54a929d26b38687e8cdb54eba0e9f0402df647 100644 (file)
--- a/tests/a-framework/CMakeLists.txt
+++ b/tests/a-framework/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/aniso/CMakeLists.txt b/tests/aniso/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/aniso/CMakeLists.txt
+++ b/tests/aniso/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/base/CMakeLists.txt b/tests/base/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/base/CMakeLists.txt
+++ b/tests/base/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/bits/CMakeLists.txt b/tests/bits/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/bits/CMakeLists.txt
+++ b/tests/bits/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/codim_one/CMakeLists.txt b/tests/codim_one/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/codim_one/CMakeLists.txt
+++ b/tests/codim_one/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/deal.II/CMakeLists.txt b/tests/deal.II/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/deal.II/CMakeLists.txt
+++ b/tests/deal.II/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/distributed_grids/CMakeLists.txt b/tests/distributed_grids/CMakeLists.txt
index baeb270640f0c5eee55001a4e5f93073db2f4977..dfac0f1175df7080d5c59b2f525cadd6aba91cd2 100644 (file)
--- a/tests/distributed_grids/CMakeLists.txt
+++ b/tests/distributed_grids/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/fe/CMakeLists.txt b/tests/fe/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/fe/CMakeLists.txt
+++ b/tests/fe/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/gla/CMakeLists.txt b/tests/gla/CMakeLists.txt
index 085a1c60e3d85b14240d6e8726eee9bf2361f51f..e607af42d9c57157bfe026a55e1a823cc30f9605 100644 (file)
--- a/tests/gla/CMakeLists.txt
+++ b/tests/gla/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/grid/CMakeLists.txt b/tests/grid/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/grid/CMakeLists.txt
+++ b/tests/grid/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/hp/CMakeLists.txt b/tests/hp/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/hp/CMakeLists.txt
+++ b/tests/hp/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/integrators/CMakeLists.txt b/tests/integrators/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/integrators/CMakeLists.txt
+++ b/tests/integrators/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/lac/CMakeLists.txt b/tests/lac/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/lac/CMakeLists.txt
+++ b/tests/lac/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/lapack/CMakeLists.txt b/tests/lapack/CMakeLists.txt
index 8887f4f83007f7544c536638b00e0d3df3ec346f..256706d6908ca6d1e1c15849e7b12fd9d8dfcbe9 100644 (file)
--- a/tests/lapack/CMakeLists.txt
+++ b/tests/lapack/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/matrix_free/CMakeLists.txt b/tests/matrix_free/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/matrix_free/CMakeLists.txt
+++ b/tests/matrix_free/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/metis/CMakeLists.txt b/tests/metis/CMakeLists.txt
index e45e9f2adbe37c754b8b25f578443b0aaacabb51..2f77932a2845e10356a2454f8a4d8afcd875dd83 100644 (file)
--- a/tests/metis/CMakeLists.txt
+++ b/tests/metis/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/mpi/CMakeLists.txt b/tests/mpi/CMakeLists.txt
index e8f4a01f4adc8dd3c8853e19a0fc2ccde127ed09..1a535a8522b87a7e2b2c55778dd32141b0d24ddc 100644 (file)
--- a/tests/mpi/CMakeLists.txt
+++ b/tests/mpi/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/multigrid/CMakeLists.txt b/tests/multigrid/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/multigrid/CMakeLists.txt
+++ b/tests/multigrid/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/mumps/CMakeLists.txt b/tests/mumps/CMakeLists.txt
index 73e46fe29dc03e114ca031e4b52924c1cd95270d..0ad0f7032da1795598af41daa313a987318f71fa 100644 (file)
--- a/tests/mumps/CMakeLists.txt
+++ b/tests/mumps/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/petsc/CMakeLists.txt b/tests/petsc/CMakeLists.txt
index 840a460b100dd8e5a4b237c8430ce59061c86084..ea419d96321d21aad1881415cf75a50f2be92c59 100644 (file)
--- a/tests/petsc/CMakeLists.txt
+++ b/tests/petsc/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/serialization/CMakeLists.txt b/tests/serialization/CMakeLists.txt
index ffa6bb54a1ca95a36874f9718cd24d23bce17da2..3b960457b2e3d06d0766742cdd24d14ead627c1f 100644 (file)
--- a/tests/serialization/CMakeLists.txt
+++ b/tests/serialization/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/slepc/CMakeLists.txt b/tests/slepc/CMakeLists.txt
index 93e938146c753c0d4295d5d62cce32750bddb816..2f79cfbaba2ce8284acfe73158340b08fd918dc2 100644 (file)
--- a/tests/slepc/CMakeLists.txt
+++ b/tests/slepc/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/trilinos/CMakeLists.txt b/tests/trilinos/CMakeLists.txt
index 9bd93d7f1384282502872aa69d31e21ad01bab97..6927d5addf57089626377f0c3e5f56d445d5a4ea 100644 (file)
--- a/tests/trilinos/CMakeLists.txt
+++ b/tests/trilinos/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})

diff --git a/tests/umfpack/CMakeLists.txt b/tests/umfpack/CMakeLists.txt
index 994c98b39baa0fce55e033878996a226c5ea63e1..c6ee6188b8d4313aa6f759e33681fa1724c7e2fa 100644 (file)
--- a/tests/umfpack/CMakeLists.txt
+++ b/tests/umfpack/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsubproject.cmake)
 PROJECT(testsuite CXX)
 INCLUDE(${DEAL_II_TARGET_CONFIG})