diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 0beecc52b8f..116d3578ba0 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -30429,6 +30429,11 @@
{}
]
],
+ "webgl/tools/timeout.patch": [
+ [
+ {}
+ ]
+ ],
"webgl/tools/unit.patch": [
[
{}
@@ -39429,7 +39434,9 @@
"webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html": [
[
"/_mozilla/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html",
- {}
+ {
+ "timeout": "long"
+ }
]
],
"webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib.html": [
@@ -39573,7 +39580,9 @@
"webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html": [
[
"/_mozilla/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html",
- {}
+ {
+ "timeout": "long"
+ }
]
],
"webgl/conformance-1.0.3/conformance/canvas/texture-bindings-unaffected-on-resize.html": [
@@ -43425,7 +43434,9 @@
"webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html": [
[
"/_mozilla/webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html",
- {}
+ {
+ "timeout": "long"
+ }
]
],
"webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html": [
@@ -71210,7 +71221,7 @@
"testharness"
],
"webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html": [
- "2db1eb69271fd2cdf1f23ed1aefe7ee04a409614",
+ "bb00d5648733c8b523093bba59a58eeda15c2dc9",
"testharness"
],
"webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib.html": [
@@ -71314,7 +71325,7 @@
"testharness"
],
"webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html": [
- "14e68235cfa7ed8d396e33bfea2b337308f300c0",
+ "14ade92783494631f0aa38c7b65ef27afa5d4a5a",
"testharness"
],
"webgl/conformance-1.0.3/conformance/canvas/texture-bindings-unaffected-on-resize.html": [
@@ -71346,15 +71357,15 @@
"testharness"
],
"webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html": [
- "5353020ebad3058be7c46d31205eb98afa4f40e4",
+ "6e329116409fae60838c3d4e63f84999b06cf1b5",
"testharness"
],
"webgl/conformance-1.0.3/conformance/context/context-creation.html": [
- "08a7054a6bee4901dcb6636cf376c452e9004184",
+ "2a6ebdcb04a602ae7b73a7a0385533f72c89c212",
"testharness"
],
"webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html": [
- "63c2768e01d84a6344d08efa79bac5fdf9d545a7",
+ "9eac94ca3bc359985efc1ac0e7e7c37ec2599278",
"testharness"
],
"webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html": [
@@ -73046,7 +73057,7 @@
"support"
],
"webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html": [
- "b4a53ad041367ac7a16a050098532b01fcd135dc",
+ "85555ba68d88a743a41b691e864f5e2305c03bc3",
"testharness"
],
"webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_float_frag_xvary.frag": [
@@ -73214,7 +73225,7 @@
"support"
],
"webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html": [
- "402a2259934781e8866ec3555282e2257a9963cb",
+ "5ddd8eac037ae86a0f82aaebcd05f1702b4598ce",
"testharness"
],
"webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_float_frag_xvary.frag": [
@@ -76378,7 +76389,7 @@
"support"
],
"webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html": [
- "4e72ddeef5f237b63fcdd8c49ee3c61dc16ae529",
+ "cadfc9c0ab49a1de7ee8ef91c49c20da40b405b4",
"testharness"
],
"webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html": [
@@ -80426,7 +80437,7 @@
"testharness"
],
"webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html": [
- "5471a14283e0a23cfab7f504529aec8bee5ee4c3",
+ "e6687ab849c63a7db2b855d5f0b4c4583132613f",
"testharness"
],
"webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html": [
@@ -99086,7 +99097,7 @@
"testharness"
],
"webgl/tools/import-conformance-tests.py": [
- "d3823f6646375ab6c48b77de8fb1c798d4132e3d",
+ "73e9fad27290f3f10246390fca47bfeb64bc86ec",
"support"
],
"webgl/tools/js-test-pre.patch": [
@@ -99097,6 +99108,10 @@
"d1fc86aa99334ca252f0e9fdd48f5d85255f24a3",
"support"
],
+ "webgl/tools/timeout.patch": [
+ "88da623430c6ab2c3738433604a5077a24a7a7a0",
+ "support"
+ ],
"webgl/tools/unit.patch": [
"1d3713862875b47ae9c07462e6962eb21e40e404",
"support"
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini
deleted file mode 100644
index b5291d6078b..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[gl-vertex-attrib-zero-issues.html]
- type: testharness
- expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
deleted file mode 100644
index 1e2567027d8..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[rapid-resizing.html]
- expected: TIMEOUT
- [Overall test]
- expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
deleted file mode 100644
index fbdc89a8f0d..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/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/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
deleted file mode 100644
index 393e42df192..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/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/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
deleted file mode 100644
index b2918fac56f..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[context-eviction-with-garbage-collection.html]
- expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
deleted file mode 100644
index 38d628ebc51..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[acos_001_to_006.html]
- expected: TIMEOUT
- [Overall test]
- expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
deleted file mode 100644
index 2cd9fa6c511..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[asin_001_to_006.html]
- expected: TIMEOUT
- [Overall test]
- expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
deleted file mode 100644
index 0bcf8268f38..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[log_001_to_008.html]
- expected: TIMEOUT
- [Overall test]
- expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
deleted file mode 100644
index 579708b48b2..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[log2_001_to_008.html]
- expected: TIMEOUT
- [Overall test]
- expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini
deleted file mode 100644
index 3461ba85016..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[out-of-bounds-uniform-array-access.html]
- type: testharness
- expected: TIMEOUT
- [Overall test]
- expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html
index de45ce308cf..11a83ac00a7 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html
@@ -29,6 +29,7 @@
+
WebGL Enable Vertex Attrib Zero Test
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html
index 1faa7372227..89f9e1e3c23 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html
@@ -29,6 +29,7 @@
+
WebGL Rapid Resizing Test
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
index a02dd2d14c0..47099e57bd7 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
@@ -29,6 +29,7 @@
+
Test that contexts are freed and garbage collected reasonably
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
index 04b138daf43..703bcfa8dca 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
@@ -29,6 +29,7 @@
+
Test that you can create large numbers of WebGL contexts.
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
index 3989c7679aa..b52e3a9e9f7 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
@@ -29,6 +29,7 @@
+
Test that context eviction and garbage collection do not interfere with each other
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
index 99de4e0a792..71c89906388 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
@@ -28,6 +28,7 @@
+
WebGL GLSL conformance test: acos_001_to_006.html
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
index 5af87433aa9..79afd9f4303 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
@@ -28,6 +28,7 @@
+
WebGL GLSL conformance test: asin_001_to_006.html
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
index 5552a4f82e6..539cb332140 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
@@ -28,6 +28,7 @@
+
WebGL GLSL conformance test: log2_001_to_008.html
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html
index 2758b320ff1..4d85c3a53ac 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html
@@ -29,6 +29,7 @@
+
WebGL out of bounds uniform array access.
diff --git a/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py b/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py
index fdedb71989d..14cafcf4f27 100755
--- a/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py
+++ b/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py
@@ -12,7 +12,8 @@ KHRONOS_REPO_URL = "https://github.com/KhronosGroup/WebGL.git"
# Patches for conformance tests 1.0.x
PATCHES_1X = [
("js-test-pre.patch", "resources/js-test-pre.js"),
- ("unit.patch", "conformance/more/unit.js")
+ ("unit.patch", "conformance/more/unit.js"),
+ ("timeout.patch", None)
]
# Patches for conformance tests 2.0.x
PATCHES_2X = [
@@ -134,7 +135,10 @@ def update_conformance(version, destination, existing_repo, patches_dir):
for patch, file_name in patches:
try:
patch = os.path.join(patches_dir, patch)
- subprocess.check_call(["patch", "-d", destination, file_name, patch])
+ if file_name is None:
+ subprocess.check_call(["patch", "-d", destination, "-p", "1"], stdin=open(patch))
+ else:
+ subprocess.check_call(["patch", "-x", "3", "-d", destination, file_name, patch])
except subprocess.CalledProcessError:
print("Automatic patch failed for {}".format(file_name))
print("Please review the WPT integration and update {} accordingly".format(os.path.basename(patch)))
diff --git a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch
new file mode 100644
index 00000000000..da53aa632f7
--- /dev/null
+++ b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch
@@ -0,0 +1,108 @@
+diff --git i/conformance/attribs/gl-vertex-attrib-zero-issues.html w/conformance/attribs/gl-vertex-attrib-zero-issues.html
+index de45ce308c..11a83ac00a 100644
+--- i/conformance/attribs/gl-vertex-attrib-zero-issues.html
++++ w/conformance/attribs/gl-vertex-attrib-zero-issues.html
+@@ -29,6 +29,7 @@
+
+
+
++
+ WebGL Enable Vertex Attrib Zero Test
+
+
+diff --git i/conformance/canvas/rapid-resizing.html w/conformance/canvas/rapid-resizing.html
+index 1faa737222..89f9e1e3c2 100644
+--- i/conformance/canvas/rapid-resizing.html
++++ w/conformance/canvas/rapid-resizing.html
+@@ -29,6 +29,7 @@
+
+
+
++
+ WebGL Rapid Resizing 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
++++ w/conformance/context/context-eviction-with-garbage-collection.html
+@@ -29,6 +29,7 @@
+
+
+
++
+ Test that context eviction and garbage collection do not interfere with each other
+
+
+diff --git i/conformance/ogles/GL/acos/acos_001_to_006.html w/conformance/ogles/GL/acos/acos_001_to_006.html
+index 99de4e0a79..71c8990638 100644
+--- i/conformance/ogles/GL/acos/acos_001_to_006.html
++++ w/conformance/ogles/GL/acos/acos_001_to_006.html
+@@ -28,6 +28,7 @@
+
+
+
++
+ WebGL GLSL conformance test: acos_001_to_006.html
+
+
+diff --git i/conformance/ogles/GL/asin/asin_001_to_006.html w/conformance/ogles/GL/asin/asin_001_to_006.html
+index 5af87433aa..79afd9f430 100644
+--- i/conformance/ogles/GL/asin/asin_001_to_006.html
++++ w/conformance/ogles/GL/asin/asin_001_to_006.html
+@@ -28,6 +28,7 @@
+
+
+
++
+ WebGL GLSL conformance test: asin_001_to_006.html
+
+
+diff --git i/conformance/ogles/GL/log2/log2_001_to_008.html w/conformance/ogles/GL/log2/log2_001_to_008.html
+index 5552a4f82e..539cb33214 100644
+--- i/conformance/ogles/GL/log2/log2_001_to_008.html
++++ w/conformance/ogles/GL/log2/log2_001_to_008.html
+@@ -28,6 +28,7 @@
+
+
+
++
+ WebGL GLSL conformance test: log2_001_to_008.html
+
+
+diff --git i/conformance/uniforms/out-of-bounds-uniform-array-access.html w/conformance/uniforms/out-of-bounds-uniform-array-access.html
+index 2758b320ff..4d85c3a53a 100644
+--- i/conformance/uniforms/out-of-bounds-uniform-array-access.html
++++ w/conformance/uniforms/out-of-bounds-uniform-array-access.html
+@@ -29,6 +29,7 @@
+
+
+
++
+ WebGL out of bounds uniform array access.
+
+