Bug 1121216 - disable BackgroundHangMonitor for TSan builds; r=jchen
authorNathan Froyd <froydnj@mozilla.com>
Tue, 04 Aug 2015 00:27:59 -0400
changeset 297588 6f1eb6ef900aa05534b9b78196a884d7f8bd40de
parent 297587 ff69597b1ee495f1290a9a338679d8b5edf0873b
child 297589 22034e83a6aa75513c420902d2cb48f14db330c3
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjchen
bugs1121216
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1121216 - disable BackgroundHangMonitor for TSan builds; r=jchen
xpcom/threads/moz.build
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -67,14 +67,18 @@ LOCAL_INCLUDES += [
     '/caps',
     '/toolkit/crashreporter/google-breakpad/src',
     '/tools/profiler',
 ]
 
 # BHR disabled for Release builds because of bug 965392.
 # BHR disabled for debug builds because of bug 979069.
 # BHR disabled on gonk because of bug 1180533
-if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release') and not CONFIG['MOZ_DEBUG'] and not CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+# BHR disabled for TSan builds because of bug 1121216.
+if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release') and \
+   not CONFIG['MOZ_DEBUG'] and \
+   not CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and \
+   not CONFIG['MOZ_TSAN']:
     DEFINES['MOZ_ENABLE_BACKGROUND_HANG_MONITOR'] = 1
 
 FINAL_LIBRARY = 'xul'
 
 include('/ipc/chromium/chromium-config.mozbuild')