Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 15:55:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 696281 - Disable trace malloc stacks on OS X too. r=dbaron.

Browse Source
This commit is contained in:
Rafael Ávila de Espíndola 2011-10-21 11:00:40 -04:00
parent 888c49fd78
commit 68ff427765
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/automation.py.in
View File

@ -654,12 +654,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
env['GNOME_DISABLE_CRASH_DIALOG'] = '1'
env['XRE_NO_WINDOWS_CRASH_DIALOG'] = '1'
# Don't do this for Mac since it makes the Mac OS X 10.5 (32-bit)
# trace-malloc leak test hang. (It doesn't make the 10.6 (64-bit)
# leak test hang, though.)
if not self.IS_MAC:
env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1'
env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '1'
return env
if IS_WIN32:

5
testing/xpcshell/runxpcshelltests.py
View File

@ -162,10 +162,7 @@ class XPCShellTests(object):
self.env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
# Capturing backtraces is very slow on some platforms, and it's
# disabled by automation.py too
if not (sys.platform == 'osx' or sys.platform == "darwin"):
# XXX automation.py has this odd special case; without it, bug
# 618052 seems to be exacerbated
self.env["NS_TRACE_MALLOC_DISABLE_STACKS"] = "1"
self.env["NS_TRACE_MALLOC_DISABLE_STACKS"] = "1"
if sys.platform == 'win32':
self.env["PATH"] = self.env["PATH"] + ";" + self.xrePath