]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Last changes for today
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 22 Aug 2013 04:31:42 +0000 (04:31 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 22 Aug 2013 04:31:42 +0000 (04:31 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30410 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/CTestConfig.cmake [new file with mode: 0644]
deal.II/cmake/setup_cached_variables.cmake
deal.II/tests/CMakeLists.txt [new file with mode: 0644]
deal.II/tests/threads/affinity.cc [moved from deal.II/tests_tmp/threads/affinity.cc with 100% similarity]
tests/CMakeLists.txt

index 24e3e0da0e76bf5c55a9906fe785bfe3236e6b91..b988e52e7f7d369f613fb976b5a27bb1cefc7455 100644 (file)
@@ -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 (file)
index 0000000..acfd095
--- /dev/null
@@ -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)
index e5391d5fc822df537178cd3d418e1769b9b53c01..abf4013f1f715233f171d7a0fa6646d9c24e6b7c 100644 (file)
@@ -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 (file)
index 0000000..e589767
--- /dev/null
@@ -0,0 +1 @@
+ADD_TEST(foobar true)
index b8a7bc51f7bfaf1e250a93010639207df4501f43..8e4a0153111958d4b0bd195571192ca81f41e6ab 100644 (file)
@@ -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,),) \

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.