Backed out changeset 08009e8417e9 (bug 951314) for Windows bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 19 Dec 2013 11:58:24 -0500
changeset 177310 3d0de9cfddcb37b6c80ae8dd66ff021b446e7805
parent 177309 08009e8417e9844e6c7366a26e4c522cf2d7c20f
child 177311 57eb08af0794e358e38fc4acbee428870d877f7c
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs951314
milestone29.0a1
backs out08009e8417e9844e6c7366a26e4c522cf2d7c20f
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
Backed out changeset 08009e8417e9 (bug 951314) for Windows bustage.
build/automation.py.in
build/automationutils.py
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -506,21 +506,25 @@ class Automation(object):
       env['MOZ_CRASHREPORTER'] = '1'
     else:
       env['MOZ_CRASHREPORTER_DISABLE'] = '1'
 
     env['GNOME_DISABLE_CRASH_DIALOG'] = '1'
     env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1'
     env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1'
 
-    # Set WebRTC logging in case it is not set yet
-    env.setdefault('NSPR_LOG_MODULES', 'signaling:5,mtransport:3')
-    env.setdefault('R_LOG_LEVEL', '5')
-    env.setdefault('R_LOG_DESTINATION', 'stderr')
-    env.setdefault('R_LOG_VERBOSE', '1')
+    # 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)
+    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
     if self.IS_ASAN and (self.IS_LINUX or self.IS_MAC):
       # Symbolizer support
       llvmsym = os.path.join(xrePath, "llvm-symbolizer")
       if os.path.isfile(llvmsym):
         env["ASAN_SYMBOLIZER_PATH"] = llvmsym
         self.log.info("INFO | automation.py | ASan using symbolizer at %s", llvmsym)
--- a/build/automationutils.py
+++ b/build/automationutils.py
@@ -443,21 +443,24 @@ def environment(xrePath, env=None, crash
   env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1'
 
   if crashreporter and not debugger:
     env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
     env['MOZ_CRASHREPORTER'] = '1'
   else:
     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('R_LOG_LEVEL', '5')
-  env.setdefault('R_LOG_DESTINATION', 'stderr')
-  env.setdefault('R_LOG_VERBOSE', '1')
+  env['R_LOG_LEVEL'] = '5'
+  env['R_LOG_DESTINATION'] = 'stderr'
+  env['R_LOG_VERBOSE'] = '1'
 
   # ASan specific environment stuff
   asan = bool(mozinfo.info.get("asan"))
   if asan and (mozinfo.isLinux or mozinfo.isMac):
     try:
       # Symbolizer support
       llvmsym = os.path.join(xrePath, "llvm-symbolizer")
       if os.path.isfile(llvmsym):