From 3484bb1b49e6203161518fd3844797f693138e5a Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 11 Jan 2019 22:14:53 +0100 Subject: [PATCH 1/1] missing spots where we should now build 'tests' --- BuildSimGrid.sh | 2 +- tools/jenkins/Coverage.sh | 2 +- tools/jenkins/DynamicAnalysis.sh | 2 +- tools/jenkins/Flags.sh | 2 +- tools/jenkins/Sanitizers.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BuildSimGrid.sh b/BuildSimGrid.sh index 0d8bf7ce6e..472e93734a 100755 --- a/BuildSimGrid.sh +++ b/BuildSimGrid.sh @@ -11,7 +11,7 @@ if [ ! -e Makefile ] ; then exit 1 fi -target=all +target=tests install_path=$(sed -n 's/^CMAKE_INSTALL_PREFIX:PATH=//p' CMakeCache.txt) if [ -e ${install_path} -a -d ${install_path} -a -x ${install_path} ] ; then diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh index 17a9d7af3c..80473cfbd3 100755 --- a/tools/jenkins/Coverage.sh +++ b/tools/jenkins/Coverage.sh @@ -62,7 +62,7 @@ cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON \ -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE #build with sonarqube scanner wrapper -/home/ci/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs make -j$NUMPROC +/home/ci/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs make -j$NUMPROC tests JACOCO_PATH="/usr/local/share/jacoco" export JAVA_TOOL_OPTIONS="-javaagent:${JACOCO_PATH}/lib/jacocoagent.jar" diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index cf0095022d..04fe409694 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -56,7 +56,7 @@ cmake -Denable_documentation=OFF -Denable_lua=OFF \ -Denable_memcheck_xml=ON $WORKSPACE -make -j$NUMPROC +make -j$NUMPROC tests ctest --no-compress-output -D ExperimentalTest -j$NUMPROC || true cd $WORKSPACE/build diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh index 40ac3013dc..40d12dff74 100755 --- a/tools/jenkins/Flags.sh +++ b/tools/jenkins/Flags.sh @@ -89,7 +89,7 @@ cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=${buildjava} \ -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=OFF \ -Denable_ns3=$(onoff test "$buildmc" != "ON") -Denable_coverage=OFF $WORKSPACE -make -j$NUMPROC +make -j$NUMPROC tests make clean diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh index 76927130da..99806e2c7a 100755 --- a/tools/jenkins/Sanitizers.sh +++ b/tools/jenkins/Sanitizers.sh @@ -80,7 +80,7 @@ cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=OFF \ -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=OFF\ -Denable_fortran=OFF -Denable_python=OFF ${SANITIZER_OPTIONS} $WORKSPACE -make -j$NUMPROC +make -j$NUMPROC tests ctest --no-compress-output -D ExperimentalTest || true if [ -f Testing/TAG ] ; then -- 2.20.1