Skip to content

Commit 010c13e

Browse files
committed
More fixup for "[TSan] Turn on ignore_interceptors_accesses"
rdar://56545824 Original commit: More fixup for previous commit: 0f52cc47d62a27311bf4b92d9d25584d7936be11 apple-llvm-split-commit: 11240e9836b9baf408d9290e246ecf0530503a14 apple-llvm-split-dir: compiler-rt/ (cherry picked from commit e72e630)
1 parent 49e4ba6 commit 010c13e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: %clangxx -DUSING_%tool_name %s -o %t
55

66
// Intentionally don't inherit the default options.
7-
// RUN: env %tool_options='' not --crash %run %t 2>&1
7+
// RUN: env %tool_options='' TSAN_OPTIONS=ignore_interceptors_accesses=0 not --crash %run %t 2>&1
88

99
// When we use lit's default options, we shouldn't crash.
1010
// RUN: not %run %t 2>&1

compiler-rt/test/sanitizer_common/lit.common.cfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ if config.host_os == 'Darwin':
3535
# On Darwin, we default to `abort_on_error=1`, which would make tests run
3636
# much slower. Let's override this and run lit tests with 'abort_on_error=0'.
3737
default_tool_options += ['abort_on_error=0']
38-
default_tool_options += ['ignore_interceptors_accesses=0']
38+
if config.tool_name == "tsan":
39+
default_tool_options += ['ignore_interceptors_accesses=0']
3940
elif config.android:
4041
# The same as on Darwin, we default to "abort_on_error=1" which slows down
4142
# testing. Also, all existing tests are using "not" instead of "not --crash"

0 commit comments

Comments
 (0)