From 9a0f36241a68cd909aeb5a2a052d1a2124bb07d2 Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Thu, 12 May 2011 12:47:38 -0400 Subject: [PATCH] Bug 655752 - 3 jsreftests cause failures on Android. r=bc, a=test-only --- js/src/tests/js1_5/extensions/jstests.list | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/tests/js1_5/extensions/jstests.list b/js/src/tests/js1_5/extensions/jstests.list index 1953e18cf6c..32099302f2c 100644 --- a/js/src/tests/js1_5/extensions/jstests.list +++ b/js/src/tests/js1_5/extensions/jstests.list @@ -45,9 +45,9 @@ 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) slow script regress-336409-1.js # no results reported. -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&&((Android||(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&&((isDebugBuild&&xulRuntime.OS=="Linux")||xulRuntime.XPCOMABI.match(/x86_64/)||xulRuntime.OS=="WINNT")) silentfail script regress-336410-2.js # can fail silently due to out of memory, bug 621348 - timeouts on slow debug Linux +skip-if(!xulRuntime.shell&&((isDebugBuild&&xulRuntime.OS=="Linux")||Android||xulRuntime.XPCOMABI.match(/x86_64/)||xulRuntime.OS=="WINNT")) silentfail script regress-336410-2.js # can fail silently due to out of memory, bug 621348 - timeouts on slow debug Linux script regress-338804-01.js script regress-338804-02.js script regress-338804-03.js @@ -55,7 +55,7 @@ script regress-339685.js script regress-341956-01.js script regress-341956-02.js script regress-341956-03.js -skip-if(!xulRuntime.shell&&(xulRuntime.OS=="WINNT"||xulRuntime.OS=="Linux")) silentfail script regress-342960.js # bug 528464 +skip-if(!xulRuntime.shell&&(Android||xulRuntime.OS=="WINNT"||xulRuntime.OS=="Linux")) silentfail script regress-342960.js # bug 528464 skip script regress-345967.js # slow script regress-346494-01.js script regress-346494.js