]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Minor renaming
authorMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 2 Sep 2013 19:51:28 +0000 (19:51 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 2 Sep 2013 19:51:28 +0000 (19:51 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30551 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_deal_ii_pickup_tests.cmake
tests/CMakeLists.txt

index 64d5cea6d171a9af5403fd2ff21d595ff0e2eaf6..43127882292b1539571988ca93c41078f21cc649 100644 (file)
@@ -17,7 +17,7 @@
 #
 # A Macro to pick up all tests in a test subdirectory
 #
-# If DEAL_II_PICKUP_REGEX is set, only tests matching the regex will be
+# If TEST_PICKUP_REGEX is set, only tests matching the regex will be
 # processed.
 #
 # Usage:
@@ -31,8 +31,8 @@ MACRO(DEAL_II_PICKUP_TESTS)
 
   FOREACH(_test ${_tests})
 
-    IF( "${DEAL_II_PICKUP_REGEX}" STREQUAL "" OR
-        _test MATCHES "${DEAL_II_PICKUP_REGEX}" )
+    IF( "${TEST_PICKUP_REGEX}" STREQUAL "" OR
+        _test MATCHES "${TEST_PICKUP_REGEX}" )
       GET_FILENAME_COMPONENT(_test ${_test} NAME)
 
       IF(_test MATCHES debug)
index f07834677ade234c84d4ceee494f25001bf12e87..bf264148eddc6d1c25574328362b1c9fa736cfd5 100644 (file)
@@ -18,8 +18,8 @@
 # Setup and run the testsuite:
 #
 # TODO: Describe and document the following:
-# DEAL_II_TEST_DIFF
-# DEAL_II_TEST_TIME_LIMIT
+# TEST_DIFF
+# TEST_TIME_LIMIT
 # NUMDIFF_DIR
 #
 
@@ -52,15 +52,15 @@ IF( NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND"
 ENDIF()
 
 IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND")
-  SET_IF_EMPTY(DEAL_II_TEST_DIFF numdiff -a 1e-6 -q -s ' \t\n:')
+  SET_IF_EMPTY(TEST_DIFF ${NUMDIFF_EXECUTABLE} -a 1e-6 -q -s ' \t\n:')
 ELSE()
-  SET_IF_EMPTY(DEAL_II_TEST_DIFF diff)
+  SET_IF_EMPTY(TEST_DIFF ${DIFF_EXECUTABLE})
 ENDIF()
 
 #
 # Set a default time limit of 60 seconds:
 #
-SET_IF_EMPTY(DEAL_II_TEST_TIME_LIMIT 120)
+SET_IF_EMPTY(TEST_TIME_LIMIT 120)
 
 
 MESSAGE(STATUS "Proceed to test definitions")
@@ -72,13 +72,13 @@ MESSAGE(STATUS "Proceed to test definitions")
 #$(if $(USE_CONTRIB_SLEPC:no=),    slepc,) \
 #$(if $(USE_CONTRIB_TRILINOS:no=), trilinos,) \
 
-ADD_SUBDIRECTORY(a-framework)
+ADD_SUBDIRECTORY(a-framework) -- what do?
 ADD_SUBDIRECTORY(aniso)
 ADD_SUBDIRECTORY(base)
 ADD_SUBDIRECTORY(bits)
 ADD_SUBDIRECTORY(codim_one)
 ADD_SUBDIRECTORY(deal.II)
-ADD_SUBDIRECTORY(fail)
+#ADD_SUBDIRECTORY(fail) -- the good old failing tests
 ADD_SUBDIRECTORY(fe)
 ADD_SUBDIRECTORY(grid)
 ADD_SUBDIRECTORY(hp)

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.