]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Reorganize the test setups slightly
authorMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 17 Sep 2013 08:47:50 +0000 (08:47 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 17 Sep 2013 08:47:50 +0000 (08:47 +0000)
quick checks are now independent of the testsuite and cannot be run any
more from the top binary directory; instead a target "test" must be used.

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30757 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/tests/CMakeLists.txt
tests/CMakeLists.txt

index 5a6f6f4c2c09b59e8374fe7e834d07c3480dea22..248570cfcc76238d84cf3de5d2291e897ac6eb32 100644 (file)
@@ -80,8 +80,6 @@ PROJECT(deal.II CXX)
 ENABLE_LANGUAGE_OPTIONAL(C)
 ENABLE_LANGUAGE_OPTIONAL(Fortran)
 
-ENABLE_TESTING()
-
 INCLUDE(setup_post_project_call)
 
 INCLUDE(setup_deal_ii)
index 7771e72e44078e4c869d3fcf840d951009f43eb6..ad14ac2493930513b3ed8fa139bc19a16ab9c3e7 100644 (file)
@@ -18,6 +18,8 @@
 # A minimalistic set of tests:
 #
 
+ENABLE_TESTING()
+
 FOREACH(_build ${DEAL_II_BUILD_TYPES})
   STRING(TOLOWER ${_build} _build_lowercase)
 
@@ -77,3 +79,15 @@ FOREACH(_build ${DEAL_II_BUILD_TYPES})
   SET_TESTS_PROPERTIES(${_target} PROPERTIES LABEL "sanity checks")
 
 ENDFOREACH()
+
+#
+# A custom test target:
+#
+# @TIMO: TODO, write a little script to be run after ctest that queries for
+# (affinity|project|etc).(debug|release)-OK and outputs an appropriate
+# message.
+#
+ADD_CUSTOM_TARGET(test
+  COMMAND ${CMAKE_CTEST_COMMAND} --force-new-ctest-process
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  )
index 326911ffce1a3bb2c0c5b559b7a803c0a38a154f..b98d8db63378f3e8c40fbb175402f156253ca92d 100644 (file)
 #
 
 MESSAGE(STATUS "Proceed to test definitions now.")
+ENABLE_TESTING()
+
+#
+# Write a minimalistic CTestTestfile.cmake file to CMAKE_BINARY_DIR:
+#
+FILE(WRITE ${CMAKE_BINARY_DIR}/CTestTestfile.cmake
+  "SUBDIRS(tests)"
+  )
 
 #
 # Two custom targets to setup and cleanup the testsuite:

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.