]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some more refactoring
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 16 Sep 2013 09:09:41 +0000 (09:09 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 16 Sep 2013 09:09:41 +0000 (09:09 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30725 0785d39b-7218-0410-832d-ea1e28bc413d

33 files changed:
deal.II/cmake/config/CMakeLists.txt
tests/CMakeLists.txt
tests/README
tests/all-headers/CMakeLists.txt
tests/aniso/CMakeLists.txt
tests/base/CMakeLists.txt
tests/bits/CMakeLists.txt
tests/build_tests/CMakeLists.txt
tests/cmake/macros/macro_add_test.cmake
tests/cmake/macros/macro_pickup_tests.cmake
tests/cmake/scripts/run_test.cmake
tests/cmake/setup_macros.cmake [deleted file]
tests/cmake/setup_testsuite.cmake
tests/codim_one/CMakeLists.txt
tests/deal.II/CMakeLists.txt
tests/distributed_grids/CMakeLists.txt
tests/fail/CMakeLists.txt
tests/fe/CMakeLists.txt
tests/gla/CMakeLists.txt
tests/grid/CMakeLists.txt
tests/hp/CMakeLists.txt
tests/integrators/CMakeLists.txt
tests/lac/CMakeLists.txt
tests/lapack/CMakeLists.txt
tests/matrix_free/CMakeLists.txt
tests/metis/CMakeLists.txt
tests/mpi/CMakeLists.txt
tests/multigrid/CMakeLists.txt
tests/petsc/CMakeLists.txt
tests/serialization/CMakeLists.txt
tests/slepc/CMakeLists.txt
tests/trilinos/CMakeLists.txt
tests/umfpack/CMakeLists.txt

index 5cef0a75a677b7088f4ba0ca3ad6ca1ec30b4448..7c8b5c3a30b4672652d9a686a1525c9bf5925640 100644 (file)
@@ -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:
index c8f8e3da5a6d61c96a26b17e7609020d38e06d24..ab44c9dd0dd84a0d57d982212d0435df9dcb7536 100644 (file)
 ##
 ## ---------------------------------------------------------------------
 
-# 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
-  )
index c39fb88daa03aab817f1c119e9fcfd48f4f50419..c72e7785e85c53aab2bca518af508dab08b2454b 100644 (file)
@@ -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 .
 
index 5e243d258188b2fae0877a9577e27a78856b0c9c..2d025428c626ca952df0bc357deebf07b0da08a6 100644 (file)
 ## ---------------------------------------------------------------------
 
 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:
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2afd5496a537e124e2ea45abd0aef91e79e4e998..311e38fd083344b2f8b1a1e0dc788e3f13d4f2fb 100644 (file)
 ## ---------------------------------------------------------------------
 
 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:
index b39d1cc003ff104cf61ded5ad4fb78b7e3ed4574..7f29062b18441ed14af3449a286c3a33cc0d5a25 100644 (file)
@@ -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
index d78715da7e38a1e8db8721a4b7cd7f546879a37b..882de983ba1d138273c3b16d5e13e306a46b216c 100644 (file)
@@ -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
 
index 1955519fdf08c8bd1631ee0a60a867136ceeb3fe..870e7411606d00ab87f8f95d14d5e15ca0fc9a78 100644 (file)
@@ -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 (file)
index 8914c9d..0000000
+++ /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()
index 7e54481092ae0d67b9e18bf626df9ce9c9db4980..4dc59a9321f8aa3e78d5a26f86ed8c30819822d3 100644 (file)
 ## ---------------------------------------------------------------------
 
 #
-# 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()
+
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()
index 2b3c102b8ad1830fb6f98bf8fabe039b5ed7ddd3..80ff54bdfecddd80c5f8ff37ed55abffac75c721 100644 (file)
@@ -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()

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.