X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/150ddf41e65930ccbf171b14ffbb93695ca8b997..54760fdf933a7a8b677994fef3254f5fc943e05f:/tools/jenkins/Sanitizers.sh

diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh
index b41839a00a..985042ffcd 100755
--- a/tools/jenkins/Sanitizers.sh
+++ b/tools/jenkins/Sanitizers.sh
@@ -7,16 +7,6 @@ die() {
     exit 1
 }
 
-do_cleanup() {
-  for d in "$WORKSPACE/build"
-  do
-    if [ -d "$d" ]
-    then
-      rm -rf "$d" || die "Could not remote $d"
-    fi
-  done
-}
-
 if [ -z "$1" ]
   then
     echo "No Sanitizer type selected - run Address"
@@ -28,11 +18,11 @@ fi
 
 if [ "${SANITIZER}" = "address" ]
 then
-    export ASAN_OPTIONS="suppressions=$WORKSPACE/tools/sanitizers.supp"
+    export ASAN_OPTIONS="suppressions=$WORKSPACE/tools/address_sanitizer.supp"
     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"
+    export TSAN_OPTIONS="memory_limit_mb=1500 suppressions=$WORKSPACE/tools/thread_sanitizer.supp"
     SANITIZER_OPTIONS="-Denable_address_sanitizer=OFF -Denable_undefined_sanitizer=OFF -Denable_thread_sanitizer=ON"
 elif [ "${SANITIZER}" = "undefined" ]
 then
@@ -46,27 +36,37 @@ fi
 
 ### Check the node installation
 
-for pkg in xsltproc
-do
-   if command -v $pkg
-   then
-      echo "$pkg is installed. Good."
-   else
-      die "please install $pkg before proceeding"
-   fi
-done
+pkg_check() {
+  for pkg
+  do
+    if command -v $pkg
+    then
+       echo "$pkg is installed. Good."
+    else
+       die "please install $pkg before proceeding"
+    fi
+  done
+}
+
+pkg_check xsltproc
 
 ### Cleanup previous runs
 
 ! [ -z "$WORKSPACE" ] || die "No WORKSPACE"
 [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist"
 
-do_cleanup
+do_cleanup() {
+  for d
+  do
+    if [ -d "$d" ]
+    then
+      rm -rf "$d" || die "Could not remove $d"
+    fi
+    mkdir "$d" || die "Could not create $d"
+  done
+}
 
-for d in "$WORKSPACE/build"
-do
-  mkdir "$d" || die "Could not create $d"
-done
+do_cleanup "$WORKSPACE/build"
 
 NUMPROC="$(nproc)" || NUMPROC=1