Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index 42a6bd0..d84e04a 100644 (file)
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -58,7 +58,9 @@ namespace mc {
 // List of library which memory segments are not considered:
 static const char *const filtered_libraries[] = {
   "ld",
-  "libasan", /* gcc sanitizer */
+  "libasan", /* gcc sanitizers */
+  "libtsan",
+  "libubsan",
   "libbz2",
   "libboost_chrono",
   "libboost_context",

diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh
index bf86ef6..848eab2 100755 (executable)
--- a/tools/jenkins/Sanitizers.sh
+++ b/tools/jenkins/Sanitizers.sh
@@ -50,8 +50,8 @@ 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=OFF \
-      -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=OFF \
-      -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=OFF -Denable_coverage=OFF -Denable_address_sanitizer=ON -Denable_fortran=OFF $WORKSPACE
+      -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=OFF -Denable_address_sanitizer=ON -Denable_fortran=OFF $WORKSPACE
 
 make -j$NUMPROC
 ctest -D ExperimentalTest || true
@@ -70,8 +70,8 @@ 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=OFF -Denable_coverage=OFF -Denable_address_sanitizer=OFF -Denable_thread_sanitizer=ON -Denable_fortran=OFF  $WORKSPACE
+      -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=OFF -Denable_address_sanitizer=OFF -Denable_thread_sanitizer=ON -Denable_fortran=OFF  $WORKSPACE
 
 make -j$NUMPROC
 ctest -D ExperimentalTest || true
@@ -88,8 +88,8 @@ 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=OFF -Denable_coverage=OFF -Denable_address_sanitizer=OFF -Denable_thread_sanitizer=OFF -Denable_undefined_sanitizer=ON -Denable_fortran=OFF  $WORKSPACE
+      -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=OFF -Denable_address_sanitizer=OFF -Denable_thread_sanitizer=OFF -Denable_undefined_sanitizer=ON -Denable_fortran=OFF  $WORKSPACE
 
 make -j$NUMPROC
 ctest -D ExperimentalTest || true