From 6089e45b7d5d20a6381879a9e49bfdc3b5f889e0 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 27 Aug 2018 17:54:24 +0200 Subject: [PATCH] Make setZeroTimeout use window.setTimeout --- tests/wpt/webgl/meta/MANIFEST.json | 14 +-- .../context-creation-and-destruction.html.ini | 5 - .../context/context-creation.html.ini | 5 - .../oes-texture-float-with-canvas.html.ini | 50 +++++++++- ...es-texture-half-float-with-canvas.html.ini | 50 +++++++++- ...bgl-compressed-texture-size-limit.html.ini | 5 - .../tex-2d-alpha-alpha-unsigned_byte.html.ini | 5 - ...luminance-luminance-unsigned_byte.html.ini | 92 ++++++++++++++++++- ...pha-luminance_alpha-unsigned_byte.html.ini | 92 ++++++++++++++++++- .../tex-2d-rgb-rgb-unsigned_byte.html.ini | 2 +- ...x-2d-rgb-rgb-unsigned_short_5_6_5.html.ini | 2 +- .../tex-2d-rgba-rgba-unsigned_byte.html.ini | 2 +- ...-rgba-rgba-unsigned_short_4_4_4_4.html.ini | 2 +- ...-rgba-rgba-unsigned_short_5_5_5_1.html.ini | 2 +- .../textures/misc/texture-size-limit.html.ini | 5 - .../context-creation-and-destruction.html | 1 - .../conformance/context/context-creation.html | 1 - tests/wpt/webgl/tests/js/webgl-test-utils.js | 31 +------ .../webgl/tools/import-conformance-tests.py | 3 +- tests/wpt/webgl/tools/set-zero-timeout.patch | 40 ++++++++ tests/wpt/webgl/tools/timeout.patch | 24 ----- 21 files changed, 335 insertions(+), 98 deletions(-) delete mode 100644 tests/wpt/webgl/meta/conformance/context/context-creation-and-destruction.html.ini delete mode 100644 tests/wpt/webgl/meta/conformance/context/context-creation.html.ini delete mode 100644 tests/wpt/webgl/meta/conformance/extensions/webgl-compressed-texture-size-limit.html.ini delete mode 100644 tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini delete mode 100644 tests/wpt/webgl/meta/conformance/textures/misc/texture-size-limit.html.ini create mode 100644 tests/wpt/webgl/tools/set-zero-timeout.patch diff --git a/tests/wpt/webgl/meta/MANIFEST.json b/tests/wpt/webgl/meta/MANIFEST.json index ee4c6f8dbd1..007eca40d66 100644 --- a/tests/wpt/webgl/meta/MANIFEST.json +++ b/tests/wpt/webgl/meta/MANIFEST.json @@ -10619,17 +10619,13 @@ "conformance/context/context-creation-and-destruction.html": [ [ "/_webgl/conformance/context/context-creation-and-destruction.html", - { - "timeout": "long" - } + {} ] ], "conformance/context/context-creation.html": [ [ "/_webgl/conformance/context/context-creation.html", - { - "timeout": "long" - } + {} ] ], "conformance/context/context-eviction-with-garbage-collection.html": [ @@ -27610,11 +27606,11 @@ "testharness" ], "conformance/context/context-creation-and-destruction.html": [ - "3ad7a02d79cfbae4b9d7b6f6ee16cdc5d1a829dd", + "a3912fcf7eaaf2992ec4a82de0c7262d929b035d", "testharness" ], "conformance/context/context-creation.html": [ - "237258cc9d956acf6b821967c8010db22804e6df", + "d8685e48fcb8e5f74132501fa31e00163212be54", "testharness" ], "conformance/context/context-eviction-with-garbage-collection.html": [ @@ -46634,7 +46630,7 @@ "support" ], "js/webgl-test-utils.js": [ - "5ab8b2cfd0794f3c15d7afad0fe98b0f75cff38b", + "0ef194eacc296f083fe86a03cdbdb5f72317b516", "support" ], "py/lint/LICENSE": [ diff --git a/tests/wpt/webgl/meta/conformance/context/context-creation-and-destruction.html.ini b/tests/wpt/webgl/meta/conformance/context/context-creation-and-destruction.html.ini deleted file mode 100644 index fbdc89a8f0d..00000000000 --- a/tests/wpt/webgl/meta/conformance/context/context-creation-and-destruction.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[context-creation-and-destruction.html] - expected: TIMEOUT - [Overall test] - expected: NOTRUN - diff --git a/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini b/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini deleted file mode 100644 index 393e42df192..00000000000 --- a/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[context-creation.html] - expected: TIMEOUT - [Overall test] - expected: NOTRUN - diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini index fd84608b919..a175f986115 100644 --- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini +++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini @@ -1,5 +1,53 @@ [oes-texture-float-with-canvas.html] - expected: TIMEOUT + expected: ERROR [Overall test] expected: NOTRUN + [WebGL test #31: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #19: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #12: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #15: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #14: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #40: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #34: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #20: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #39: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #11: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #17: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #35: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #37: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #32: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #38: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #18: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini index c37d9af94f1..1144c02d18e 100644 --- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini +++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini @@ -1,5 +1,53 @@ [oes-texture-half-float-with-canvas.html] - expected: TIMEOUT + expected: ERROR [Overall test] expected: NOTRUN + [WebGL test #31: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #19: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #12: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #15: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #14: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #40: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #34: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #20: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #39: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #11: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #17: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #35: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #37: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255] + expected: FAIL + + [WebGL test #32: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #38: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + + [WebGL test #18: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/extensions/webgl-compressed-texture-size-limit.html.ini b/tests/wpt/webgl/meta/conformance/extensions/webgl-compressed-texture-size-limit.html.ini deleted file mode 100644 index 9c170c8b179..00000000000 --- a/tests/wpt/webgl/meta/conformance/extensions/webgl-compressed-texture-size-limit.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[webgl-compressed-texture-size-limit.html] - expected: TIMEOUT - [Overall test] - expected: NOTRUN - diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini deleted file mode 100644 index df505cbab41..00000000000 --- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[tex-2d-alpha-alpha-unsigned_byte.html] - expected: TIMEOUT - [Overall test] - expected: NOTRUN - diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini index d55c52bdf01..35ac958bf14 100644 --- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini @@ -1,5 +1,5 @@ [tex-2d-luminance-luminance-unsigned_byte.html] - expected: TIMEOUT + expected: ERROR [WebGL test #1: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255] expected: FAIL @@ -9,3 +9,93 @@ [WebGL test #0: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255] expected: FAIL + [WebGL test #21: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #4: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #9: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 89,89,89,255] + expected: FAIL + + [WebGL test #28: shouldBe 127,127,127,255\nat (0, 16) expected: 127,127,127,255 was 26,26,26,255] + expected: FAIL + + [WebGL test #7: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #12: shouldBe 127,127,127,255\nat (0, 16) expected: 127,127,127,255 was 26,26,26,255] + expected: FAIL + + [WebGL test #29: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 89,89,89,255] + expected: FAIL + + [WebGL test #13: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 89,89,89,255] + expected: FAIL + + [WebGL test #22: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #20: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #30: shouldBe 127,127,127,255\nat (0, 0) expected: 127,127,127,255 was 26,26,26,255] + expected: FAIL + + [WebGL test #27: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 89,89,89,255] + expected: FAIL + + [WebGL test #15: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 89,89,89,255] + expected: FAIL + + [WebGL test #3: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #17: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #14: shouldBe 127,127,127,255\nat (0, 0) expected: 127,127,127,255 was 26,26,26,255] + expected: FAIL + + [WebGL test #5: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #24: shouldBe 127,127,127,255\nat (0, 16) expected: 127,127,127,255 was 26,26,26,255] + expected: FAIL + + [WebGL test #31: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 89,89,89,255] + expected: FAIL + + [WebGL test #25: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 89,89,89,255] + expected: FAIL + + [WebGL test #8: shouldBe 127,127,127,255\nat (0, 16) expected: 127,127,127,255 was 26,26,26,255] + expected: FAIL + + [WebGL test #2: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #10: shouldBe 127,127,127,255\nat (0, 0) expected: 127,127,127,255 was 26,26,26,255] + expected: FAIL + + [WebGL test #18: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #6: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #23: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #19: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #16: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #26: shouldBe 127,127,127,255\nat (0, 0) expected: 127,127,127,255 was 26,26,26,255] + expected: FAIL + + [WebGL test #11: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 89,89,89,255] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini index c2c977c3f51..6ad47cf92d4 100644 --- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini @@ -1,5 +1,5 @@ [tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html] - expected: TIMEOUT + expected: ERROR [WebGL test #1: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255] expected: FAIL @@ -9,3 +9,93 @@ [WebGL test #0: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255] expected: FAIL + [WebGL test #31: shouldBe 0,0,0,127\nat (0, 16) expected: 0,0,0,127 was 89,89,89,128] + expected: FAIL + + [WebGL test #21: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #8: shouldBe 127,127,127,127\nat (0, 16) expected: 127,127,127,127 was 26,26,26,128] + expected: FAIL + + [WebGL test #15: shouldBe 0,0,0,127\nat (0, 16) expected: 0,0,0,127 was 89,89,89,128] + expected: FAIL + + [WebGL test #4: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #9: shouldBe 0,0,0,127\nat (0, 0) expected: 0,0,0,127 was 89,89,89,128] + expected: FAIL + + [WebGL test #7: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #20: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #30: shouldBe 127,127,127,127\nat (0, 0) expected: 127,127,127,127 was 26,26,26,128] + expected: FAIL + + [WebGL test #22: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #10: shouldBe 127,127,127,127\nat (0, 0) expected: 127,127,127,127 was 26,26,26,128] + expected: FAIL + + [WebGL test #5: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #13: shouldBe 0,0,0,127\nat (0, 0) expected: 0,0,0,127 was 89,89,89,128] + expected: FAIL + + [WebGL test #3: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #17: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #11: shouldBe 0,0,0,127\nat (0, 16) expected: 0,0,0,127 was 89,89,89,128] + expected: FAIL + + [WebGL test #14: shouldBe 127,127,127,127\nat (0, 0) expected: 127,127,127,127 was 26,26,26,128] + expected: FAIL + + [WebGL test #25: shouldBe 0,0,0,127\nat (0, 0) expected: 0,0,0,127 was 89,89,89,128] + expected: FAIL + + [WebGL test #24: shouldBe 127,127,127,127\nat (0, 16) expected: 127,127,127,127 was 26,26,26,128] + expected: FAIL + + [WebGL test #28: shouldBe 127,127,127,127\nat (0, 16) expected: 127,127,127,127 was 26,26,26,128] + expected: FAIL + + [WebGL test #12: shouldBe 127,127,127,127\nat (0, 16) expected: 127,127,127,127 was 26,26,26,128] + expected: FAIL + + [WebGL test #27: shouldBe 0,0,0,127\nat (0, 16) expected: 0,0,0,127 was 89,89,89,128] + expected: FAIL + + [WebGL test #26: shouldBe 127,127,127,127\nat (0, 0) expected: 127,127,127,127 was 26,26,26,128] + expected: FAIL + + [WebGL test #2: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #29: shouldBe 0,0,0,127\nat (0, 0) expected: 0,0,0,127 was 89,89,89,128] + expected: FAIL + + [WebGL test #18: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #6: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + + [WebGL test #23: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #19: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255] + expected: FAIL + + [WebGL test #16: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini index db7310c69ac..c716eda28ca 100644 --- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini @@ -1,5 +1,5 @@ [tex-2d-rgb-rgb-unsigned_byte.html] - expected: TIMEOUT + expected: ERROR [Overall test] expected: NOTRUN diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini index a991e224bc2..395216ec64a 100644 --- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini @@ -1,5 +1,5 @@ [tex-2d-rgb-rgb-unsigned_short_5_6_5.html] - expected: TIMEOUT + expected: ERROR [Overall test] expected: NOTRUN diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini index 8749093a15d..5d324a0e7dd 100644 --- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini @@ -1,5 +1,5 @@ [tex-2d-rgba-rgba-unsigned_byte.html] - expected: TIMEOUT + expected: ERROR [Overall test] expected: NOTRUN diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini index 73bba4ac28e..f7c9148eb99 100644 --- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini @@ -1,5 +1,5 @@ [tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html] - expected: TIMEOUT + expected: ERROR [Overall test] expected: NOTRUN diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini index d014f432f89..6c2981c0adf 100644 --- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini @@ -1,5 +1,5 @@ [tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html] - expected: TIMEOUT + expected: ERROR [Overall test] expected: NOTRUN diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-size-limit.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-size-limit.html.ini deleted file mode 100644 index ed30fb1af9c..00000000000 --- a/tests/wpt/webgl/meta/conformance/textures/misc/texture-size-limit.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[texture-size-limit.html] - expected: TIMEOUT - [Overall test] - expected: NOTRUN - diff --git a/tests/wpt/webgl/tests/conformance/context/context-creation-and-destruction.html b/tests/wpt/webgl/tests/conformance/context/context-creation-and-destruction.html index 3ad7a02d79c..a3912fcf7ea 100644 --- a/tests/wpt/webgl/tests/conformance/context/context-creation-and-destruction.html +++ b/tests/wpt/webgl/tests/conformance/context/context-creation-and-destruction.html @@ -29,7 +29,6 @@ - Test that contexts are freed and garbage collected reasonably diff --git a/tests/wpt/webgl/tests/conformance/context/context-creation.html b/tests/wpt/webgl/tests/conformance/context/context-creation.html index 237258cc9d9..d8685e48fcb 100644 --- a/tests/wpt/webgl/tests/conformance/context/context-creation.html +++ b/tests/wpt/webgl/tests/conformance/context/context-creation.html @@ -29,7 +29,6 @@ - Test that you can create large numbers of WebGL contexts. diff --git a/tests/wpt/webgl/tests/js/webgl-test-utils.js b/tests/wpt/webgl/tests/js/webgl-test-utils.js index 5ab8b2cfd07..0ef194eacc2 100644 --- a/tests/wpt/webgl/tests/js/webgl-test-utils.js +++ b/tests/wpt/webgl/tests/js/webgl-test-utils.js @@ -2876,34 +2876,9 @@ var waitForComposite = function(callback) { countDown(); }; -var setZeroTimeout = (function() { - // See https://dbaron.org/log/20100309-faster-timeouts - - var timeouts = []; - var messageName = "zero-timeout-message"; - - // Like setTimeout, but only takes a function argument. There's - // no time argument (always zero) and no arguments (you have to - // use a closure). - function setZeroTimeout(fn) { - timeouts.push(fn); - window.postMessage(messageName, "*"); - } - - function handleMessage(event) { - if (event.source == window && event.data == messageName) { - event.stopPropagation(); - if (timeouts.length > 0) { - var fn = timeouts.shift(); - fn(); - } - } - } - - window.addEventListener("message", handleMessage, true); - - return setZeroTimeout; -})(); +var setZeroTimeout = function(handler) { + window.setTimeout(handler, 0); +} /** * Runs an array of functions, yielding to the browser between each step. diff --git a/tests/wpt/webgl/tools/import-conformance-tests.py b/tests/wpt/webgl/tools/import-conformance-tests.py index 38c8e3ec431..58afe1ddc77 100755 --- a/tests/wpt/webgl/tools/import-conformance-tests.py +++ b/tests/wpt/webgl/tools/import-conformance-tests.py @@ -13,7 +13,8 @@ KHRONOS_REPO_URL = "https://github.com/KhronosGroup/WebGL.git" PATCHES = [ ("js-test-pre.patch", "js/js-test-pre.js"), ("unit.patch", "conformance/more/unit.js"), - ("timeout.patch", None) + ("timeout.patch", None), + ("set-zero-timeout.patch", "js/webgl-test-utils.js"), ] # Fix for 'UnicodeDecodeError: 'ascii' codec can't decode byte' diff --git a/tests/wpt/webgl/tools/set-zero-timeout.patch b/tests/wpt/webgl/tools/set-zero-timeout.patch new file mode 100644 index 00000000000..94b4ae8bbe2 --- /dev/null +++ b/tests/wpt/webgl/tools/set-zero-timeout.patch @@ -0,0 +1,40 @@ +--- js/webgl-test-utils.js ++++ js/webgl-test-utils.js +@@ -2876,34 +2876,9 @@ var waitForComposite = function(callback) { + countDown(); + }; + +-var setZeroTimeout = (function() { +- // See https://dbaron.org/log/20100309-faster-timeouts +- +- var timeouts = []; +- var messageName = "zero-timeout-message"; +- +- // Like setTimeout, but only takes a function argument. There's +- // no time argument (always zero) and no arguments (you have to +- // use a closure). +- function setZeroTimeout(fn) { +- timeouts.push(fn); +- window.postMessage(messageName, "*"); +- } +- +- function handleMessage(event) { +- if (event.source == window && event.data == messageName) { +- event.stopPropagation(); +- if (timeouts.length > 0) { +- var fn = timeouts.shift(); +- fn(); +- } +- } +- } +- +- window.addEventListener("message", handleMessage, true); +- +- return setZeroTimeout; +-})(); ++var setZeroTimeout = function(handler) { ++ window.setTimeout(handler, 0); ++} + + /** + * Runs an array of functions, yielding to the browser between each step. diff --git a/tests/wpt/webgl/tools/timeout.patch b/tests/wpt/webgl/tools/timeout.patch index 43c17302346..5198156de9d 100644 --- a/tests/wpt/webgl/tools/timeout.patch +++ b/tests/wpt/webgl/tools/timeout.patch @@ -10,30 +10,6 @@ index de45ce308c..11a83ac00a 100644 WebGL Enable Vertex Attrib Zero Test -diff --git i/conformance/context/context-creation-and-destruction.html w/conformance/context/context-creation-and-destruction.html -index a02dd2d14c..47099e57bd 100644 ---- i/conformance/context/context-creation-and-destruction.html -+++ w/conformance/context/context-creation-and-destruction.html -@@ -29,6 +29,7 @@ - - - -+ - Test that contexts are freed and garbage collected reasonably - - -diff --git i/conformance/context/context-creation.html w/conformance/context/context-creation.html -index 04b138daf4..703bcfa8dc 100644 ---- i/conformance/context/context-creation.html -+++ w/conformance/context/context-creation.html -@@ -29,6 +29,7 @@ - - - -+ - Test that you can create large numbers of WebGL contexts. - - diff --git i/conformance/context/context-eviction-with-garbage-collection.html w/conformance/context/context-eviction-with-garbage-collection.html index 3989c7679a..b52e3a9e9f 100644 --- i/conformance/context/context-eviction-with-garbage-collection.html