From: Matthias Maier Date: Thu, 22 Aug 2013 04:31:42 +0000 (+0000) Subject: Last changes for today X-Git-Tag: v8.1.0~570^2~431 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=902cbb7f27d50df0b98a7c72ac03317ff4abccde;p=dealii.git Last changes for today git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30410 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 24e3e0da0e..b988e52e7f 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -80,6 +80,8 @@ PROJECT(deal.II CXX) ENABLE_LANGUAGE_OPTIONAL(C) ENABLE_LANGUAGE_OPTIONAL(Fortran) +ENABLE_TESTING() + INCLUDE(setup_post_project_call) INCLUDE(setup_deal_ii) @@ -145,9 +147,10 @@ ADD_SUBDIRECTORY(cmake/config) # has to be included after source ADD_SUBDIRECTORY(contrib) # has to be included after source ADD_SUBDIRECTORY(examples) -IF(DEAL_II_COMPONENT_TESTSUITE AND DEAL_II_HAVE_TESTS_DIRECTORY) - ENABLE_TESTING() +IF(BUILD_TESTING AND DEAL_II_HAVE_TESTS_DIRECTORY) ADD_SUBDIRECTORY(${TEST_DIR} ${CMAKE_BINARY_DIR}/tests) +ELSE() + ADD_SUBDIRECTORY(tests) ENDIF() # diff --git a/deal.II/CTestConfig.cmake b/deal.II/CTestConfig.cmake new file mode 100644 index 0000000000..acfd0951e5 --- /dev/null +++ b/deal.II/CTestConfig.cmake @@ -0,0 +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. +## +## --------------------------------------------------------------------- + +SET(CTEST_PROJECT_NAME "deal.II") + +SET(CTEST_NIGHTLY_START_TIME "1:00:00 UTC") + +SET(CTEST_CUSTOM_COVERAGE_EXCLUDE + "/bundled" + "/CMakeFiles/CMakeTmp/" + "/contrib" + ) + +#SET(CTEST_USE_LAUNCHERS 1) diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake index e5391d5fc8..abf4013f1f 100644 --- a/deal.II/cmake/setup_cached_variables.cmake +++ b/deal.II/cmake/setup_cached_variables.cmake @@ -94,13 +94,6 @@ OPTION(DEAL_II_COMPONENT_PARAMETER_GUI OFF ) -IF(DEAL_II_HAVE_TESTS_DIRECTORY) - OPTION(DEAL_II_COMPONENT_TESTSUITE - "Setup the full testsuite. TODO" - OFF - ) -ENDIF() - OPTION(DEAL_II_ALLOW_AUTODETECTION "Allow to automatically setup features by setting all undefined DEAL_II_WITH_* variables to ON or OFF" ON @@ -120,6 +113,12 @@ IF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") ENDIF() +OPTION(BUILD_TESTING + "This option will enable the configuration of the build tests" + OFF + ) + + ######################################################################## # # # Compilation and linking: # diff --git a/deal.II/tests/CMakeLists.txt b/deal.II/tests/CMakeLists.txt new file mode 100644 index 0000000000..e589767e55 --- /dev/null +++ b/deal.II/tests/CMakeLists.txt @@ -0,0 +1 @@ +ADD_TEST(foobar true) diff --git a/deal.II/tests_tmp/threads/affinity.cc b/deal.II/tests/threads/affinity.cc similarity index 100% rename from deal.II/tests_tmp/threads/affinity.cc rename to deal.II/tests/threads/affinity.cc diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b8a7bc51f7..8e4a015311 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,6 +23,8 @@ # NUMDIFF_DIR # +SET(CTEST_USE_LAUNCHERS TRUE) + # # We need perl for the testsuite: # @@ -62,6 +64,7 @@ ENDIF() # SET_IF_EMPTY(DEAL_II_TEST_TIME_LIMIT 120) + MESSAGE(STATUS "Proceed to test definitions") #$(if $(DEAL_II_USE_MPI:no=), $(if $(USE_CONTRIB_P4EST:no=),mpi,),) \