Make use of window.onerror in Khronos tests

47 files changed, 8 insertions, 135 deletions

diff --git a/tests/wpt/webgl/meta/MANIFEST.json b/tests/wpt/webgl/meta/MANIFEST.json
index 007eca40d66..b5fc2a57533 100644
--- a/tests/wpt/webgl/meta/MANIFEST.json
+++ b/tests/wpt/webgl/meta/MANIFEST.json
@@ -46414,7 +46414,7 @@
    "support"
   ],
   "js/js-test-pre.js": [
-   "f2c8167240a232d1a5480a9b7635cc250062bbdb",
+   "294bd4c5a21ccfa8b1ec4369a960304c4b2cf0f6",
    "support"
   ],
   "js/pnglib.js": [
diff --git a/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini b/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini
index e0953106e1d..59852dba1f6 100644
--- a/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini
+++ b/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini
@@ -7,6 +7,3 @@
   [WebGL test #1: gl should be non-null. Was null]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/canvas/canvas-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/canvas-test.html.ini
index 8b7ee8c7701..23dbc28d1c9 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/canvas-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/canvas-test.html.ini
@@ -1,5 +1,3 @@
 [canvas-test.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
 
diff --git a/tests/wpt/webgl/meta/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html.ini
index b1d65c2d3a7..b1c37bcbb7e 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html.ini
@@ -1,5 +1,3 @@
 [draw-static-webgl-to-multiple-canvas-test.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
 
diff --git a/tests/wpt/webgl/meta/conformance/canvas/draw-webgl-to-canvas-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/draw-webgl-to-canvas-test.html.ini
index c7cf19001e1..bf750bfcf4c 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/draw-webgl-to-canvas-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/draw-webgl-to-canvas-test.html.ini
@@ -1,5 +1,3 @@
 [draw-webgl-to-canvas-test.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
 
diff --git a/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
index d1683188f3f..14afaae8222 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
@@ -1,5 +1,2 @@
 [to-data-url-test.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/context/context-attribute-preserve-drawing-buffer.html.ini b/tests/wpt/webgl/meta/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
index ea68ffd7af1..38b543e7694 100644
--- a/tests/wpt/webgl/meta/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
+++ b/tests/wpt/webgl/meta/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
@@ -1,6 +1,3 @@
 [context-attribute-preserve-drawing-buffer.html]
   bug: https://github.com/servo/servo/issues/21132
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini b/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
index 32c517a7360..e7020b7432d 100644
--- a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
@@ -10,6 +10,3 @@
   [WebGL test #2: gl.getContextAttributes().preserveDrawingBuffer should be true. Threw exception TypeError: gl is null]
     expected: FAIL
 
-  [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 a175f986115..aa83c5988e5 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,8 +1,5 @@
 [oes-texture-float-with-canvas.html]
   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
 
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 1144c02d18e..e06bdc6cb83 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,8 +1,5 @@
 [oes-texture-half-float-with-canvas.html]
   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
 
diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini
index 16d47a55363..bef96451d92 100644
--- a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini
+++ b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
index fb7849fcd50..634a4574488 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
@@ -1,5 +1,2 @@
 [framebuffer-switch.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini
index 8a73eeb69af..df3c31a4e04 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini
@@ -1,5 +1,2 @@
 [framebuffer-texture-switch.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini b/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini
index 97147732330..6d8da9b93f7 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini
@@ -4,6 +4,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini b/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini
index fa212fcc5b5..51010d81618 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [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 35ac958bf14..bb22c44d183 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
@@ -3,9 +3,6 @@
   [WebGL test #1: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #0: 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-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 6ad47cf92d4..3c27a281ad6 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
@@ -3,9 +3,6 @@
   [WebGL test #1: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #0: 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 c716eda28ca..5f2e90ce804 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,2 @@
 [tex-2d-rgb-rgb-unsigned_byte.html]
   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 395216ec64a..7c0676fcc31 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,2 @@
 [tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
   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 5d324a0e7dd..21c42fc0501 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,2 @@
 [tex-2d-rgba-rgba-unsigned_byte.html]
   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 f7c9148eb99..dbc187f4376 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,2 @@
 [tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
   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 6c2981c0adf..56c2a1f2e04 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,2 @@
 [tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini
index aebccec6d32..f6af1c3457c 100644
--- a/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini
index ca71a6cfea9..850087c791e 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
index d92f71199a8..895f521fafa 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
index 622bd20a935..1d950e63741 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
index cd4a90bdeb0..1e47b7bff52 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
index 8db787d12ae..f57d4b49dee 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
index 31b05a79f9c..867c649267a 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
index cc446c5d068..ed48cbf2e82 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
index 12eb2792afb..44bb7e49e01 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/buffer-copying-restrictions.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/buffer-copying-restrictions.html.ini
index e4789d83a93..0e7a8553461 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/buffer-copying-restrictions.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/buffer-copying-restrictions.html.ini
@@ -1,5 +1,2 @@
 [buffer-copying-restrictions.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/buffer-type-restrictions.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/buffer-type-restrictions.html.ini
index af0b120221d..c64b5cf871e 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/buffer-type-restrictions.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/buffer-type-restrictions.html.ini
@@ -1,5 +1,2 @@
 [buffer-type-restrictions.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data-validity.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data-validity.html.ini
index 6b5cc31216a..f257d44ffa7 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data-validity.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data-validity.html.ini
@@ -1,5 +1,2 @@
 [get-buffer-sub-data-validity.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data.html.ini
index 49c14d0ef84..084047aa5aa 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data.html.ini
@@ -1,8 +1,5 @@
 [get-buffer-sub-data.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #2: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray) threw exception TypeError: gl.getBufferSubData is not a function]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/uniform-buffers-state-restoration.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/uniform-buffers-state-restoration.html.ini
index de2c2b2cad6..7bd6d740747 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/uniform-buffers-state-restoration.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/uniform-buffers-state-restoration.html.ini
@@ -1,5 +1,2 @@
 [uniform-buffers-state-restoration.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html.ini b/tests/wpt/webgl/meta/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html.ini
index 7f0f3515e12..040678e09c8 100644
--- a/tests/wpt/webgl/meta/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html.ini
@@ -1,5 +1,2 @@
 [unary-minus-operator-in-dynamic-loop.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/query/occlusion-query.html.ini b/tests/wpt/webgl/meta/conformance2/query/occlusion-query.html.ini
index aaecb221205..927ee6bab5f 100644
--- a/tests/wpt/webgl/meta/conformance2/query/occlusion-query.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/query/occlusion-query.html.ini
@@ -1,5 +1,2 @@
 [occlusion-query.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers-driver-hang.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers-driver-hang.html.ini
index a6cc4f523a5..b95640bd1e1 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers-driver-hang.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers-driver-hang.html.ini
@@ -1,5 +1,2 @@
 [draw-buffers-driver-hang.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/sync/sync-webgl-specific.html.ini b/tests/wpt/webgl/meta/conformance2/sync/sync-webgl-specific.html.ini
index 261b5db8e17..dffa002bc9d 100644
--- a/tests/wpt/webgl/meta/conformance2/sync/sync-webgl-specific.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/sync/sync-webgl-specific.html.ini
@@ -1,8 +1,5 @@
 [sync-webgl-specific.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #3: gl.getError() should be 0. Was 1280.]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/same-buffer-two-binding-points.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/same-buffer-two-binding-points.html.ini
index 942d8ac93df..5d90cc6e16d 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/same-buffer-two-binding-points.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/same-buffer-two-binding-points.html.ini
@@ -1,5 +1,2 @@
 [same-buffer-two-binding-points.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/simultaneous_binding.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/simultaneous_binding.html.ini
index b16b96f8084..9d27715d328 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/simultaneous_binding.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/simultaneous_binding.html.ini
@@ -1,5 +1,2 @@
 [simultaneous_binding.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini
index 146c7c06d7a..3e85820845f 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini
@@ -1,5 +1,2 @@
 [switching-objects.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/too-small-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/too-small-buffers.html.ini
index 3571f1037b9..155f00d8737 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/too-small-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/too-small-buffers.html.ini
@@ -1,5 +1,2 @@
 [too-small-buffers.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/transform_feedback.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/transform_feedback.html.ini
index 128a77b884d..8c99e9420d6 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/transform_feedback.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/transform_feedback.html.ini
@@ -1,8 +1,5 @@
 [transform_feedback.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #2: getError expected: NO_ERROR. Was INVALID_ENUM : TRANSFORM_FEEDBACK_BINDING query should succeed]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/tests/js/js-test-pre.js b/tests/wpt/webgl/tests/js/js-test-pre.js
index f2c8167240a..294bd4c5a21 100644
--- a/tests/wpt/webgl/tests/js/js-test-pre.js
+++ b/tests/wpt/webgl/tests/js/js-test-pre.js
@@ -142,9 +142,10 @@ function notifyFinishedToHarness() {
 }
 
 (function () {
-  var oldNotify = notifyFinishedToHarness;
   var t = async_test("Overall test");
-  window.notifyFinishedToHarness = t.step_func_done(oldNotify);
+  var done = t.step_func_done(notifyFinishedToHarness);
+  window.notifyFinishedToHarness = done;
+  window.addEventListener("error", done);
 }())
 
 var _bufferedConsoleLogs = [];
diff --git a/tests/wpt/webgl/tools/js-test-pre.patch b/tests/wpt/webgl/tools/js-test-pre.patch
index 0d615f2e163..a824bfbf679 100644
--- a/tests/wpt/webgl/tools/js-test-pre.patch
+++ b/tests/wpt/webgl/tools/js-test-pre.patch
@@ -30,14 +30,15 @@
  
  function reportSkippedTestResultsToHarness(success, msg) {
    if (window.parent.webglTestHarness) {
-@@ -127,6 +141,12 @@
+@@ -127,6 +141,13 @@
    }
  }
  
 +(function () {
-+  var oldNotify = notifyFinishedToHarness;
 +  var t = async_test("Overall test");
-+  window.notifyFinishedToHarness = t.step_func_done(oldNotify);
++  var done = t.step_func_done(notifyFinishedToHarness);
++  window.notifyFinishedToHarness = done;
++  window.addEventListener("error", done);
 +}())
 +
  var _bufferedConsoleLogs = [];