diff --git a/CbmRoot_test.cmake b/CbmRoot_test.cmake index 14c9de60e2e3ba9f0c21997168c0b929ff21c1c0..7c0eef2e0c3dec752cf8c85640863b49b9277620 100644 --- a/CbmRoot_test.cmake +++ b/CbmRoot_test.cmake @@ -33,6 +33,9 @@ Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -i -k -j$ENV{number_of_processors}") #Include(CbmMacros) #FairRootVersion() +message("Compiling with $ENV{number_of_processors} jobs in parallel.") +message("Testing with $ENV{number_of_processors_for_test} jobs in parallel.") + Set(CTEST_USE_LAUNCHERS 1) If(${CBM_TEST_MODEL} MATCHES MergeRequest OR ${CBM_TEST_MODEL} MATCHES Continuous) @@ -139,7 +142,7 @@ If(NOT _RETVAL) EndIf() Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}" - PARALLEL_LEVEL $ENV{number_of_processors} + PARALLEL_LEVEL $ENV{number_of_processors_for_test} ${repeat} ${stop_time} RETURN_VALUE _ctest_test_ret_val diff --git a/Dart.sh b/Dart.sh index 4af49c69bc1e61d3120c58fd36eacacdca8857a1..8fb6f6874d50f6e2dcf6f504c66249ff004e97c0 100755 --- a/Dart.sh +++ b/Dart.sh @@ -119,15 +119,22 @@ then fi fi +if [ -z $NCPU4TEST ]; then + export number_of_processors_for_test=$number_of_processors +else + export number_of_processors_for_test=$NCPU4TEST +fi + echo "************************" date echo "LABEL: " $LABEL echo "SITE: " $SITE echo "Model: " ${ctest_model} -echo "Nr. of processes: " $number_of_processors +echo "Nr. of processes for build: " $number_of_processors +echo "Nr. of processes for test: " $number_of_processors_for_test echo "************************" cd $SOURCEDIR -ctest -S $SOURCEDIR/CbmRoot_test.cmake -V --VV -DCBM_TEST_MODEL=${ctest_model} +ctest -S $SOURCEDIR/CbmRoot_test.cmake -V -DCBM_TEST_MODEL=${ctest_model} #ctest -S $SOURCEDIR/CbmRoot_test.cmake -V --VV