From 0872e373d0fa586face13d1029b7363e414b77d6 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 16 Sep 2013 09:09:41 +0000 Subject: [PATCH] Some more refactoring git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30725 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/config/CMakeLists.txt | 3 + tests/CMakeLists.txt | 59 ++++++++++----- tests/README | 17 +++-- tests/all-headers/CMakeLists.txt | 9 +-- tests/aniso/CMakeLists.txt | 5 +- tests/base/CMakeLists.txt | 5 +- tests/bits/CMakeLists.txt | 5 +- tests/build_tests/CMakeLists.txt | 12 +-- tests/cmake/macros/macro_add_test.cmake | 12 +-- tests/cmake/macros/macro_pickup_tests.cmake | 1 - tests/cmake/scripts/run_test.cmake | 39 +++++++--- tests/cmake/setup_macros.cmake | 24 ------ tests/cmake/setup_testsuite.cmake | 82 ++++++++++++++++++--- tests/codim_one/CMakeLists.txt | 5 +- tests/deal.II/CMakeLists.txt | 5 +- tests/distributed_grids/CMakeLists.txt | 5 +- tests/fail/CMakeLists.txt | 5 +- tests/fe/CMakeLists.txt | 5 +- tests/gla/CMakeLists.txt | 5 +- tests/grid/CMakeLists.txt | 5 +- tests/hp/CMakeLists.txt | 5 +- tests/integrators/CMakeLists.txt | 5 +- tests/lac/CMakeLists.txt | 5 +- tests/lapack/CMakeLists.txt | 5 +- tests/matrix_free/CMakeLists.txt | 5 +- tests/metis/CMakeLists.txt | 5 +- tests/mpi/CMakeLists.txt | 5 +- tests/multigrid/CMakeLists.txt | 5 +- tests/petsc/CMakeLists.txt | 5 +- tests/serialization/CMakeLists.txt | 5 +- tests/slepc/CMakeLists.txt | 5 +- tests/trilinos/CMakeLists.txt | 5 +- tests/umfpack/CMakeLists.txt | 5 +- 33 files changed, 182 insertions(+), 191 deletions(-) delete mode 100644 tests/cmake/setup_macros.cmake diff --git a/deal.II/cmake/config/CMakeLists.txt b/deal.II/cmake/config/CMakeLists.txt index 5cef0a75a6..7c8b5c3a30 100644 --- a/deal.II/cmake/config/CMakeLists.txt +++ b/deal.II/cmake/config/CMakeLists.txt @@ -318,6 +318,9 @@ ADD_CUSTOM_TARGET(setup_build_dir ALL COMMENT "Update build configuration" ) ADD_DEPENDENCIES(library setup_build_dir) +FOREACH(_build ${DEAL_II_BUILD_TYPES}) + ADD_DEPENDENCIES(setup_build_dir ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX}) +ENDFOREACH() # # And a script to remove it upon installation from the install prefix: diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c8f8e3da5a..ab44c9dd0d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,12 +14,9 @@ ## ## --------------------------------------------------------------------- -# Setup the testsuite: -INCLUDE(cmake/setup_testsuite.cmake) - # -# This is a bloody hack to avoid a severe performance regression with -# GNU Make that really does not like 12k top level targets at once... +# This is a bloody hack to avoid a severe performance penalty when using +# 12k top level targets with GNU Make that really does not like that... # # The only choice we have is to set up every test subdirectory as an # independent project. Unfortunately this adds quite a significant amount @@ -28,9 +25,16 @@ INCLUDE(cmake/setup_testsuite.cmake) MESSAGE(STATUS "Proceed to test definitions now.") +# +# Two custom targets to setup and cleanup the testsuite: +# + ADD_CUSTOM_TARGET(setup_test) ADD_CUSTOM_TARGET(cleanup_test) -FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/deal.IITestfile.cmake "") + +# +# The list of subfolders to set up: +# SET(_categories all-headers aniso base bits build_tests codim_one deal.II fe grid hp integrators lac matrix_free multigrid serialization @@ -60,22 +64,41 @@ IF(DEAL_II_WITH_UMFPACK) LIST(APPEND _categories umfpack) ENDIF() -FOREACH(_category ${_categories}) - # avoid stale test definitions: - FILE(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${_category}/CTestTestfile.cmake) +# +# Pass all variables starting with "TEST_" down to the subprojects: +# +GET_CMAKE_PROPERTY(_variables VARIABLES) +SET(_options) +FOREACH(_var ${_variables}) + IF(_var MATCHES "^TEST_") + LIST(APPEND _options -D${_var}="${${_var}}") + ENDIF() +ENDFOREACH() + +# +# The hook into CTest so that the tests from the suprojects get picked up +# by the main project: +# + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/deal.IITestfile.cmake "") +SET_PROPERTY(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + APPEND PROPERTY TEST_INCLUDE_FILE deal.IITestfile.cmake + ) + +# +# Define a subproject for every enabled category: +# + +FOREACH(_category ${_categories}) ADD_CUSTOM_TARGET(setup_test_${_category} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${_category} COMMAND cd ${CMAKE_CURRENT_BINARY_DIR}/${_category} && - ${CMAKE_COMMAND} - -G${CMAKE_GENERATOR} - -DDEAL_II_DIR=${CMAKE_BINARY_DIR} + ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} + -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} -DDEAL_II_SOURCE_DIR=${CMAKE_SOURCE_DIR} - -DTEST_CMAKE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/cmake # TODO: Refactor - -DTEST_DIFF="${TEST_DIFF}" # TODO: Refactor - -DTEST_PICKUP_REGEX=${TEST_PICKUP_REGEX} # TODO: Refactor - -DTEST_TIME_LIMIT=${TEST_TIME_LIMIT} # TODO: Refactor + ${_options} ${CMAKE_CURRENT_SOURCE_DIR}/${_category} > /dev/null # Shoo! DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_category} @@ -94,7 +117,3 @@ FOREACH(_category ${_categories}) "SUBDIRS(${_category})\n" ) ENDFOREACH() - -SET_PROPERTY(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - APPEND PROPERTY TEST_INCLUDE_FILE deal.IITestfile.cmake - ) diff --git a/tests/README b/tests/README index c39fb88daa..c72e7785e8 100644 --- a/tests/README +++ b/tests/README @@ -9,7 +9,7 @@ General test layout =================== A test usually consists of a source file and an output file for -comparison (Under SOURCE_DIR/tests): +comparison (under SOURCE_DIR/tests): category/test.cc category/test.output @@ -35,9 +35,9 @@ Restrict tests for build configurations --------------------------------------- Normally, a test will be set up for debug and release configuration (if -deal.II was configured with combined DebugRelease configuration) or for the +deal.II was configured with combined DebugRelease build type) or for the available build configuration (if deal.II was configured either with Debug -or with Release only configuration). +or with Release only build type). If a specific test can only be run in debug or release configurations but not in both it is possible to restrict the setup by prepeding ".debug" or @@ -66,7 +66,7 @@ tests to specific feature configurations, e.g.: category/test.with_umfpack=on.output, or category/test.with_zlib=off.output -These tests will be only set up if the specified feature was configured +These tests will only be set up if the specified feature was configured accordingly. Note: It is possible to provide different output files for disabled/enabled @@ -84,7 +84,7 @@ Note: Quite a number of test categories are already guarded so that the contained tests will only be set up if the feature is enabled. In this case a feature constraint in the output file name is redundant and should be avoided. (Folder with guards are distributed_grids, lapack, metis, petsc, -slepc, trilinos, umfpack) +slepc, trilinos, umfpack, gla, mpi) Run mpi tests with mpirun @@ -95,13 +95,16 @@ simultaneous processes in the following way: category/test.mpirun=x.output +Note: It is possible to provide multiple output files for different mpirun +values. + How to set up and run the testsuite =================================== To enable the testsuite, configure and build deal.II in a build directory as normal (installation is not necessary). After that you can setup the -tests via the "setup_test" target: +testsuite via the "setup_test" target: # make setup_test @@ -154,7 +157,7 @@ Alternatively, you can specify TEST_PICKUP_REGEX upon configuration: Note: A TEST_PICKUP_REGEX set via cmake always _overrides_ one set via environment. If you wish to disable this filter again, undefine -TEST_PICKUP_REGEX in the Cache: +TEST_PICKUP_REGEX in the cache: # cmake -UTEST_PICKUP_REGEX . diff --git a/tests/all-headers/CMakeLists.txt b/tests/all-headers/CMakeLists.txt index 5e243d2581..2d025428c6 100644 --- a/tests/all-headers/CMakeLists.txt +++ b/tests/all-headers/CMakeLists.txt @@ -15,14 +15,7 @@ ## --------------------------------------------------------------------- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() - -SET_IF_EMPTY(TEST_PICKUP_REGEX "$ENV{TEST_PICKUP_REGEX}") - -SET(TEST_DIFF) # avoid a bogus warning +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) # # Header tests are special: diff --git a/tests/aniso/CMakeLists.txt b/tests/aniso/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/aniso/CMakeLists.txt +++ b/tests/aniso/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/base/CMakeLists.txt b/tests/base/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/base/CMakeLists.txt +++ b/tests/base/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/bits/CMakeLists.txt b/tests/bits/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/bits/CMakeLists.txt +++ b/tests/bits/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/build_tests/CMakeLists.txt b/tests/build_tests/CMakeLists.txt index 2afd5496a5..311e38fd08 100644 --- a/tests/build_tests/CMakeLists.txt +++ b/tests/build_tests/CMakeLists.txt @@ -15,17 +15,7 @@ ## --------------------------------------------------------------------- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() - -SET_IF_EMPTY(TEST_PICKUP_REGEX "$ENV{TEST_PICKUP_REGEX}") - -# -# avoid bogus warnings: -# -SET(TEST_DIFF) +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) # # build_tests tests are special: diff --git a/tests/cmake/macros/macro_add_test.cmake b/tests/cmake/macros/macro_add_test.cmake index b39d1cc003..7f29062b18 100644 --- a/tests/cmake/macros/macro_add_test.cmake +++ b/tests/cmake/macros/macro_add_test.cmake @@ -26,9 +26,9 @@ # - specifying the maximal wall clock time in seconds a test is allowed # to run # -# TEST_CMAKE_DIR -# - pointing to a cmake folder where normalize.pl and run_test.cmake are -# located +# TEST_DIR +# - pointing to the ./tests folder where normalize.pl and run_test.cmake are +# located under cmake/scripts # # # Usage: @@ -136,13 +136,13 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu) && exit 1) COMMAND ${PERL_EXECUTABLE} -pi - ${TEST_CMAKE_DIR}/scripts/normalize.pl + ${TEST_DIR}/scripts/normalize.pl ${_test_directory}/output WORKING_DIRECTORY ${_test_directory} DEPENDS ${_target} - ${TEST_CMAKE_DIR}/scripts/normalize.pl + ${TEST_DIR}/scripts/normalize.pl ) ADD_CUSTOM_COMMAND(OUTPUT ${_test_directory}/diff COMMAND @@ -180,7 +180,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu) -DTRGT=${_diff_target} -DTEST=${_test_full} -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} - -P ${TEST_CMAKE_DIR}/scripts/run_test.cmake + -P ${TEST_DIR}/scripts/run_test.cmake WORKING_DIRECTORY ${_test_directory} ) SET_TESTS_PROPERTIES(${_test_full} PROPERTIES diff --git a/tests/cmake/macros/macro_pickup_tests.cmake b/tests/cmake/macros/macro_pickup_tests.cmake index d78715da7e..882de983ba 100644 --- a/tests/cmake/macros/macro_pickup_tests.cmake +++ b/tests/cmake/macros/macro_pickup_tests.cmake @@ -41,7 +41,6 @@ MACRO(DEAL_II_PICKUP_TESTS) # Strip the quoting from TEST_DIFF: # SET(_test_diff ${TEST_DIFF}) - SEPARATE_ARGUMENTS(TEST_DIFF UNIX_COMMAND ${TEST_DIFF}) SET(DEAL_II_SOURCE_DIR) # avoid a bogus warning diff --git a/tests/cmake/scripts/run_test.cmake b/tests/cmake/scripts/run_test.cmake index 1955519fdf..870e741160 100644 --- a/tests/cmake/scripts/run_test.cmake +++ b/tests/cmake/scripts/run_test.cmake @@ -1,9 +1,27 @@ +## --------------------------------------------------------------------- +## $Id$ +## +## Copyright (C) 2013 by the deal.II authors +## +## This file is part of the deal.II library. +## +## The deal.II library is free software; you can use it, redistribute +## it, and/or modify it under the terms of the GNU Lesser General +## Public License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## The full text of the license can be found in the file LICENSE at +## the top level of the deal.II distribution. +## +## --------------------------------------------------------------------- + +# +# This is a small worker to run a single test in the testsuite # -# TODO: The following variables have to be set: +# The following variables have to be set: # -# TARGET -# TEST -# DEAL_II_BINARY_DIR +# TRGT - the name of the target that should be invoked +# TEST - the test name (used for status messages) +# DEAL_II_BINARY_DIR - the build directory that contains the target # EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} @@ -45,11 +63,12 @@ ELSE() # Determine whether the CONFIGURE, BUILD or RUN stages were run successfully: # - # configure is special because it only exists in build tests: - STRING(REGEX MATCH "${TEST}: CONFIGURE failed\\." _configure_regex ${_output}) + # CONFIGURE is special because it only exists in build tests: + STRING(REGEX MATCH "${TEST}: CONFIGURE successful\\." _configure_regex ${_output}) + STRING(REGEX MATCH "${TEST}: CONFIGURE failed\\." _configure_regex_fail ${_output}) STRING(REGEX MATCH "${TEST}: BUILD successful\\." _build_regex ${_output}) STRING(REGEX MATCH "${TEST}: RUN successful\\." _run_regex ${_output}) - IF(NOT "${_configure_regex}" STREQUAL "") + IF(NOT "${_configure_regex_fail}" STREQUAL "") SET(_stage CONFIGURE) ELSEIF("${_build_regex}" STREQUAL "") SET(_stage BUILD) @@ -59,11 +78,11 @@ ELSE() SET(_stage DIFF) ENDIF() - MESSAGE("Test ${TEST}: ${_stage}") MESSAGE("=============================== OUTPUT BEGIN ===============================") - IF("${_build_regex}" STREQUAL "") - # Some special output in case the BUILD stage failed: + IF( "${_build_regex}" STREQUAL "" AND + "${_configure_regex}" STREQUAL "" ) + # Some special output in case the BUILD stage failed in a regression test: MESSAGE("${TEST}: BUILD failed. Output:") ENDIF() MESSAGE(${_output}) diff --git a/tests/cmake/setup_macros.cmake b/tests/cmake/setup_macros.cmake deleted file mode 100644 index 8914c9d6a0..0000000000 --- a/tests/cmake/setup_macros.cmake +++ /dev/null @@ -1,24 +0,0 @@ -## --------------------------------------------------------------------- -## $Id$ -## -## Copyright (C) 2013 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - -# -# Load all macros: -# - -FILE(GLOB _macro_files "${CMAKE_CURRENT_LIST_DIR}/macros/*.cmake") -FOREACH(_file ${_macro_files}) - INCLUDE(${_file}) -ENDFOREACH() diff --git a/tests/cmake/setup_testsuite.cmake b/tests/cmake/setup_testsuite.cmake index 7e54481092..4dc59a9321 100644 --- a/tests/cmake/setup_testsuite.cmake +++ b/tests/cmake/setup_testsuite.cmake @@ -15,27 +15,76 @@ ## --------------------------------------------------------------------- # -# Setup testsuite: +# Setup necessary configuration for a testsuite sub project. # -# TODO: Describe and document the following: +# A testsuite subproject assumes the following cached variables to be set: # -# TEST_DIFF -# TEST_TIME_LIMIT -# NUMDIFF_DIR +# DEAL_II_BINARY_DIR +# DEAL_II_SOURCE_DIR +# - pointing to a source and binary directory of a deal.II build # +# This file sets up the following options, that can be overwritten by +# environment or command line: +# +# TEST_DIFF +# TEST_TIME_LIMIT +# TEST_PICKUP_REGEX +# +# + +# +# Load all macros: +# + +FILE(GLOB _macro_files "${CMAKE_CURRENT_LIST_DIR}/macros/*.cmake") +FOREACH(_file ${_macro_files}) + INCLUDE(${_file}) +ENDFOREACH() + +# +# Pick up values from environment: +# + +SET_IF_EMPTY(DEAL_II_BINARY_DIR $ENV{DEAL_II_BINARY_DIR}) +SET_IF_EMPTY(DEAL_II_BINARY_DIR $ENV{DEAL_II_DIR}) +SET_IF_EMPTY(DEAL_II_SOURCE_DIR $ENV{DEAL_II_SOURCE_DIR}) +SET_IF_EMPTY(TEST_DIFF $ENV{TEST_DIFF}) +SET_IF_EMPTY(TEST_TIME_LIMIT $ENV{TEST_TIME_LIMIT}) +SET_IF_EMPTY(TEST_PICKUP_REGEX $ENV{TEST_PICKUP_REGEX}) + +IF("${DEAL_II_BINARY_DIR}" STREQUAL "") + MESSAGE(FATAL_ERROR "DEAL_II_BINARY_DIR must be set for this test subproject to configure correctly") +ENDIF() +IF("${DEAL_II_SOURCE_DIR}" STREQUAL "") + MESSAGE(FATAL_ERROR "DEAL_II_SOURCE_DIR must be set for this test subproject to configure correctly") +ENDIF() + +# +# We need deal.II and Perl as external packages: +# + +FIND_PACKAGE(deal.II 8.1 REQUIRED + HINTS ${DEAL_II_BINARY_DIR} ${DEAL_II_DIR} + ) + +FIND_PACKAGE(Perl REQUIRED) # -# Wee need a diff tool, preferably numdiff: +# We need a diff tool, preferably numdiff: # +FIND_PROGRAM(DIFF_EXECUTABLE + NAMES diff + ) + FIND_PROGRAM(NUMDIFF_EXECUTABLE NAMES numdiff HINTS ${NUMDIFF_DIR} PATH_SUFFIXES bin ) -FIND_PROGRAM(DIFF_EXECUTABLE - NAMES diff - ) + +MARK_AS_ADVANCED(DIFF_EXECUTABLE NUMDIFF_EXECUTABLE) + IF( NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND" AND DIFF_EXECUTABLE MATCHES "-NOTFOUND" ) MESSAGE(FATAL_ERROR @@ -48,15 +97,24 @@ IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND") ELSE() SET_IF_EMPTY(TEST_DIFF "${DIFF_EXECUTABLE}") ENDIF() + # -# Son, we have to talk about quotings: +# "Son, we have to talk about quotings". Avoid overquoting. Due to the fact +# that TEST_DIFF might be passed to the command line as a string, we have +# to set it up this way :-/ # -SEPARATE_ARGUMENTS(TEST_DIFF UNIX_COMMAND ${TEST_DIFF}) -MARK_AS_ADVANCED(DIFF_EXECUTABLE NUMDIFF_EXECUTABLE) +SEPARATE_ARGUMENTS(TEST_DIFF UNIX_COMMAND ${TEST_DIFF}) # # Set a default time limit of 120 seconds: # + SET_IF_EMPTY(TEST_TIME_LIMIT 120) +# +# And finally, enable testing: +# + +ENABLE_TESTING() + diff --git a/tests/codim_one/CMakeLists.txt b/tests/codim_one/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/codim_one/CMakeLists.txt +++ b/tests/codim_one/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/deal.II/CMakeLists.txt b/tests/deal.II/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/deal.II/CMakeLists.txt +++ b/tests/deal.II/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/distributed_grids/CMakeLists.txt b/tests/distributed_grids/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/distributed_grids/CMakeLists.txt +++ b/tests/distributed_grids/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/fail/CMakeLists.txt b/tests/fail/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/fail/CMakeLists.txt +++ b/tests/fail/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/fe/CMakeLists.txt b/tests/fe/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/fe/CMakeLists.txt +++ b/tests/fe/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/gla/CMakeLists.txt b/tests/gla/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/gla/CMakeLists.txt +++ b/tests/gla/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/grid/CMakeLists.txt b/tests/grid/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/grid/CMakeLists.txt +++ b/tests/grid/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/hp/CMakeLists.txt b/tests/hp/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/hp/CMakeLists.txt +++ b/tests/hp/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/integrators/CMakeLists.txt b/tests/integrators/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/integrators/CMakeLists.txt +++ b/tests/integrators/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/lac/CMakeLists.txt b/tests/lac/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/lac/CMakeLists.txt +++ b/tests/lac/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/lapack/CMakeLists.txt b/tests/lapack/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/lapack/CMakeLists.txt +++ b/tests/lapack/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/matrix_free/CMakeLists.txt b/tests/matrix_free/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/matrix_free/CMakeLists.txt +++ b/tests/matrix_free/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/metis/CMakeLists.txt b/tests/metis/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/metis/CMakeLists.txt +++ b/tests/metis/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/mpi/CMakeLists.txt b/tests/mpi/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/mpi/CMakeLists.txt +++ b/tests/mpi/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/multigrid/CMakeLists.txt b/tests/multigrid/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/multigrid/CMakeLists.txt +++ b/tests/multigrid/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/petsc/CMakeLists.txt b/tests/petsc/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/petsc/CMakeLists.txt +++ b/tests/petsc/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/serialization/CMakeLists.txt b/tests/serialization/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/serialization/CMakeLists.txt +++ b/tests/serialization/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/slepc/CMakeLists.txt b/tests/slepc/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/slepc/CMakeLists.txt +++ b/tests/slepc/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/trilinos/CMakeLists.txt b/tests/trilinos/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/trilinos/CMakeLists.txt +++ b/tests/trilinos/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() diff --git a/tests/umfpack/CMakeLists.txt b/tests/umfpack/CMakeLists.txt index 2b3c102b8a..80ff54bdfe 100644 --- a/tests/umfpack/CMakeLists.txt +++ b/tests/umfpack/CMakeLists.txt @@ -1,6 +1,3 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.1 REQUIRED HINTS ${DEAL_II_DIR}) -FIND_PACKAGE(Perl REQUIRED) -INCLUDE(${TEST_CMAKE_DIR}/setup_macros.cmake) -ENABLE_TESTING() +INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake) DEAL_II_PICKUP_TESTS() -- 2.39.5