From: degomme <augustin.degomme@unibas.ch>
Date: Mon, 27 Feb 2017 09:30:27 +0000 (+0100)
Subject: Cleanup Sanitizer jenkins script to allow separate launch
X-Git-Tag: v3_15~277^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/88536238307c7c1572510f70d05d2db62c9598b7

Cleanup Sanitizer jenkins script to allow separate launch
---

diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh
index e5501dabe6..63064baee4 100755
--- a/tools/jenkins/Sanitizers.sh
+++ b/tools/jenkins/Sanitizers.sh
@@ -17,6 +17,32 @@ do_cleanup() {
   done
 }
 
+if [ -z "$1" ]
+  then
+    echo "No Sanitizer type selected - run Address"
+    SANITIZER="address"
+else
+    SANITIZER=$1
+fi
+
+
+if [ "${SANITIZER}" = "address" ]
+then
+    SANITIZER_OPTIONS="-Denable_address_sanitizer=ON -Denable_undefined_sanitizer=OFF -Denable_thread_sanitizer=OFF"
+elif [ "${SANITIZER}" = "thread" ]
+then
+    export TSAN_OPTIONS="memory_limit_mb=1500"
+    SANITIZER_OPTIONS="-Denable_address_sanitizer=OFF -Denable_undefined_sanitizer=OFF -Denable_thread_sanitizer=ON"
+elif [ "${SANITIZER}" = "undefined" ]
+then
+    export UBSAN_OPTIONS="print_stacktrace=1"
+    SANITIZER_OPTIONS="-Denable_address_sanitizer=OFF -Denable_undefined_sanitizer=ON -Denable_thread_sanitizer=OFF"
+else
+    die "Unknown Sanitizer type selected  ${SANITIZER} - Exiting"
+fi
+
+
+
 ### Check the node installation
 
 for pkg in xsltproc
@@ -48,56 +74,18 @@ cd $WORKSPACE/build
 ctest -D ExperimentalStart || true
 
 cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=OFF \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
+      -Denable_compile_optimizations=ON -Denable_compile_warnings=ON \
       -Denable_jedule=ON -Denable_mallocators=OFF \
       -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=OFF \
-      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=OFF -Denable_address_sanitizer=ON -Denable_fortran=OFF $WORKSPACE
-
-make -j$NUMPROC
-ctest -D ExperimentalTest || true
-
-if [ -f Testing/TAG ] ; then
-   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_address.xml
-   mv CTestResults_address.xml $WORKSPACE
-fi
-
-make clean
-
-export TSAN_OPTIONS="memory_limit_mb=1500"
-export UBSAN_OPTIONS="print_stacktrace=1"
-
-ctest -D ExperimentalStart || true
-
-cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=OFF \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-      -Denable_jedule=ON -Denable_mallocators=ON \
-      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=OFF \
-      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=OFF -Denable_address_sanitizer=OFF -Denable_thread_sanitizer=ON -Denable_fortran=OFF  $WORKSPACE
+      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=OFF\
+      -Denable_fortran=OFF ${SANITIZER_OPTIONS} $WORKSPACE
 
 make -j$NUMPROC
 ctest -D ExperimentalTest || true
 
 if [ -f Testing/TAG ] ; then
-   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_thread.xml
-   mv CTestResults_thread.xml $WORKSPACE
+   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_${SANITIZER}.xml
+   mv CTestResults_${SANITIZER}.xml $WORKSPACE
 fi
 
 make clean
-
-ctest -D ExperimentalStart || true
-
-cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=OFF \
-      -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \
-      -Denable_jedule=ON -Denable_mallocators=ON \
-      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=OFF \
-      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=OFF -Denable_address_sanitizer=OFF -Denable_thread_sanitizer=OFF -Denable_undefined_sanitizer=ON -Denable_fortran=OFF  $WORKSPACE
-
-make -j$NUMPROC
-ctest -D ExperimentalTest || true
-
-if [ -f Testing/TAG ] ; then
-   xsltproc $WORKSPACE/tools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults_undefined.xml
-   mv CTestResults_undefined.xml $WORKSPACE
-fi
-
-