Backed out changeset 08009e8417e9 (bug 951314) for Windows bustage.

This commit is contained in:
Ryan VanderMeulen
2013-12-19 11:58:24 -05:00
parent a3d69da450
commit 11c3f8d48e
2 changed files with 16 additions and 9 deletions

View File

@@ -511,11 +511,15 @@ class Automation(object):
env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1' env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1'
env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1' env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1'
# Set WebRTC logging in case it is not set yet # Additional temporary logging while we try to debug some intermittent
env.setdefault('NSPR_LOG_MODULES', 'signaling:5,mtransport:3') # WebRTC conditions. This is necessary to troubleshoot bugs 841496,
env.setdefault('R_LOG_LEVEL', '5') # 841150, and 839677 (at least)
env.setdefault('R_LOG_DESTINATION', 'stderr') # Also (temporary) bug 870002 (mediastreamgraph)
env.setdefault('R_LOG_VERBOSE', '1') if 'NSPR_LOG_MODULES' not in env:
env['NSPR_LOG_MODULES'] = 'signaling:5,mtransport:3'
env['R_LOG_LEVEL'] = '5'
env['R_LOG_DESTINATION'] = 'stderr'
env['R_LOG_VERBOSE'] = '1'
# ASan specific environment stuff # ASan specific environment stuff
if self.IS_ASAN and (self.IS_LINUX or self.IS_MAC): if self.IS_ASAN and (self.IS_LINUX or self.IS_MAC):

View File

@@ -448,11 +448,14 @@ def environment(xrePath, env=None, crashreporter=True, debugger=False, dmdPath=N
else: else:
env['MOZ_CRASHREPORTER_DISABLE'] = '1' env['MOZ_CRASHREPORTER_DISABLE'] = '1'
# Set WebRTC logging in case it is not set yet # Additional temporary logging while we try to debug some intermittent
# WebRTC conditions. This is necessary to troubleshoot bugs 841496,
# 841150, and 839677 (at least)
# Also (temporary) bug 870002 (mediastreamgraph)
env.setdefault('NSPR_LOG_MODULES', 'signaling:5,mtransport:3') env.setdefault('NSPR_LOG_MODULES', 'signaling:5,mtransport:3')
env.setdefault('R_LOG_LEVEL', '5') env['R_LOG_LEVEL'] = '5'
env.setdefault('R_LOG_DESTINATION', 'stderr') env['R_LOG_DESTINATION'] = 'stderr'
env.setdefault('R_LOG_VERBOSE', '1') env['R_LOG_VERBOSE'] = '1'
# ASan specific environment stuff # ASan specific environment stuff
asan = bool(mozinfo.info.get("asan")) asan = bool(mozinfo.info.get("asan"))