summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2020-08-17 14:01:09 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-08-17 23:45:47 +0000
commit99e85a18ec8a12c5988fe03ad83e0f064cc6dd6f (patch)
tree1f480b0229e00ff092bb833247a42f816195baf5 /SConstruct
parent534031f397c801d860eab4866053422b74d1ab3c (diff)
downloadmongo-99e85a18ec8a12c5988fe03ad83e0f064cc6dd6f.tar.gz
SERVER-48490 Suppress thread_leak errors under TSAN
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct21
1 files changed, 13 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct
index 9026d5ef655..01a88b84669 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2963,14 +2963,19 @@ def doConfigure(myenv):
# the benefits of libunwind. Fixing this is:
env.FatalError("Cannot use libunwind with TSAN, please add --use-libunwind=off to your compile flags")
- # If anything is changed, added, or removed in tsan_options, be sure
- # to make the corresponding changes to the appropriate build
- # variants in etc/evergreen.yml
- # die_after_fork=0 is a temporary setting to allow tests to continue while we figure out why
- # we're running afoul of it. If we remove it here, it also needs to be removed from the test
- # variant in etc/evergreen.yml
- # TODO: https://jira.mongodb.org/browse/SERVER-49121
- tsan_options += "die_after_fork=0:suppressions=\"%s\" " % myenv.File("#etc/tsan.suppressions").abspath
+ # If anything is changed, added, or removed in
+ # tsan_options, be sure to make the corresponding changes
+ # to the appropriate build variants in etc/evergreen.yml
+ #
+ # TODO SERVER-49121: die_after_fork=0 is a temporary
+ # setting to allow tests to continue while we figure out
+ # why we're running afoul of it.
+ #
+ # TODO SERVER-48490: report_thread_leaks=0 suppresses
+ # reporting thread leaks, which we have because we don't
+ # do a clean shutdown of the ServiceContext.
+ #
+ tsan_options += "halt_on_error=1:report_thread_leaks=0:die_after_fork=0:suppressions=\"%s\" " % myenv.File("#etc/tsan.suppressions").abspath
myenv['ENV']['TSAN_OPTIONS'] = tsan_options
myenv.AppendUnique(CPPDEFINES=['THREAD_SANITIZER'])