From 2c89244eb0c2a35bc594e9af457d4a03ed0db184 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sat, 1 Feb 2020 14:14:50 +0100
Subject: [PATCH 1/1] Rename ASAN suppressions file.

Existing suppressions seem useless nowadays, comment them.
---
 MANIFEST.in                                       | 2 +-
 tools/CMakeLists.txt                              | 2 +-
 tools/{sanitizers.supp => address_sanitizer.supp} | 4 ++--
 tools/jenkins/Sanitizers.sh                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename tools/{sanitizers.supp => address_sanitizer.supp} (63%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 11de5c783e..ecb059bb3e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1726,6 +1726,7 @@ include teshsuite/xbt/signals/signals.cpp
 include teshsuite/xbt/signals/signals.tesh
 include tools/MSG_visualization/colorize.pl
 include tools/MSG_visualization/trace2fig.pl
+include tools/address_sanitizer.supp
 include tools/doxygen/fig2dev_postprocessor.pl
 include tools/doxygen/xbt_log_extract_hierarchy.pl
 include tools/fix-paje-trace.sh
@@ -1734,7 +1735,6 @@ include tools/graphicator/graphicator.c
 include tools/graphicator/graphicator.tesh
 include tools/normalize-pointers.py
 include tools/pkg-config/simgrid.pc.in
-include tools/sanitizers.supp
 include tools/sg_xml_unit_converter.py
 include tools/simgrid.supp
 include tools/simgrid2vite.sed
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 821c0f2110..04b2116865 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -10,6 +10,6 @@ set(bin_files ${bin_files}    ${CMAKE_CURRENT_SOURCE_DIR}/fix-paje-trace.sh
                               ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/trace2fig.pl          PARENT_SCOPE)
 
 set(txt_files ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/pkg-config/simgrid.pc.in
-                              ${CMAKE_CURRENT_SOURCE_DIR}/sanitizers.supp
+                              ${CMAKE_CURRENT_SOURCE_DIR}/address_sanitizer.supp
                               ${CMAKE_CURRENT_SOURCE_DIR}/simgrid.supp
                               ${CMAKE_CURRENT_SOURCE_DIR}/simgrid2vite.sed                        PARENT_SCOPE)
diff --git a/tools/sanitizers.supp b/tools/address_sanitizer.supp
similarity index 63%
rename from tools/sanitizers.supp
rename to tools/address_sanitizer.supp
index a62bf07d9e..1995cb1977 100644
--- a/tools/sanitizers.supp
+++ b/tools/address_sanitizer.supp
@@ -1,7 +1,7 @@
 # Address sanitizer suppressions for stuff that we cannot control
 
 # ignore libunwind cruft
-interceptor_via_lib:libunwind.so
+#interceptor_via_lib:libunwind.so
 
 # __gnu_cxx::__to_xstring
-interceptor_via_fun:__to_xstring
+#interceptor_via_fun:__to_xstring
diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh
index 2a7719f41b..3a35fadd04 100755
--- a/tools/jenkins/Sanitizers.sh
+++ b/tools/jenkins/Sanitizers.sh
@@ -18,7 +18,7 @@ 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
-- 
2.20.1