From e97e8910e1dc6c9c98ab17c8525f3df6bcdd10da Mon Sep 17 00:00:00 2001 From: degomme Date: Sun, 17 Apr 2016 18:34:53 +0200 Subject: [PATCH] Allow parallel dynamicanalysis --- tools/jenkins/Coverage.sh | 6 ++++-- tools/jenkins/DynamicAnalysis.sh | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh index ccfb85b46a..6310ddb64e 100755 --- a/tools/jenkins/Coverage.sh +++ b/tools/jenkins/Coverage.sh @@ -41,6 +41,8 @@ do mkdir "$d" || die "Could not create $d" done +NUMPROC="$(nproc)" || NUMPROC=1 + cd $WORKSPACE/build ctest -D ExperimentalStart || true @@ -51,8 +53,8 @@ cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON \ -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=ON \ -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE -ctest -D ExperimentalBuild -V -ctest -D ExperimentalTest -E liveness || true +make -j$NUMPROC +ctest -D ExperimentalTest -j$NUMPROC || true ctest -D ExperimentalCoverage || true if [ -f Testing/TAG ] ; then diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index 9638f76102..f11b843018 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -42,6 +42,8 @@ do mkdir "$d" || die "Could not create $d" done +NUMPROC="$(nproc)" || NUMPROC=1 + cd $WORKSPACE/build ### Proceed with the tests @@ -53,8 +55,9 @@ cmake -Denable_documentation=OFF -Denable_lua=OFF \ -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \ -Denable_memcheck_xml=ON $WORKSPACE -ctest -D ExperimentalBuild -V -ctest -D ExperimentalTest || true + +make -j$NUMPROC +ctest -D ExperimentalTest -j$NUMPROC || true cd $WORKSPACE/build if [ -f Testing/TAG ] ; then -- 2.20.1