From 138809d514e2f6598000ade2ebe262861ea5f03b Mon Sep 17 00:00:00 2001 From: Chris Leary Date: Mon, 31 Jan 2011 19:10:07 -0800 Subject: [PATCH] Backed out changeset a4ec3ddcfc37 due to failure parsing manifest file. --- js/src/tests/e4x/Regress/jstests.list | 4 ++-- js/src/tests/js1_5/GC/jstests.list | 4 ++-- js/src/tests/js1_5/Regress/jstests.list | 10 +++++----- js/src/tests/js1_5/extensions/jstests.list | 8 ++++---- js/src/tests/js1_6/extensions/jstests.list | 2 +- js/src/tests/js1_7/extensions/jstests.list | 2 +- js/src/tests/js1_8/extensions/jstests.list | 4 ++-- js/src/tests/manifest.py | 5 ----- 8 files changed, 17 insertions(+), 22 deletions(-) diff --git a/js/src/tests/e4x/Regress/jstests.list b/js/src/tests/e4x/Regress/jstests.list index 5d1f241c570..ea8a589c2c9 100644 --- a/js/src/tests/e4x/Regress/jstests.list +++ b/js/src/tests/e4x/Regress/jstests.list @@ -18,7 +18,7 @@ script regress-301553.js script regress-301573.js script regress-301596.js script regress-301692.js -skip-if(!xulRuntime.shell&&isDebugBuild) slow script regress-308111.js +skip-if(!xulRuntime.shell&&isDebugBuild) script regress-308111.js # slow script regress-309897.js script regress-311580.js script regress-313799.js @@ -41,7 +41,7 @@ script regress-344455.js script regress-347155.js script regress-350206-1.js script regress-350206.js -skip-if(!xulRuntime.shell) slow script regress-350238.js +skip-if(!xulRuntime.shell) script regress-350238.js # slow script regress-350629.js script regress-352097.js script regress-352103.js diff --git a/js/src/tests/js1_5/GC/jstests.list b/js/src/tests/js1_5/GC/jstests.list index 05d4a4eaaeb..d83900a44d2 100644 --- a/js/src/tests/js1_5/GC/jstests.list +++ b/js/src/tests/js1_5/GC/jstests.list @@ -1,6 +1,6 @@ url-prefix ../../jsreftest.html?test=js1_5/GC/ script regress-104584.js -skip-if(!xulRuntime.shell&&xulRuntime.OS=="Darwin") slow script regress-203278-2.js +skip-if(!xulRuntime.shell&&xulRuntime.OS=="Darwin") script regress-203278-2.js # slow script regress-203278-3.js script regress-278725.js script regress-306788.js @@ -10,7 +10,7 @@ script regress-313479.js script regress-316885-01.js script regress-316885-02.js script regress-316885-03.js -skip-if(!xulRuntime.shell) slow script regress-319980-01.js +skip-if(!xulRuntime.shell) script regress-319980-01.js # slow skip script regress-324278.js # slow, obsoleted by 98409 fix script regress-331719.js skip script regress-338653.js # slow, killed on x86_64 diff --git a/js/src/tests/js1_5/Regress/jstests.list b/js/src/tests/js1_5/Regress/jstests.list index 2c204d4f62e..87c0c5e8290 100644 --- a/js/src/tests/js1_5/Regress/jstests.list +++ b/js/src/tests/js1_5/Regress/jstests.list @@ -12,7 +12,7 @@ script regress-115436.js script regress-116228.js script regress-118849.js skip script regress-119719.js # obsolete test -skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-127243.js +skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) script regress-127243.js # slow script regress-127557.js script regress-131510-001.js script regress-139316.js @@ -130,7 +130,7 @@ script regress-31255.js script regress-312588.js random script regress-313967-01.js # BigO random script regress-313967-02.js # BigO -skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-314401.js +skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) script regress-314401.js # slow script regress-315974.js script regress-315990.js script regress-317476.js @@ -165,7 +165,7 @@ script regress-334807-06.js script regress-336100.js script regress-338307.js script regress-340369.js -skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-341360.js +skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) script regress-341360.js # slow script regress-343713.js script regress-343966.js script regress-344711-n.js @@ -238,13 +238,13 @@ script regress-416737-01.js script regress-416737-02.js script regress-417893.js script regress-418504.js -skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-418540.js +skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) script regress-418540.js # slow script regress-419018.js script regress-419803.js script regress-420919.js skip-if(xulRuntime.XPCOMABI.match(/x86_64/)) script regress-422348.js # On 64-bit, takes forever rather than throwing script regress-424311.js -skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-425360.js +skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) script regress-425360.js # slow script regress-426827.js script regress-428366.js script regress-438415-01.js diff --git a/js/src/tests/js1_5/extensions/jstests.list b/js/src/tests/js1_5/extensions/jstests.list index 76d6373e9be..61461bedc1b 100644 --- a/js/src/tests/js1_5/extensions/jstests.list +++ b/js/src/tests/js1_5/extensions/jstests.list @@ -44,7 +44,7 @@ script regress-328556.js 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) 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) 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 @@ -106,7 +106,7 @@ script regress-361856.js skip script regress-361964.js # slow, alert not dismissed, now busted by harness random script regress-363258.js # bug 524788 script regress-363988.js -script regress-365527.js slow +script regress-365527.js script regress-365692.js script regress-365869.js script regress-366288.js @@ -123,7 +123,7 @@ script regress-367501-01.js script regress-367501-02.js script regress-367501-03.js script regress-367501-04.js -skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-367589.js +skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) script regress-367589.js # slow script regress-367630.js script regress-367923.js script regress-368859.js @@ -154,7 +154,7 @@ script regress-396326.js skip script regress-406572.js script regress-407019.js script regress-407501.js -skip-if(!xulRuntime.shell) slow script regress-407720.js +skip-if(!xulRuntime.shell) script regress-407720.js # slow script regress-412926.js script regress-414755.js script regress-416354.js diff --git a/js/src/tests/js1_6/extensions/jstests.list b/js/src/tests/js1_6/extensions/jstests.list index 7ba406bac46..3589eb32457 100644 --- a/js/src/tests/js1_6/extensions/jstests.list +++ b/js/src/tests/js1_6/extensions/jstests.list @@ -7,7 +7,7 @@ fails-if(!xulRuntime.shell) script regress-455464-01.js # bug - NS_ERROR_DOM_NOT fails-if(!xulRuntime.shell) script regress-455464-02.js # bug - NS_ERROR_DOM_NOT_SUPPORTED_ERR line 49 fails-if(!xulRuntime.shell) script regress-455464-03.js # bug - NS_ERROR_DOM_NOT_SUPPORTED_ERR line 1 fails-if(!xulRuntime.shell&&!isDebugBuild) skip-if(!xulRuntime.shell&&isDebugBuild) script regress-455464-04.js # bug xxx - hangs reftests in debug, ### bug xxx - NS_ERROR_DOM_NOT_SUPPORTED_ERR in opt -skip-if(!xulRuntime.shell) slow script regress-456826.js # bug 504632 +skip-if(!xulRuntime.shell) script regress-456826.js # bug 504632 script regress-457521.js script regress-465443.js script regress-470310.js diff --git a/js/src/tests/js1_7/extensions/jstests.list b/js/src/tests/js1_7/extensions/jstests.list index 6a8753f7437..c77d28229ea 100644 --- a/js/src/tests/js1_7/extensions/jstests.list +++ b/js/src/tests/js1_7/extensions/jstests.list @@ -53,7 +53,7 @@ script regress-429266.js script regress-453955.js fails-if(!xulRuntime.shell) script regress-455982-01.js # NS_ERROR_DOM_NOT_SUPPORTED_ERR fails-if(!xulRuntime.shell) script regress-455982-02.js # NS_ERROR_DOM_NOT_SUPPORTED_ERR -skip-if(!xulRuntime.shell||xulRuntime.shell&&xulRuntime.XPCOMABI.match(/x86_64/)) slow script regress-458679.js +skip-if(!xulRuntime.shell||xulRuntime.shell&&xulRuntime.XPCOMABI.match(/x86_64/)) script regress-458679.js # slow script regress-469234.js script regress-469405-01.js script regress-469405-02.js diff --git a/js/src/tests/js1_8/extensions/jstests.list b/js/src/tests/js1_8/extensions/jstests.list index 17eb8a76635..da05c20bd79 100644 --- a/js/src/tests/js1_8/extensions/jstests.list +++ b/js/src/tests/js1_8/extensions/jstests.list @@ -32,8 +32,8 @@ script regress-472450-03.js script regress-472450-04.js script regress-473040.js skip script regress-475971.js -skip-if(!xulRuntime.shell) slow script regress-476414-01.js -skip-if(!xulRuntime.shell) slow script regress-476414-02.js +skip-if(!xulRuntime.shell) script regress-476414-01.js # slow +skip-if(!xulRuntime.shell) script regress-476414-02.js # slow fails-if(!xulRuntime.shell) script regress-476427.js # NS_ERROR_DOM_NOT_SUPPORTED_ERR script regress-476653.js script regress-476869.js diff --git a/js/src/tests/manifest.py b/js/src/tests/manifest.py index e7161ab5bf7..d3a278fd89d 100644 --- a/js/src/tests/manifest.py +++ b/js/src/tests/manifest.py @@ -151,11 +151,6 @@ def parse(filename, xul_tester, reldir = ''): elif parts[pos] == 'slow': slow = True pos += 1 - elif parts[pos] == 'silentfail': - # silentfails use tons of memory, and Darwin doesn't support ulimit. - if xul_tester.test("xulRuntime.OS == 'Darwin'"): - expect = enable = False - pos += 1 else: print 'warning: invalid manifest line element "%s"'%parts[pos] pos += 1