Skip to content

Commit 49e4ba6

Browse files
authored
Merge pull request #32 from apple/tsan-flag-for-test
[TSan] Fix CI test failures
2 parents 48f68ac + 52b2ed3 commit 49e4ba6

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ 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']
3839
elif config.android:
3940
# The same as on Darwin, we default to "abort_on_error=1" which slows down
4041
# testing. Also, all existing tests are using "not" instead of "not --crash"

compiler-rt/test/tsan/Unit/lit.site.cfg.in

+1
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ if config.host_os == 'Darwin':
2121
config.environment['TSAN_OPTIONS'] += ':ignore_noninstrumented_modules=0'
2222
else:
2323
config.environment['TSAN_OPTIONS'] = 'ignore_noninstrumented_modules=0'
24+
config.environment['TSAN_OPTIONS'] += ':ignore_interceptors_accesses=0'

compiler-rt/test/tsan/lit.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if config.host_os == 'Darwin':
2828
# suppresses some races the tests are supposed to find. Let's run without this
2929
# setting, but turn it back on for Darwin tests (see Darwin/lit.local.cfg).
3030
default_tsan_opts += ':ignore_noninstrumented_modules=0'
31+
default_tsan_opts += ':ignore_interceptors_accesses=0'
3132

3233
# Platform-specific default TSAN_OPTIONS for lit tests.
3334
if default_tsan_opts:

0 commit comments

Comments
 (0)