Rename (setup|clean|prune)_test to (setup|clean|prune)_tests

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

diff --git a/deal.II/cmake/scripts/run_testsuite.cmake b/deal.II/cmake/scripts/run_testsuite.cmake
index 17c931f85035ee2b2f4ec8666e80fbef786c9315..89dae024aa55f311a63fecaa3b916645eb9458aa 100644 (file)
--- a/deal.II/cmake/scripts/run_testsuite.cmake
+++ b/deal.II/cmake/scripts/run_testsuite.cmake
@@ -403,12 +403,12 @@ IF("${_res}" STREQUAL "0")
     # Only run tests if the build was successful:
 
     EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND}
-      --build ${CTEST_BINARY_DIRECTORY} --target setup_test
+      --build ${CTEST_BINARY_DIRECTORY} --target setup_tests
       OUTPUT_QUIET RESULT_VARIABLE _res
       )
     IF(NOT "${_res}" STREQUAL "0")
       MESSAGE(FATAL_ERROR "
-\"setup_test\" target exited with an error. Bailing out.
+\"setup_tests\" target exited with an error. Bailing out.
 "
         )
     ENDIF()

diff --git a/deal.II/cmake/setup_custom_targets.cmake b/deal.II/cmake/setup_custom_targets.cmake
index 88eb9e719da77b4100154c59d0679b8d33d97e57..65399c645bc0adc30dd795f281702754f138565e 100644 (file)
--- a/deal.II/cmake/setup_custom_targets.cmake
+++ b/deal.II/cmake/setup_custom_targets.cmake
@@ -88,9 +88,9 @@ FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/print_info.cmake
 #
 #    test           - runs a minimal set of tests
 #
-#    setup_test     - sets up the testsuite subprojects
-#    clean_test     - runs the 'clean' target in every testsuite subproject
-#    prune_test     - removes all testsuite subprojects
+#    setup_tests    - sets up the testsuite subprojects
+#    clean_tests    - runs the 'clean' target in every testsuite subproject
+#    prune_tests    - removes all testsuite subprojects
 #
 ###\")"
   )

diff --git a/deal.II/doc/developers/testsuite.html b/deal.II/doc/developers/testsuite.html
index ddb6be56965ed11e1505ded5028d3c45200f044a..5c22d9454c8ae56f66ee5d597e4a40fe50198192 100644 (file)
--- a/deal.II/doc/developers/testsuite.html
+++ b/deal.II/doc/developers/testsuite.html
@@ -86,7 +86,7 @@
     $ cd build
     $ cmake ../deal.II
     $ make -j16
-    $ make -j16 setup_test
+    $ make -j16 setup_tests
     $ ctest -j16
       </pre>
       The exact meaning of all of these commands will be explained in much
@@ -140,10 +140,10 @@
     <p>
       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 testsuite via the "setup_test" target:
+      can setup the testsuite via the "setup_tests" target:s
       <pre>
 
-    $ make setup_test
+    $ make setup_tests
       </pre>
       This will set up all tests supported by the current configuration.
       The testsuite can now be run in the current <i>build directory</i> as
@@ -154,15 +154,15 @@
       Setup can be fine-tuned using the following commands:
       <pre>
 
-    $ make clean_test - runs the 'clean' target in every testsuite subproject
+    $ make clean_tests - runs the 'clean' target in every testsuite subproject
 
-    $ make prune_test - removes all testsuite subprojects
+    $ make prune_tests - removes all testsuite subprojects
       </pre>
 
     <p>
       In addition, when setting up the testsuite, the following environment
       variables can be used to override default behavior when
-      calling <code>make setup_test</code>:
+      calling <code>make setup_tests</code>:
       <pre>
 
     TEST_PICKUP_REGEX
@@ -182,7 +182,7 @@
 
     <p>
       <b>Note:</b> Specifying these options via environment variables is
-      volatile, i.e. if <code>make setup_test</code> is invoked a second
+      volatile, i.e. if <code>make setup_tests</code> is invoked a second
       time without the variables set in environment, the option will be
       reset to the default value. If you want to set these options
       permanently, set them via cmake as CMake variable in the build
@@ -232,7 +232,7 @@
       tolerances. To use it, simply export where the <code>numdiff</code>
       executable can be found via the <code>PATH</code> 
       environment variable so that it can be found during
-      <code>make setup_test</code>.
+      <code>make setup_tests</code>.
     </p>
 
     <a name="runoutput"></a>
@@ -600,7 +600,7 @@ int main ()
       Now, rerun
       <pre>
 
-    $ make setup_test
+    $ make setup_tests
       </pre>
       so that your new test is picked up. After that it is possible to
       invoke it with

diff --git a/deal.II/tests/CMakeLists.txt b/deal.II/tests/CMakeLists.txt
index 2ac4fed941adfc43bae02de8160aa55b0e2aad68..6ae3f7be6e6e98179c3fd645fd44d009d112ac50 100644 (file)
--- a/deal.II/tests/CMakeLists.txt
+++ b/deal.II/tests/CMakeLists.txt
@@ -30,13 +30,13 @@ ADD_SUBDIRECTORY(quick_tests)
 #
 
 # Setup tests:
-ADD_CUSTOM_TARGET(setup_test)
+ADD_CUSTOM_TARGET(setup_tests)
 
 # Clean all tests
-ADD_CUSTOM_TARGET(clean_test)
+ADD_CUSTOM_TARGET(clean_tests)
 
 # Remove all tests:
-ADD_CUSTOM_TARGET(prune_test)
+ADD_CUSTOM_TARGET(prune_tests)
 
 #
 # Write a minimalistic CTestTestfile.cmake file to CMAKE_BINARY_DIR and
@@ -81,7 +81,7 @@ FOREACH(_category ${_categories})
 
   IF(NOT "${_category_dir}" STREQUAL "")
 
-    ADD_CUSTOM_TARGET(setup_test_${_category}
+    ADD_CUSTOM_TARGET(setup_tests_${_category}
       COMMAND ${CMAKE_COMMAND} -E make_directory
         ${CMAKE_CURRENT_BINARY_DIR}/${_category}
       COMMAND cd ${CMAKE_CURRENT_BINARY_DIR}/${_category} &&
@@ -90,22 +90,22 @@ FOREACH(_category ${_categories})
       DEPENDS ${_category_dir}
       COMMENT "Processing tests/${_category}"
       )
-    ADD_DEPENDENCIES(setup_test setup_test_${_category})
+    ADD_DEPENDENCIES(setup_tests setup_tests_${_category})
 
     # depend on a valid build directory (libraries built, config in place):
-    ADD_DEPENDENCIES(setup_test_${_category} setup_build_dir)
+    ADD_DEPENDENCIES(setup_tests_${_category} setup_build_dir)
 
-    ADD_CUSTOM_TARGET(clean_test_${_category}
+    ADD_CUSTOM_TARGET(clean_tests_${_category}
       COMMAND [ ! -d ${_category} ] || ${CMAKE_COMMAND}
         --build ${CMAKE_CURRENT_BINARY_DIR}/${_category} --target clean
       )
-    ADD_DEPENDENCIES(clean_test clean_test_${_category})
+    ADD_DEPENDENCIES(clean_tests clean_tests_${_category})
 
-    ADD_CUSTOM_TARGET(prune_test_${_category}
+    ADD_CUSTOM_TARGET(prune_tests_${_category}
       COMMAND ${CMAKE_COMMAND} -E remove_directory
         ${CMAKE_CURRENT_BINARY_DIR}/${_category}
       )
-    ADD_DEPENDENCIES(prune_test prune_test_${_category})
+    ADD_DEPENDENCIES(prune_tests prune_tests_${_category})
 
     FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake
       "SUBDIRS(${_category})\n"