]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Be a bit more agressive with the mpi tests
authorMatthias Maier <tamiko@kyomu.43-1.org>
Sat, 28 Sep 2013 15:23:33 +0000 (15:23 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Sat, 28 Sep 2013 15:23:33 +0000 (15:23 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31001 0785d39b-7218-0410-832d-ea1e28bc413d

tests/cmake/macros/macro_add_test.cmake

index 1a5ebd515c0c870c2a86f7142acad6133274b745..a12bb0f8ed67d48366a0d7de0c022d8a95567227 100644 (file)
@@ -82,10 +82,11 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu)
       IF("${_n_cpu}" STREQUAL "0")
         SET(_target ${_test_name}.${_build_lowercase}) # the target name for the executable
         SET(_run_command) # the first part of the command to issue
-        SET(_n_cpu 1) # set it to one, we'll still occupy one processor to run a test ;-)
+        SET(_processors 1)
       ELSE()
         SET(_target ${_test_name}.mpirun=${_n_cpu}.${_build_lowercase}) # the target name for the executable
         SET(_run_command mpirun -np ${_n_cpu}) # the first part of the command to issue
+        SET(_processors 2) # heuristically...
       ENDIF()
 
       SET(_test_full ${_category}/${_target}) # full test name
@@ -186,7 +187,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file _n_cpu)
       SET_TESTS_PROPERTIES(${_test_full} PROPERTIES
         LABEL "${_category}"
         TIMEOUT ${TEST_TIME_LIMIT}
-        PROCESSORS ${_n_cpu} # 0 was changed to 1 above.
+        PROCESSORS ${_processors}
         )
     ENDIF()
   ENDFOREACH()

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.