wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out c36c8203eefe (bug 696281) for causing 10.5 trace-malloc leak tests to hang, like the apparently-not-out-of-date comment said it would

Browse Source
This commit is contained in:
Phil Ringnalda 2011-10-21 18:51:21 -07:00
parent 222d42bf92
commit c396166064
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/automation.py.in
View File

@ -654,7 +654,12 @@ 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'
env['NS_TRACE_MALLOC_DISABLE_STACKS'] = '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'
return env
if IS_WIN32:

5
testing/xpcshell/runxpcshelltests.py
View File

@ -162,7 +162,10 @@ 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
self.env["NS_TRACE_MALLOC_DISABLE_STACKS"] = "1"
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"
if sys.platform == 'win32':
self.env["PATH"] = self.env["PATH"] + ";" + self.xrePath