From c1fbce93ec318e94126898b6d38c36c1a4c21480 Mon Sep 17 00:00:00 2001 From: Bob Clary Date: Wed, 22 Dec 2010 22:11:00 -0800 Subject: [PATCH] Bug 615011 - Disable jsreftest/tests/jsreftest.html?test=js1_5/extensions/regress-336409-2.js on Linux debug where it times out, r=philor, a=test --HG-- extra : rebase_source : ebd9e129d0d6e9b15bff6f70c3725a1bd29d0f36 --- js/src/tests/js1_5/extensions/jstests.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/tests/js1_5/extensions/jstests.list b/js/src/tests/js1_5/extensions/jstests.list index be1f699aa25..5ed4ac61240 100644 --- a/js/src/tests/js1_5/extensions/jstests.list +++ b/js/src/tests/js1_5/extensions/jstests.list @@ -45,7 +45,7 @@ skip script regress-330569.js # Yarr doesn't bail on complex regexps. script regress-333541.js skip script regress-335700.js # bug xxx - reftest hang, BigO skip-if(!xulRuntime.shell) script regress-336409-1.js # no results reported. -skip-if(!xulRuntime.shell&&xulRuntime.XPCOMABI.match(/x86_64/)) silentfail script regress-336409-2.js # can fail silently due to out of memory +skip-if(!xulRuntime.shell&&((isDebugBuild&&xulRuntime.OS=="Linux")||xulRuntime.XPCOMABI.match(/x86_64/))) silentfail script regress-336409-2.js # can fail silently due to out of memory, bug 615011 - timeouts on slow debug Linux skip-if(!xulRuntime.shell) silentfail script regress-336410-1.js # can fail silently due to out of memory skip-if(!xulRuntime.shell&&(xulRuntime.XPCOMABI.match(/x86_64/)||xulRuntime.OS=="WINNT")) silentfail script regress-336410-2.js # can fail silently due to out of memory script regress-338804-01.js