From: Matthias Maier Date: Mon, 28 Apr 2014 22:24:34 +0000 (+0000) Subject: Be a bit less restrictive X-Git-Tag: v8.2.0-rc1~537 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc17d69b313d2ff9454a9e65143870dea97f3a51;p=dealii.git Be a bit less restrictive git-svn-id: https://svn.dealii.org/trunk@32855 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/macros/macro_add_test.cmake b/deal.II/cmake/macros/macro_add_test.cmake index 758604e778..cc47fb41d1 100644 --- a/deal.II/cmake/macros/macro_add_test.cmake +++ b/deal.II/cmake/macros/macro_add_test.cmake @@ -258,12 +258,15 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file) TIMEOUT ${TEST_TIME_LIMIT} ) - IF(NOT "${_n_cpu}" STREQUAL "0") + IF(_n_cpu GREATER 4) + MATH(EXPR _slots "${_n_cpu} / 2") # # Limit concurrency of mpi tests: # - SET_TESTS_PROPERTIES(${_test_full} PROPERTIES PROCESSORS ${_n_cpu}) + SET_TESTS_PROPERTIES(${_test_full} PROPERTIES PROCESSORS ${_slots}) + ENDIF() + IF(NOT "${_n_cpu}" STREQUAL "0") # # We have to be careful not to run different mpirun settings for the # same executable in parallel because this triggers a race condition