Auto merge of #21249 - jdm:webgl-unit-tests, r=emilio

bors-servo · web-flow · commit 539f38263175 · 2018-07-27T22:39:50.000-04:00
Allow webgl tests using unit test harness to run to completion. This is an equivalent change to 5af2603 that affects a subset of webgl tests that use a different test harness. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13662 fix #10656 - [x] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21249)
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -30472,6 +30472,11 @@
     [
      {}
     ]
+   ],
+   "webgl/tools/unit2.patch": [
+    [
+     {}
+    ]
    ]
   },
   "testharness": {
@@ -73039,7 +73044,7 @@
    "support"
   ],
   "webgl/conformance-1.0.3/conformance/more/unit.js": [
-   "e0d1158bdc411b87961a4c67abeb3dceed506008",
+   "82efd8b7a11d3ac344a3e1b563e99503f452226e",
    "support"
   ],
   "webgl/conformance-1.0.3/conformance/more/util.js": [
@@ -99147,7 +99152,7 @@
    "testharness"
   ],
   "webgl/tools/import-conformance-tests.py": [
-   "73e9fad27290f3f10246390fca47bfeb64bc86ec",
+   "9e5e82b781ef02299db6406754b7d1d8abeb3c54",
    "support"
   ],
   "webgl/tools/js-test-pre.patch": [
@@ -99166,6 +99171,10 @@
    "1d3713862875b47ae9c07462e6962eb21e40e404",
    "support"
   ],
+  "webgl/tools/unit2.patch": [
+   "cdccf819e756a9443f2ccf41b393b76fe5c398e9",
+   "support"
+  ],
   "webgl/uniformMatrixNfv.html": [
    "f53e7687ad6aef0ffc064d941a05a222c33fde56",
    "testharness"
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-S_V.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-S_V.html.ini
@@ -1,3 +1,4 @@
 [quickCheckAPI-S_V.html]
   type: testharness
-  disabled: https://github.com/servo/servo/issues/10698
+  expected:
+    if os == "mac": CRASH
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/functions/copyTexSubImage2D.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/functions/copyTexSubImage2D.html.ini
@@ -0,0 +1,4 @@
+[copyTexSubImage2D.html]
+  [WebGL test #1: testRoundtrip]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/functions/readPixelsBadArgs.html.ini
@@ -0,0 +1,7 @@
+[readPixelsBadArgs.html]
+  [WebGL test #1: testReadPixelsSOPIMG]
+    expected: FAIL
+
+  [WebGL test #2: testReadPixelsSOPCanvas]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/functions/texImage2DHTML.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/functions/texImage2DHTML.html.ini
@@ -0,0 +1,4 @@
+[texImage2DHTML.html]
+  [WebGL test #1: testTexImage2DNonSOP]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/functions/texSubImage2DHTML.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/functions/texSubImage2DHTML.html.ini
@@ -0,0 +1,4 @@
+[texSubImage2DHTML.html]
+  [WebGL test #1: testTexImage2DNonSOP]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/glsl/uniformOutOfBounds.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/more/glsl/uniformOutOfBounds.html.ini
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/more/unit.js b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/more/unit.js
@@ -53,6 +53,10 @@ if (window.internals) {
   window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
 }
 
+if (window.async_test) {
+    var __overall_test = async_test('Overall test');
+}
+
 /* -- end platform specific code --*/
 Tests = {
   autorun : true,
@@ -907,6 +911,9 @@ function notifyFinishedToHarness() {
   if (window.parent.webglTestHarness) {
     window.parent.webglTestHarness.notifyFinished(window.location.pathname);
   }
+  if (window.__overall_test) {
+    window.__overall_test.done();
+  }
 }
 
 function initTests() {
diff --git a/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py b/tests/wpt/mozilla/tests/webgl/tools/import-conformance-tests.py
@@ -13,12 +13,14 @@
 PATCHES_1X = [
     ("js-test-pre.patch", "resources/js-test-pre.js"),
     ("unit.patch", "conformance/more/unit.js"),
+    ("unit2.patch", "conformance/more/unit.js"),
     ("timeout.patch", None)
 ]
 # Patches for conformance tests 2.0.x
 PATCHES_2X = [
     ("js-test-pre2.patch", "js/js-test-pre.js"),
     ("unit.patch", "conformance/more/unit.js")
+    ("unit2.patch", "conformance/more/unit.js")
 ]
 
 # Fix for 'UnicodeDecodeError: 'ascii' codec can't decode byte'
diff --git a/tests/wpt/mozilla/tests/webgl/tools/unit2.patch b/tests/wpt/mozilla/tests/webgl/tools/unit2.patch
@@ -0,0 +1,25 @@
+diff --git a/conformance-suites/1.0.3/conformance/more/unit.js b/conformance-suits/1.0.3/conformance/more/unit.js
+index 742f8d7b9d..428c164699 100644
+--- a/conformance-suites/1.0.3/conformance/more/unit.js
++++ b/conformance-suites/1.0.3/conformance/more/unit.js
+@@ -53,6 +53,10 @@ if (window.internals) {
+   window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
+ }
+
++if (window.async_test) {
++    var __overall_test = async_test('Overall test');
++}
++
+ /* -- end platform specific code --*/
+ Tests = {
+   autorun : true,
+@@ -907,6 +911,9 @@ function notifyFinishedToHarness() {
+   if (window.parent.webglTestHarness) {
+     window.parent.webglTestHarness.notifyFinished(window.location.pathname);
+   }
++  if (window.__overall_test) {
++    window.__overall_test.done();
++  }
+ }
+
+ function initTests() {

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ if (window.internals) {`
`53`	`53`	`window.internals.settings.setWebGLErrorsToConsoleEnabled(false);`
`54`	`54`	`}`
`55`	`55`
	`56`	`+if (window.async_test) {`
	`57`	`+ var __overall_test = async_test('Overall test');`
	`58`	`+}`
	`59`	`+`
`56`	`60`	`/* -- end platform specific code --*/`
`57`	`61`	`Tests = {`
`58`	`62`	`autorun : true,`
`@@ -907,6 +911,9 @@ function notifyFinishedToHarness() {`
`907`	`911`	`if (window.parent.webglTestHarness) {`
`908`	`912`	`window.parent.webglTestHarness.notifyFinished(window.location.pathname);`
`909`	`913`	`}`
	`914`	`+ if (window.__overall_test) {`
	`915`	`+ window.__overall_test.done();`
	`916`	`+ }`
`910`	`917`	`}`
`911`	`918`
`912`	`919`	`function initTests() {`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,14 @@`
`13`	`13`	`PATCHES_1X = [`
`14`	`14`	`("js-test-pre.patch", "resources/js-test-pre.js"),`
`15`	`15`	`("unit.patch", "conformance/more/unit.js"),`
	`16`	`+ ("unit2.patch", "conformance/more/unit.js"),`
`16`	`17`	`("timeout.patch", None)`
`17`	`18`	`]`
`18`	`19`	`# Patches for conformance tests 2.0.x`
`19`	`20`	`PATCHES_2X = [`
`20`	`21`	`("js-test-pre2.patch", "js/js-test-pre.js"),`
`21`	`22`	`("unit.patch", "conformance/more/unit.js")`
	`23`	`+ ("unit2.patch", "conformance/more/unit.js")`
`22`	`24`	`]`
`23`	`25`
`24`	`26`	`# Fix for 'UnicodeDecodeError: 'ascii' codec can't decode byte'`