From d151e13d2a7e291b18f09005e1e05bf5ef98b2ef Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 4 Dec 2013 18:14:21 +0000 Subject: [PATCH] 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 --- deal.II/cmake/macros/macro_pickup_tests.cmake | 4 ---- deal.II/cmake/scripts/run_testsuite.cmake | 1 - deal.II/cmake/setup_testsubproject.cmake | 4 +--- deal.II/cmake/setup_testsuite.cmake | 3 +-- tests/CMakeLists.txt | 2 +- tests/a-framework/CMakeLists.txt | 2 +- tests/aniso/CMakeLists.txt | 2 +- tests/base/CMakeLists.txt | 2 +- tests/bits/CMakeLists.txt | 2 +- tests/codim_one/CMakeLists.txt | 2 +- tests/deal.II/CMakeLists.txt | 2 +- tests/distributed_grids/CMakeLists.txt | 2 +- tests/fe/CMakeLists.txt | 2 +- tests/gla/CMakeLists.txt | 2 +- tests/grid/CMakeLists.txt | 2 +- tests/hp/CMakeLists.txt | 2 +- tests/integrators/CMakeLists.txt | 2 +- tests/lac/CMakeLists.txt | 2 +- tests/lapack/CMakeLists.txt | 2 +- tests/matrix_free/CMakeLists.txt | 2 +- tests/metis/CMakeLists.txt | 2 +- tests/mpi/CMakeLists.txt | 2 +- tests/multigrid/CMakeLists.txt | 2 +- tests/mumps/CMakeLists.txt | 2 +- tests/petsc/CMakeLists.txt | 2 +- tests/serialization/CMakeLists.txt | 2 +- tests/slepc/CMakeLists.txt | 2 +- tests/trilinos/CMakeLists.txt | 2 +- tests/umfpack/CMakeLists.txt | 2 +- 29 files changed, 27 insertions(+), 35 deletions(-) diff --git a/deal.II/cmake/macros/macro_pickup_tests.cmake b/deal.II/cmake/macros/macro_pickup_tests.cmake index 69a3950b97..4c702545f3 100644 --- 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 6eb0713820..f4605d6760 100644 --- 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 e40a167517..b1bd6bf6ee 100644 --- 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 9dc9756a74..98580373d0 100644 --- 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 164fdebe42..d2e24f415e 100644 --- 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 c2ca3dd75d..bf54a929d2 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 baeb270640..dfac0f1175 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 085a1c60e3..e607af42d9 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 8887f4f830..256706d690 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 e45e9f2adb..2f77932a28 100644 --- 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 e8f4a01f4a..1a535a8522 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 73e46fe29d..0ad0f7032d 100644 --- 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 840a460b10..ea419d9632 100644 --- 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 ffa6bb54a1..3b960457b2 100644 --- 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 93e938146c..2f79cfbaba 100644 --- 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 9bd93d7f13..6927d5addf 100644 --- 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 994c98b39b..c6ee6188b8 100644 --- 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}) -- 2.39.5