From c39616606422c82fced5ee4120a53a7b7ce6b421 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Fri, 21 Oct 2011 18:51:21 -0700 Subject: [PATCH] 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 --- build/automation.py.in | 7 ++++++- testing/xpcshell/runxpcshelltests.py | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build/automation.py.in b/build/automation.py.in index 047c9185345..42a294681aa 100644 --- a/build/automation.py.in +++ b/build/automation.py.in @@ -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: diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py index ea15466fabb..ecda7556ee2 100644 --- a/testing/xpcshell/runxpcshelltests.py +++ b/testing/xpcshell/runxpcshelltests.py @@ -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