aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar David Klempner <klempner@google.com>2015-02-04 16:08:01 -0800
committerGravatar David Klempner <klempner@google.com>2015-02-04 16:08:01 -0800
commit1d0302d03df9d5bde57fb326c5df3f6de43ddd6f (patch)
treedb114245abb6feefeec6db112903c7cbdbfc5f1b /tools
parent56c3dd7d6c604221e9b5f26fcc90ff593068004f (diff)
Add a tsan suppression file with OPENSSL_cleanse and use it in run_tests
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/run_tests.py5
-rw-r--r--tools/tsan_suppressions.txt2
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 280c3f05cb..cb54c0db82 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -108,10 +108,11 @@ class PythonLanguage(object):
_CONFIGS = {
'dbg': SimpleConfig('dbg'),
'opt': SimpleConfig('opt'),
- 'tsan': SimpleConfig('tsan'),
+ 'tsan': SimpleConfig('tsan', environ={
+ 'TSAN_OPTIONS': 'suppressions=tools/tsan_suppressions.txt'}),
'msan': SimpleConfig('msan'),
'asan': SimpleConfig('asan', environ={
- 'ASAN_OPTIONS': 'detect_leaks=1:color=always'}),
+ 'ASAN_OPTIONS': 'detect_leaks=1:color=always:suppressions=tools/tsan_suppressions.txt'}),
'gcov': SimpleConfig('gcov'),
'memcheck': ValgrindConfig('valgrind', 'memcheck'),
'helgrind': ValgrindConfig('dbg', 'helgrind')
diff --git a/tools/tsan_suppressions.txt b/tools/tsan_suppressions.txt
new file mode 100644
index 0000000000..23d57f9fd1
--- /dev/null
+++ b/tools/tsan_suppressions.txt
@@ -0,0 +1,2 @@
+# OPENSSL_cleanse does racy access to a global
+race:OPENSSL_cleanse