From e2425c9158f639bc156f514094e9bc91dd9328b9 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 30 Jul 2018 19:36:37 +0200 Subject: [PATCH] Mark many-draw-calls.html as long-running --- tests/wpt/mozilla/meta/MANIFEST.json | 8 +++++--- .../conformance/rendering/many-draw-calls.html.ini | 6 ------ .../conformance/rendering/many-draw-calls.html | 1 + tests/wpt/mozilla/tests/webgl/tools/timeout.patch | 12 ++++++++++++ 4 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 7c222db5c5ca..b1e2ab293223 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -42951,7 +42951,9 @@ "webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html": [ [ "/_mozilla/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html", - {} + { + "timeout": "long" + } ] ], "webgl/conformance-1.0.3/conformance/rendering/more-than-65536-indices.html": [ @@ -79880,7 +79882,7 @@ "testharness" ], "webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html": [ - "8741d2e2bfb2da2adecfd0067bc0df4eebdb369e", + "3ce5f470ddef3d5b56dba9b58ffc5096496b747a", "testharness" ], "webgl/conformance-1.0.3/conformance/rendering/more-than-65536-indices.html": [ @@ -99176,7 +99178,7 @@ "support" ], "webgl/tools/timeout.patch": [ - "2690553f288896aaaf368475e307da2000fccfa4", + "ab9852e736bf43a9b7dbe312012ca09396a8626b", "support" ], "webgl/tools/unit.patch": [ diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini deleted file mode 100644 index a37a8723e086..000000000000 --- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[many-draw-calls.html] - type: testharness - expected: TIMEOUT - [Overall test] - expected: NOTRUN - diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html index c1542f4fa9fa..b3ee786e0b22 100644 --- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html +++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html @@ -29,6 +29,7 @@ + diff --git a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch index 5c594e70efe1..7c20e5daba64 100644 --- a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch +++ b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch @@ -106,3 +106,15 @@ index 2758b320ff..4d85c3a53a 100644 WebGL out of bounds uniform array access. +diff --git i/conformance/rendering/many-draw-calls.html w/conformance/rendering/many-draw-calls.html +index c1542f4fa9..b3ee786e0b 100644 +--- i/conformance/rendering/many-draw-calls.html ++++ w/conformance/rendering/many-draw-calls.html +@@ -29,6 +29,7 @@ + + + ++ + + + \ No newline at end of file