From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Thu, 19 Sep 2013 18:12:07 +0000 (+0000)
Subject: Simplify
X-Git-Tag: v8.1.0~570^2~260
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abfcc59e521b1db061be25e08e30f93bad785058;p=dealii.git

Simplify


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

diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake
index 903920da8b..4b50d1a543 100644
--- a/tests/run_testsuite.cmake
+++ b/tests/run_testsuite.cmake
@@ -52,14 +52,11 @@
 #     - The CMake Generator to use (e.g. "Unix Makefiles", or "Ninja", see
 #       $ man cmake)
 #     - If unspecified the generator of a configured build directory will
-#       be used. If this information is not available, an error is thrown.
+#       be used, otherwise "Unix Makefiles".
 #
 #   TRACK
 #     - TODO (defaults to "Experimental")
 #
-#   NO_JOBS
-#     - The number of concurrent build and test jobs (defaults to 1).
-#
 #   CONFIG_FILE
 #     - A configuration file (see ../deal.II/docs/development/Config.sample)
 #       that will be used during the configuration stage (invokes
@@ -172,11 +169,8 @@ IF("${CTEST_CMAKE_GENERATOR}" STREQUAL "")
   IF(NOT "${_generator}" STREQUAL "")
     SET(CTEST_CMAKE_GENERATOR ${_generator})
   ELSE()
-    MESSAGE(FATAL_ERROR "
-The build directory is not configured and CTEST_CMAKE_GENERATOR is not set.
-Please set CTEST_CMAKE_GENERATOR to the generator that should be used.
-"
-     )
+    # default to "Unix Makefiles"
+    SET(CTEST_CMAKE_GENERATOR "Unix Makefiles")
   ENDIF()
 ELSE()
   # ensure that CTEST_CMAKE_GENERATOR (that was apparantly set) is
@@ -324,16 +318,6 @@ ELSE()
     )
 ENDIF()
 
-#
-# NO_JOBS:
-#
-
-IF("${NO_JOBS}" STREQUAL "")
-  SET(NO_JOBS "1")
-ENDIF()
-
-MESSAGE("-- NO_JOBS:                ${NO_JOBS}")
-
 #
 # Declare files that should be submitted as notes:
 #
@@ -362,6 +346,6 @@ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND}
   --build ${CTEST_BINARY_DIRECTORY} --target setup_test
   )
 
-CTEST_TEST(PARALLEL_LEVEL ${NO_JOBS})
+CTEST_TEST()
 
 CTEST_SUBMIT()