diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 23c61ede1a1..c131078eace 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,6 +17,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini b/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini
new file mode 100644
index 00000000000..43ff48a458a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini
@@ -0,0 +1,10 @@
+[Event-dispatch-click.html]
+  [event state during post-click handling]
+    expected: FAIL
+
+  [disabled radio should be checked from dispatchEvent(new MouseEvent("click"))]
+    expected: FAIL
+
+  [disabled checkbox should be checked from dispatchEvent(new MouseEvent("click"))]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 0a2b0ecfc1e..31244dc0164 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -315,15 +315,18 @@
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index b2ffc8abf78..2003288747e 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,6 +56,9 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript error]
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
+  [separate text/javascript ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 7277f622b20..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
deleted file mode 100644
index 51f8272a6de..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_3.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc1..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 88f4ddd0e9a..42ebcc9d57e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..93673c2a0db 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..0fbc49ea1c1 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 32ada23d7df..f17c2863d41 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,13 +1,14 @@
 [htmlanchorelement_noopener.html]
+  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
new file mode 100644
index 00000000000..bcd2fd0eab8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
@@ -0,0 +1,4 @@
+[077.html]
+  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webxr/xrSession_requestSessionDuringEnd.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestSessionDuringEnd.https.html.ini
new file mode 100644
index 00000000000..df0dc8e6485
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/xrSession_requestSessionDuringEnd.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_requestSessionDuringEnd.https.html]
+  [Create new session in OnSessionEnded event]
+    expected: FAIL
+
+  [Create mew session in end promise]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index b77f988f230..733a29a8432 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -15751,6 +15751,13 @@
          {}
         ]
        ],
+       "historical-manual.html": [
+        "0e2147222d9435793374e37bdf1cb49796749711",
+        [
+         null,
+         {}
+        ]
+       ],
        "relatedTarget-attribute-manual.html": [
         "c5a897d68e4cd79265d99bb0f637feaf144f6cd4",
         [
@@ -16081,7 +16088,7 @@
       },
       "the-dragevent-interface": {
        "dragevent-manual.html": [
-        "aafe83205fdf3fda301caba3a5313a9a177771b6",
+        "e4d754e459077bbe5dcb59d0ca9ab2d92fa3bdfd",
         [
          null,
          {}
@@ -245365,40 +245372,6 @@
      }
     }
    },
-   "webgpu": {
-    "webgpu": {
-     "web-platform": {
-      "reftests": {
-       "canvas_clear.html": [
-        "86a3da939dbe94efbeec04e5d366a40736ca4560",
-        [
-         null,
-         [
-          [
-           "/webgpu/webgpu/web-platform/reftests/ref/canvas_clear-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "canvas_complex_bgra8unorm.html": [
-        "1310543648e4fd640b0deb227000731af7b88b00",
-        [
-         null,
-         [
-          [
-           "/webgpu/webgpu/web-platform/reftests/ref/canvas_complex-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ]
-      }
-     }
-    }
-   },
    "webvtt": {
     "rendering": {
      "cues-with-video": {
@@ -248892,7 +248865,7 @@
      ]
     },
     "support-promises.js": [
-     "8195be341e18860865c072bc78a1efa1f25f2d56",
+     "9128bfe151ab9cda59ff6e3d4487024b0b7cd0cb",
      []
     ],
     "support.js": [
@@ -330366,7 +330339,7 @@
        []
       ],
       "build.sh": [
-       "ae1563ad85de7f5cc502d75b079121236de9b249",
+       "f69fa4ff17d9ffe18559c34546139872c6a8e2e2",
        []
       ],
       "current-work-canvas.xhtml": [
@@ -341389,7 +341362,7 @@
     ]
    },
    "lint.ignore": [
-    "6b79e8a757ddbc16278511d0ace1a69720f5bdb9",
+    "a17a09402e01ca07a56b8270d1ec45f745377544",
     []
    ],
    "loading": {
@@ -351367,11 +351340,11 @@
       []
      ],
      "lint.py": [
-      "8a1149c7f054c897163c9310f335ec2183259afc",
+      "7bec438b773da96e30986aa974b66043248bc079",
       []
      ],
      "rules.py": [
-      "1bf78b7bb405f132536d162ba920dd2de9e08f09",
+      "f6e23aef58ad3a97a0ba8bf5514cb802f2e0f31b",
       []
      ],
      "tests": {
@@ -351576,7 +351549,7 @@
        []
       ],
       "test_path_lints.py": [
-       "7368216cd3dd6ba54843cfe7390b876a357d3490",
+       "9fefb7a1d7e0615044ae00acb0b8e64481e41b97",
        []
       ]
      }
@@ -358091,7 +358064,7 @@
         []
        ],
        "executormarionette.py": [
-        "05223d374feb7bfeea1321d2ec8fbd99fa9fddb7",
+        "1ba9f06aabc8cf10e91cf3aa92643562f05a1c1a",
         []
        ],
        "executoropera.py": [
@@ -360637,7 +360610,7 @@
         []
        ],
        "test_actions_wdspec.html": [
-        "39a8876e54ad183b900acbb552a5930b5b4b83fd",
+        "0253add960792f79bef8a8747dac26661c4a2f86",
         []
        ]
       }
@@ -360804,357 +360777,13 @@
      []
     ],
     "META.yml": [
-     "befe8a68dd5d060da9480f9a967fd11060281967",
+     "163130faea362a087959cee4cfbaba729893e225",
      []
     ],
     "README.md": [
-     "ef0dbfee60ce3e787131ca40e5be64952e578e03",
+     "24a68b3ad3e89ea6617f02d90c890c1d04cf717e",
      []
-    ],
-    "common": {
-     "framework": {
-      "file_loader.js": [
-       "0f25ca465d3df9231ad1faecd4373305ee423847",
-       []
-      ],
-      "fixture.js": [
-       "ef23f06596bd7cc244484102008db8ca9485c2c8",
-       []
-      ],
-      "gpu": {
-       "device_pool.js": [
-        "848e5802817b43e26c8e25ecfec48c0ea9fe8816",
-        []
-       ],
-       "implementation.js": [
-        "670872b5d6e32ebf3815935fdd9fec605056a30c",
-        []
-       ]
-      },
-      "logging": {
-       "log_message.js": [
-        "11f352f892e76eb0140f0fe36249f41e103e1e05",
-        []
-       ],
-       "logger.js": [
-        "8d66c554c5ad8b48df127d914883fc8f4578bc38",
-        []
-       ],
-       "result.js": [
-        "813e781ba28ce0471d17d439c0fc20ed400f68ac",
-        []
-       ],
-       "test_case_recorder.js": [
-        "d16af0f2b861421cb77050648440ae4e4fbd3d39",
-        []
-       ]
-      },
-      "params_builder.js": [
-       "10dd239df93c6ce1a9ae8559586c6c304b3243e2",
-       []
-      ],
-      "params_utils.js": [
-       "161feb5d4306ea30ae56c7ba6f76ac81f90a25ba",
-       []
-      ],
-      "query": {
-       "compare.js": [
-        "52396f352e64e13e30d9823f04e55525be38624e",
-        []
-       ],
-       "encode_selectively.js": [
-        "e153cf8ccd89b8e6bfb0346581e0139eed865565",
-        []
-       ],
-       "parseQuery.js": [
-        "758227cc520f486f4a0662d0935eaa86a1aa937b",
-        []
-       ],
-       "query.js": [
-        "8b352241f8b95b1caa60ac331e7f4c47b5236c64",
-        []
-       ],
-       "separators.js": [
-        "e378a9d1d290de77dfc46f00e8afa644ce13cb18",
-        []
-       ],
-       "stringify_params.js": [
-        "b5503ffb54ead8677dfb5189aecd9e46fcf30cad",
-        []
-       ],
-       "validQueryPart.js": [
-        "3c051afc94b46f2500b13eafceac6a8dc0171c3e",
-        []
-       ]
-      },
-      "test_group.js": [
-       "5ced9cd3d372ad9b5d6e1ad3f240554e2bab490b",
-       []
-      ],
-      "test_suite_listing.js": [
-       "99c900217c1463e09faefd01e0db96498db7ca92",
-       []
-      ],
-      "tree.js": [
-       "69dfac21a635c278dae9daab4c8adb81aec550d9",
-       []
-      ],
-      "util": {
-       "async_mutex.js": [
-        "cb900605bcfe77bae785c207419787e317bf1d73",
-        []
-       ],
-       "collect_garbage.js": [
-        "d4b5bb19b233f4306241973e5d7935af715f7141",
-        []
-       ],
-       "stack.js": [
-        "99653f888066181e5fbac7a7a4331f6cb4fe3ecb",
-        []
-       ],
-       "timeout.js": [
-        "e565a518efc045cfc90e7dd7b23dc65604c6b805",
-        []
-       ],
-       "util.js": [
-        "b64379982a60f7b4551b7611feb7fdcf288d560e",
-        []
-       ]
-      },
-      "version.js": [
-       "4b233137825b86fb1d70896601d6e63a4f42865d",
-       []
-      ]
-     },
-     "runtime": {
-      "helper": {
-       "options.js": [
-        "1a90beadf1ee459911b2b549fc9359b44fe37bbd",
-        []
-       ],
-       "test_worker-worker.js": [
-        "a02c98c2bbfbc27ae109fed082702f5367b2afad",
-        []
-       ],
-       "test_worker.js": [
-        "7e8b9a47c077261e8dcacb21487989edbd146e2c",
-        []
-       ]
-      },
-      "wpt.js": [
-       "dc38b77b1d5ad3517f0463285f35881cf28aee08",
-       []
-      ]
-     }
-    },
-    "webgpu": {
-     "api": {
-      "operation": {
-       "buffers": {
-        "create_mapped.spec.js": [
-         "1c3b1254d503727d9efd189ec6b9eba5bac3a79b",
-         []
-        ],
-        "map.spec.js": [
-         "e8c86ec1b8a4539742d10309967b1d0578b38cee",
-         []
-        ],
-        "map_detach.spec.js": [
-         "8ae0be0b197ac1ae1a6bac48dacd00ecc8ec2a9e",
-         []
-        ],
-        "map_oom.spec.js": [
-         "8494dc7ddc769f166a6422531d34565cd4810a16",
-         []
-        ],
-        "mapping_test.js": [
-         "b7349059035d46dffc1156314c7dfe7ec7526d54",
-         []
-        ]
-       },
-       "command_buffer": {
-        "basic.spec.js": [
-         "547a08683f7318d5aceb2e26096166c1c994c579",
-         []
-        ],
-        "copies.spec.js": [
-         "cc2ea6deae161d2025119beda183dfb767b63795",
-         []
-        ],
-        "render": {
-         "basic.spec.js": [
-          "815eb5b70b0092c096fe385ad94729f62ef44761",
-          []
-         ]
-        }
-       },
-       "fences.spec.js": [
-        "f9f079b6241fa99a6895250329b18fb88d895ac3",
-        []
-       ],
-       "resource_init": {
-        "copied_texture_clear.spec.js": [
-         "f5b8b697d74e75ecd2e5fb149f29d69e8c6c3610",
-         []
-        ],
-        "texture_zero_init_test.js": [
-         "8dda949f85954069826ee50aa5b58933b5fc8e3f",
-         []
-        ]
-       }
-      },
-      "validation": {
-       "createBindGroup.spec.js": [
-        "5deed893d5e4ef039d25479b63c2a35892e81d17",
-        []
-       ],
-       "createBindGroupLayout.spec.js": [
-        "2fec032c178f8be0b92ef45278d39886ad9cfc8d",
-        []
-       ],
-       "createPipelineLayout.spec.js": [
-        "4e293fa725dfe18f789f4fb7afaf0fad4a0cd14c",
-        []
-       ],
-       "createTexture.spec.js": [
-        "2ef8d19523311d64519af8ecff18d27ac9695749",
-        []
-       ],
-       "createView.spec.js": [
-        "3ad1ca97d7d069b6fd6fd0fb216051a0c6dbf742",
-        []
-       ],
-       "error_scope.spec.js": [
-        "3edbec2dc417fc4cb95ab67baefc1d0f1a798154",
-        []
-       ],
-       "fences.spec.js": [
-        "2ab0691e3ce6cadb532a94a43d568b8a111a8430",
-        []
-       ],
-       "queue_submit.spec.js": [
-        "24e386b9d22c2bbea0fca8e8b5c94c770e8ed7d5",
-        []
-       ],
-       "render_pass_descriptor.spec.js": [
-        "3c1b111fea4a79aab8cd8defbc61152e7e5302ea",
-        []
-       ],
-       "setBindGroup.spec.js": [
-        "95786a8f78d3a6fe230d6a08c3cfb83c93a97666",
-        []
-       ],
-       "setBlendColor.spec.js": [
-        "469641df04341795efdad946ea65eb517a51265c",
-        []
-       ],
-       "setScissorRect.spec.js": [
-        "8381865a6938c4a32d81744fb1bbaaf41ae309fb",
-        []
-       ],
-       "setStencilReference.spec.js": [
-        "f205239d86142ea08880f226f9d9ae052a385aa1",
-        []
-       ],
-       "setViewport.spec.js": [
-        "f1168c11086fd4fa7114c36b9895bab49b66a410",
-        []
-       ],
-       "validation_test.js": [
-        "17eb97bcc63daafbda34a661bafd0da688d7bb8b",
-        []
-       ]
-      }
-     },
-     "capability_info.js": [
-      "47d508ac3e3c5abfe9d2c4da3ab1ee412dec8030",
-      []
-     ],
-     "examples.spec.js": [
-      "28b9ae47f2c25183ba68b1bcb7303a033541213b",
-      []
-     ],
-     "gpu_test.js": [
-      "e740af1113b88f548768c33a0d378490d3d8320b",
-      []
-     ],
-     "idl": {
-      "constants": {
-       "flags.spec.js": [
-        "5a6d7868aa531677f8660768ce87a73564727314",
-        []
-       ]
-      },
-      "idl_test.js": [
-       "0665ad208cd8453352a1c4a030614b40b3783de7",
-       []
-      ]
-     },
-     "listing.js": [
-      "a8b67e72547db017720f5e7fb4e88f024eab2bf4",
-      []
-     ],
-     "util": {
-      "conversion.js": [
-       "73c04fe56badcff5aee3bf665465b24c81d4f3bf",
-       []
-      ],
-      "math.js": [
-       "19720d631c55590bfbfc223e9c6409eded4d6232",
-       []
-      ],
-      "texture": {
-       "layout.js": [
-        "425aa2020d75eace60d793d9148cc9cd531af475",
-        []
-       ],
-       "subresource.js": [
-        "04a8e7221a8ad8a9f76369d4e3f2ffa4fe21a056",
-        []
-       ],
-       "texelData.js": [
-        "2ea7275e710a5e47a59480ca2a56c1026172e6bf",
-        []
-       ]
-      }
-     },
-     "web-platform": {
-      "canvas": {
-       "context_creation.spec.js": [
-        "427b15fced447160db36ca3d6f829211f5080206",
-        []
-       ]
-      },
-      "copyImageBitmapToTexture.spec.js": [
-       "efdc21ded93736439f8112c35e9a39600b07739c",
-       []
-      ],
-      "reftests": {
-       "canvas_clear.js": [
-        "52ffaedad84c7552fd13cbac89cd800c09a012c0",
-        []
-       ],
-       "canvas_complex.js": [
-        "1e63a0ab20233e9db7e9c628493af178edd386c9",
-        []
-       ],
-       "gpu_ref_test.js": [
-        "f45f232557cdd05406317b3a521d06e3e1bbd960",
-        []
-       ],
-       "ref": {
-        "canvas_clear-ref.html": [
-         "2e0781186273ac49d6c70b5e5a9c68103aa5f173",
-         []
-        ],
-        "canvas_complex-ref.html": [
-         "3d5b3b3376d23cfdcda57f0c53fc3192e8a77bb6",
-         []
-        ]
-       }
-      }
-     }
-    }
+    ]
    },
    "webmessaging": {
     "META.yml": [
@@ -368531,7 +368160,7 @@
      ]
     ],
     "idbobjectstore_putall.tentative.any.js": [
-     "a312d71d03d59c5c9369afa1492aacd0e91e9a5d",
+     "26bcc87a4c3234c2de5699c5443d75b4419eab02",
      [
       "IndexedDB/idbobjectstore_putall.tentative.any.html",
       {
@@ -416222,7 +415851,7 @@
       ]
      ],
      "Event-dispatch-click.html": [
-      "7690f753d9cd0b47f2c2c25352576caed970cd19",
+      "4b07103027139b4d7679da4e50eb3d82ab8b12d2",
       [
        null,
        {}
@@ -432154,7 +431783,7 @@
      ]
     ],
     "event-counts-zero.html": [
-     "3ec90dd69138f35197774239dfc12f554c9284b2",
+     "e00eb40255b853b67ea959bf7ebeb12d066374ec",
      [
       null,
       {
@@ -459609,6 +459238,13 @@
         ]
        ]
       },
+      "historical.html": [
+       "5cba688ff83e6dae90100b315a9fa86f69974502",
+       [
+        null,
+        {}
+       ]
+      ],
       "synthetic": {
        "001.html": [
         "f90c345740df3f9c4366d01a3d47e323b30069fc",
@@ -486616,6 +486252,20 @@
       {}
      ]
     ],
+    "first-contentful-canvas-none.html": [
+     "33a4352126c0d59668e5fdd30d96a4c54ad34468",
+     [
+      null,
+      {}
+     ]
+    ],
+    "first-contentful-canvas-webgl2.html": [
+     "f7c5f50ecba0bd5a5d45fb41a02d0457e49e6713",
+     [
+      null,
+      {}
+     ]
+    ],
     "first-contentful-canvas.html": [
      "e6a4365b760c7126be458c505a49ef1ea7234d53",
      [
@@ -501642,7 +501292,7 @@
      ]
     ],
     "scroll-animation-effect-phases.tentative.html": [
-     "df7ab69404cb00a9e09ec03593f531a50999630a",
+     "b8e678e9218395f43f2690a67fb1d887ce73dacc",
      [
       null,
       {
@@ -504615,6 +504265,13 @@
        {}
       ]
      ],
+     "element-internals-shadowroot.tentative.html": [
+      "0f01cc41acf153512ff00b1147ccc224087167eb",
+      [
+       null,
+       {}
+      ]
+     ],
      "getinnerhtml.tentative.html": [
       "2f8ecad418b818f35220550479f9c02e1889744e",
       [
@@ -524535,6 +524192,15 @@
      ]
     ]
    },
+   "webcodecs": {
+    "video-track-reader.html": [
+     "087e0bb935b6033876c9b7eed10274bab02d8910",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "webdriver": {
     "tests": {
      "idlharness.html": [
@@ -524633,119 +524299,6 @@
      ]
     ]
    },
-   "webgpu": {
-    "cts.html": [
-     "e78afee421ad7d11a16adbd89fb4a833d0b1aece",
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,buffers,create_mapped:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,buffers,map:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,buffers,map_detach:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,buffers,map_oom:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,command_buffer,basic:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,command_buffer,copies:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,command_buffer,render,basic:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,fences:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,resource_init,copied_texture_clear:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,createBindGroup:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,createBindGroupLayout:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,createPipelineLayout:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,createTexture:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,createView:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,error_scope:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,fences:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,queue_submit:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,render_pass_descriptor:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,setBindGroup:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,setBlendColor:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,setScissorRect:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,setStencilReference:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:api,validation,setViewport:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:examples:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:idl,constants,flags:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:web-platform,canvas,context_creation:*",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=webgpu:web-platform,copyImageBitmapToTexture:*",
-      {}
-     ]
-    ]
-   },
    "webhid": {
     "idlharness.https.window.js": [
      "fa763e0d80ac7e196cd276a9aed5a7a33f9d8331",
@@ -533117,6 +532670,13 @@
       {}
      ]
     ],
+    "xrSession_requestSessionDuringEnd.https.html": [
+     "2ab6cb7fbb5ede0523a143e042a459e6f3c5cde5",
+     [
+      null,
+      {}
+     ]
+    ],
     "xrSession_sameObject.https.html": [
      "66aeef81c50c36ff2fc50dcc7c45749f25605893",
      [
@@ -563277,7 +562837,7 @@
        ]
       ],
       "pointer.py": [
-       "a752203587bed5ebcfa50599f0548feb69ca4c98",
+       "d021eee7c9404cf09194a41632b6093c72ce961d",
        [
         null,
         {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [test the top of layer]
     expected: FAIL
 
-  [test some point of the element: top left corner]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini b/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
index 33709ceac1c..eace9567357 100644
--- a/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
+++ b/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
@@ -2,3 +2,10 @@
   type: testharness
   [event state during post-click handling]
     expected: FAIL
+
+  [disabled radio should be checked from dispatchEvent(new MouseEvent("click"))]
+    expected: FAIL
+
+  [disabled checkbox should be checked from dispatchEvent(new MouseEvent("click"))]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 4e3da8a6166..d6b0d992e7b 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,15 +315,18 @@
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index b2ffc8abf78..2003288747e 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,9 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript error]
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
+  [separate text/javascript ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 7277f622b20..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
deleted file mode 100644
index 51f8272a6de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_3.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc1..00000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 2a166bb97b7..fc37df7e3fa 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..cb0211f1d21 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index e440b1e38c6..71edac2c5ed 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index e3c28e7d996..e5bedc8b939 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,5 +1,6 @@
 [htmlanchorelement_noopener.html]
   type: testharness
+  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -7,11 +8,11 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
new file mode 100644
index 00000000000..bcd2fd0eab8
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
@@ -0,0 +1,4 @@
+[077.html]
+  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webxr/xrSession_requestSessionDuringEnd.https.html.ini b/tests/wpt/metadata/webxr/xrSession_requestSessionDuringEnd.https.html.ini
new file mode 100644
index 00000000000..df0dc8e6485
--- /dev/null
+++ b/tests/wpt/metadata/webxr/xrSession_requestSessionDuringEnd.https.html.ini
@@ -0,0 +1,7 @@
+[xrSession_requestSessionDuringEnd.https.html]
+  [Create new session in OnSessionEnded event]
+    expected: FAIL
+
+  [Create mew session in end promise]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_putall.tentative.any.js b/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_putall.tentative.any.js
index a312d71d03d..26bcc87a4c3 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_putall.tentative.any.js
+++ b/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_putall.tentative.any.js
@@ -6,12 +6,13 @@ promise_test(async testCase => {
   });
   const txn = db.transaction(['books'], 'readwrite');
   const objectStore = txn.objectStore('books');
-  let values = [
+  const values = [
     {isbn: 'one', title: 'title1'},
     {isbn: 'two', title: 'title2'},
     {isbn: 'three', title: 'title3'}
   ];
-  let putAllRequest = objectStore.putAll(values);
+  const putAllRequest = objectStore.putAllValues(values);
+  // TODO(nums): Check that correct keys are returned.
   await promiseForRequest(testCase, putAllRequest);
   await promiseForTransaction(testCase, txn);
 
@@ -28,4 +29,152 @@ promise_test(async testCase => {
       ['title1', 'title2', 'title3'],
       'All three retrieved titles should match those that were put.');
   db.close();
-}, 'Data can be successfully inputted into an object store using putAll.');
+}, 'Data can be successfully inserted into an object store using putAll.');
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, db => {
+    const store = createBooksStore(testCase, db);
+  });
+  const txn = db.transaction(['books'], 'readwrite');
+  const objectStore = txn.objectStore('books');
+  const values = [
+    {isbn: ['one', 'two', 'three'], title: 'title1'},
+    {isbn: ['four', 'five', 'six'], title: 'title2'},
+    {isbn: ['seven', 'eight', 'nine'], title: 'title3'}
+  ];
+  const putAllRequest = objectStore.putAllValues(values);
+  // TODO(nums): Check that correct keys are returned.
+  await promiseForRequest(testCase, putAllRequest);
+  await promiseForTransaction(testCase, txn);
+
+  const txn2 = db.transaction(['books'], 'readonly');
+  const objectStore2 = txn2.objectStore('books');
+  const getRequest1 = objectStore2.get(['one', 'two', 'three']);
+  const getRequest2 = objectStore2.get(['four', 'five', 'six']);
+  const getRequest3 = objectStore2.get(['seven', 'eight', 'nine']);
+  await promiseForTransaction(testCase, txn2);
+  assert_array_equals(
+      [getRequest1.result.title,
+          getRequest2.result.title,
+          getRequest3.result.title],
+      ['title1', 'title2', 'title3'],
+      'All three retrieved titles should match those that were put.');
+  db.close();
+}, 'Values with array keys can be successfully inserted into an object'
+    + ' store using putAll.');
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, db => {
+    const store = createBooksStore(testCase, db);
+  });
+  const txn = db.transaction(['books'], 'readwrite');
+  const objectStore = txn.objectStore('books');
+  const putAllRequest = objectStore.putAllValues([]);
+  await promiseForRequest(testCase, putAllRequest);
+  await promiseForTransaction(testCase, txn);
+  // TODO(nums): Check that an empty key array is returned.
+  db.close();
+}, 'Inserting an empty list using putAll.');
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, db => {
+    const store = createBooksStore(testCase, db);
+  });
+  const txn = db.transaction(['books'], 'readwrite');
+  const objectStore = txn.objectStore('books');
+  const putAllRequest = objectStore.putAllValues([{}, {}, {}]);
+  // TODO(nums): Check that correct keys are returned.
+  await promiseForRequest(testCase, putAllRequest);
+  await promiseForTransaction(testCase, txn);
+
+  const txn2 = db.transaction(['books'], 'readonly');
+  const objectStore2 = txn2.objectStore('books');
+  const getRequest1 = objectStore2.get(1);
+  const getRequest2 = objectStore2.get(2);
+  const getRequest3 = objectStore2.get(3);
+  await Promise.all([
+    promiseForRequest(testCase, getRequest1),
+    promiseForRequest(testCase, getRequest2),
+    promiseForRequest(testCase, getRequest3),
+  ]);
+  db.close();
+}, 'Empty values can be inserted into an objectstore'
+    + ' with a key generator using putAll.');
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, db => {
+    const store = createBooksStore(testCase, db);
+  });
+  const txn = db.transaction(['books'], 'readonly');
+  const objectStore = txn.objectStore('books');
+  assert_throws_dom('ReadOnlyError',
+    () => { objectStore.putAllValues([{}]); },
+    'The transaction is readonly');
+  db.close();
+}, 'Attempting to insert with a read only transaction using putAll throws a '
+    + 'ReadOnlyError.');
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, db => {
+    const store = createBooksStore(testCase, db);
+  });
+  const txn = db.transaction(['books'], 'readwrite');
+  const objectStore = txn.objectStore('books');
+  const putRequest = await objectStore.put({isbn: 1, title: "duplicate"});
+  await promiseForRequest(testCase, putRequest);
+  const putAllRequest = objectStore.putAllValues([
+    {isbn: 2, title: "duplicate"},
+    {isbn: 3, title: "duplicate"}
+  ]);
+  const errorEvent = await requestWatcher(testCase,
+                                        putAllRequest).wait_for('error');
+  assert_equals(errorEvent.target.error.name, "ConstraintError");
+  errorEvent.preventDefault();
+  // The transaction still receives the error event even though it
+  // isn't aborted.
+  await transactionWatcher(testCase, txn).wait_for(['error', 'complete']);
+
+  const txn2 = db.transaction(['books'], 'readonly');
+  const objectStore2 = txn2.objectStore('books');
+  const getRequest1 = objectStore2.get(1);
+  const getRequest2 = objectStore2.get(2);
+  const getRequest3 = objectStore2.get(3);
+  await promiseForTransaction(testCase, txn2);
+  assert_array_equals(
+      [getRequest1.result.title, getRequest2.result, getRequest3.result],
+      ["duplicate", undefined, undefined],
+      'None of the values should have been inserted.');
+  db.close();
+}, 'Inserting duplicate unique keys into a store that already has the key'
+    + 'using putAll throws a ConstraintError.');
+
+promise_test(async testCase => {
+  const db = await createDatabase(testCase, db => {
+    const store = createBooksStoreWithoutAutoIncrement(testCase, db);
+  });
+  const txn = db.transaction(['books'], 'readwrite');
+  const objectStore = txn.objectStore('books');
+  const values = [
+    {title: "title1", isbn: 1},
+    {title: "title2"}
+  ];
+  assert_throws_dom('DataError',
+    () => { const putAllRequest = objectStore.putAllValues(values); },
+    "Evaluating the object store's key path did not yield a value");
+
+  const txn2 = db.transaction(['books'], 'readonly');
+  const objectStore2 = txn2.objectStore('books');
+  const getRequest1 = objectStore2.get(1);
+  const getRequest2 = objectStore2.get(2);
+  await promiseForTransaction(testCase, txn2);
+  assert_array_equals(
+      [getRequest1.result, getRequest2.result],
+      [undefined, undefined],
+      'No data should have been inserted');
+  db.close();
+}, 'Inserting values without the key into an object store that'
+    + ' does not have generated keys throws an exception.');
+
+// TODO(nums): Add test for insertion into multi entry indexes
+// TODO(nums): Add test for inserting unique keys into a store
+// that doesn't already have the key https://crbug.com/1115649
diff --git a/tests/wpt/web-platform-tests/IndexedDB/support-promises.js b/tests/wpt/web-platform-tests/IndexedDB/support-promises.js
index 8195be341e1..9128bfe151a 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/support-promises.js
+++ b/tests/wpt/web-platform-tests/IndexedDB/support-promises.js
@@ -196,7 +196,19 @@ const createBooksStore = (testCase, database) => {
       { keyPath: 'isbn', autoIncrement: true });
   store.createIndex('by_author', 'author');
   store.createIndex('by_title', 'title', { unique: true });
-  for (let record of BOOKS_RECORD_DATA)
+  for (const record of BOOKS_RECORD_DATA)
+      store.put(record);
+  return store;
+}
+
+// Creates a 'books' object store whose contents closely resembles the first
+// example in the IndexedDB specification, just without autoincrementing.
+const createBooksStoreWithoutAutoIncrement = (testCase, database) => {
+  const store = database.createObjectStore('books',
+      { keyPath: 'isbn' });
+  store.createIndex('by_author', 'author');
+  store.createIndex('by_title', 'title', { unique: true });
+  for (const record of BOOKS_RECORD_DATA)
       store.put(record);
   return store;
 }
diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html b/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
index 7690f753d9c..4b071030271 100644
--- a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
+++ b/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
@@ -209,6 +209,38 @@ async_test(t => {
   input.dispatchEvent(new MouseEvent('click'));
 }, `disconnected radio should be checked from dispatchEvent(new MouseEvent('click'))`);
 
+test(() => {
+  const input = document.createElement("input");
+  input.type = "checkbox";
+  input.disabled = true;
+  input.dispatchEvent(new MouseEvent("click"));
+  assert_true(input.checked);
+}, `disabled checkbox should be checked from dispatchEvent(new MouseEvent("click"))`);
+
+test(() => {
+  const input = document.createElement("input");
+  input.type = "radio";
+  input.disabled = true;
+  input.dispatchEvent(new MouseEvent("click"));
+  assert_true(input.checked);
+}, `disabled radio should be checked from dispatchEvent(new MouseEvent("click"))`);
+
+async_test(t => {
+  const input = document.createElement("input");
+  input.type = "checkbox";
+  input.disabled = true;
+  input.onclick = t.step_func_done();
+  input.dispatchEvent(new MouseEvent("click"));
+}, `disabled checkbox should fire onclick`);
+
+async_test(t => {
+  const input = document.createElement("input");
+  input.type = "radio";
+  input.disabled = true;
+  input.onclick = t.step_func_done();
+  input.dispatchEvent(new MouseEvent("click"));
+}, `disabled radio should fire onclick`);
+
 async_test(function(t) {
   var form = document.createElement("form")
   var didSubmit = false
diff --git a/tests/wpt/web-platform-tests/event-timing/event-counts-zero.html b/tests/wpt/web-platform-tests/event-timing/event-counts-zero.html
index 3ec90dd6913..e00eb40255b 100644
--- a/tests/wpt/web-platform-tests/event-timing/event-counts-zero.html
+++ b/tests/wpt/web-platform-tests/event-timing/event-counts-zero.html
@@ -43,7 +43,6 @@
         'dragstart',
         'dragend',
         'dragenter',
-        // 'dragexit'? Unclear if it will be removed from HTML spec or not.
         'dragleave',
         'dragover',
         'drop'
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/build.sh b/tests/wpt/web-platform-tests/html/canvas/tools/build.sh
index ae1563ad85d..f69fa4ff17d 100755
--- a/tests/wpt/web-platform-tests/html/canvas/tools/build.sh
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/build.sh
@@ -2,6 +2,6 @@
 set -ex
 
 cd "${0%/*}"
-virtualenv -p python2 .virtualenv
+virtualenv -p python .virtualenv
 .virtualenv/bin/pip install pyyaml cairocffi
 .virtualenv/bin/python gentest.py
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/historical-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/events/historical-manual.html
new file mode 100644
index 00000000000..0e2147222d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/events/historical-manual.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<title>Historical drag-and-drop features</title>
+<meta charset="utf-8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+.test-square {
+  width: 100px;
+  height: 100px;
+}
+
+#draggable {
+  background: orange;
+}
+
+#dropzone {
+  background: blue;
+}
+</style>
+
+<p>Drag the orange square onto the blue square and release it.</p>
+
+<div draggable="true" id="draggable" class="test-square" ondragstart="event.dataTransfer.setData('text/plain', null)"></div>
+<div id="dropzone" class="test-square"></div>
+
+<script>
+"use strict";
+
+async_test(t => {
+  let dragexitCount = 0;
+  document.addEventListener("dragexit", () => {
+    ++dragexitCount;
+  });
+
+  // Prevent the event to allow drop
+  document.addEventListener("dragover", e => {
+    e.preventDefault();
+  });
+
+  document.addEventListener("drop", t.step_func_done(() => {
+    assert_equals(dragexitCount, 0);
+  }));
+}, `dragexit must not fire during drag-and-drop`);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/historical.html b/tests/wpt/web-platform-tests/html/editing/dnd/historical.html
new file mode 100644
index 00000000000..5cba688ff83
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/historical.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>Historical drag-and-drop features</title>
+<meta charset="utf-8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+"use strict";
+
+test(() => {
+  const potentialBadLocations = [
+    window,
+    document,
+    HTMLElement.prototype,
+    SVGElement.prototype,
+    Document.prototype,
+    HTMLDocument.prototype,
+    Element.prototype
+  ];
+  for (const location of potentialBadLocations) {
+    assert_false("ondragexit" in location,
+      `${location.constructor.name} must not have a property "ondragexit"`);
+  }
+}, `ondragexit must not be present on the GlobalEventHandlers locations`);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html
index aafe83205fd..e4d754e4590 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html
@@ -29,7 +29,7 @@
 
     <script>
       var drag, element;
-      var Events = ['ondragstart', 'ondrag', 'ondragover', 'ondragenter', 'ondragexit', 'ondragleave', 'ondrop', 'ondragend'];
+      var Events = ['ondragstart', 'ondrag', 'ondragover', 'ondragenter', 'ondragleave', 'ondrop', 'ondragend'];
 
       setup(function() {
           drag = document.querySelector('#drag');
@@ -54,10 +54,6 @@
         assert_inherits(element, 'ondragenter', 'Check if have ondragenter attribute');
       }, 'Check if have ondragenter attribute');
 
-      test(function() {
-        assert_inherits(element, 'ondragexit', 'Check if have ondragexit attribute');
-      }, 'Check if have ondragexit attribute');
-
       test(function() {
         assert_inherits(element, 'ondragleave', 'Check if have dragleave attribute');
       }, 'Check if have dragleave attribute');
@@ -96,4 +92,4 @@
 
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 6b79e8a757d..a17a09402e0 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -726,6 +726,12 @@ MISSING DEPENDENCY: web-nfc/resources/nfc-helpers.js
 MISSING DEPENDENCY: webusb/resources/usb-helpers.js
 MISSING DEPENDENCY: webxr/resources/webxr_util.js
 
+# TODO(Hexcles): delete these files once we include them in mojojs.zip.
+MOJOM-JS: resources/chromium/image_capture.mojom.js
+MOJOM-JS: resources/chromium/sensor_provider.mojom.js
+MOJOM-JS: resources/chromium/mojo_web_test_helper_test.mojom.js
+MOJOM-JS: resources/chromium/sensor.mojom.js
+
 # Tests that are false positives for using Ahem as a system font
 AHEM SYSTEM FONT: acid/acid3/test.html
 AHEM SYSTEM FONT: resource-timing/resources/all_resource_types.htm
diff --git a/tests/wpt/web-platform-tests/paint-timing/first-contentful-canvas-none.html b/tests/wpt/web-platform-tests/paint-timing/first-contentful-canvas-none.html
new file mode 100644
index 00000000000..33a4352126c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/paint-timing/first-contentful-canvas-none.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+
+<head>
+  <title>Performance Paint Timing Test: FCP due to canvas</title>
+</head>
+
+<body>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="resources/utils.js"></script>
+  <canvas id="canvas" width="200" height="200"></canvas>
+
+  <script>
+    setup({"hide_test_state": true});
+    promise_test(async t => {
+        assert_implements(window.PerformancePaintTiming, "Paint Timing isn't supported.");
+        await new Promise(r => window.addEventListener('load', r));
+        await assertNoFirstContentfulPaint(t);
+    }, 'First contentful paint should not fire for canvas type none');
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/paint-timing/first-contentful-canvas-webgl2.html b/tests/wpt/web-platform-tests/paint-timing/first-contentful-canvas-webgl2.html
new file mode 100644
index 00000000000..f7c5f50ecba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/paint-timing/first-contentful-canvas-webgl2.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+
+<head>
+  <title>Performance Paint Timing Test: FCP due to canvas</title>
+</head>
+
+<body>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <canvas id="canvas" width="200" height="200"></canvas>
+
+  <script>
+    setup({ "hide_test_state": true });
+    async_test(function (t) {
+      assert_implements(window.PerformancePaintTiming, "Paint Timing isn't supported.");
+      const canvas = document.getElementById("canvas");
+      const context = canvas.getContext("webgl2");
+      if (!context) {
+        assert_implements_optional(context, "WebGL 2 Canvas isn't supported.")
+      }
+      context.clearColor(0.3, 0.3, 0.3, 1);
+      context.clear(context.COLOR_BUFFER_BIT);
+      function testPaintEntries() {
+        const bufferedEntries = performance.getEntriesByType('paint');
+        if (bufferedEntries.length < 2) {
+          t.step_timeout(function () {
+            testPaintEntries();
+          }, 20);
+          return;
+        }
+        t.step(function () {
+          assert_equals(bufferedEntries.length, 2, "There should be two paint timing instances.");
+          assert_equals(bufferedEntries[0].entryType, "paint");
+          assert_equals(bufferedEntries[0].name, "first-paint");
+          assert_equals(bufferedEntries[1].entryType, "paint");
+          assert_equals(bufferedEntries[1].name, "first-contentful-paint");
+          t.done();
+        });
+      };
+      t.step(function () {
+        testPaintEntries();
+      });
+    }, "First contentful paint fires due to webgl2 canvas render.");
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-animation-effect-phases.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/scroll-animation-effect-phases.tentative.html
index df7ab69404c..b8e678e9218 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/scroll-animation-effect-phases.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/scroll-animation-effect-phases.tentative.html
@@ -151,4 +151,167 @@
       );
     }
   }
+
+  function createKeyframeEffectOpacity(test){
+    return new KeyframeEffect(
+      createDiv(test),
+      {
+        opacity: [0.3, 0.7]
+      },
+      {
+        duration: 1000
+      }
+    );
+  }
+
+  function verifyTimelineBeforePhase(animation){
+    assert_equals(animation.timeline.phase, "before");
+    assert_equals(animation.timeline.currentTime, 0);
+    assert_equals(animation.currentTime, 0);
+    assert_equals(
+      animation.effect.getComputedTiming().localTime,
+      0,
+      "effect local time in timeline before phase");
+  }
+
+  function verifyEffectBeforePhase(animation){
+    // progress == null AND opacity == 1 implies we are in the effect before
+    // phase
+    assert_equals(
+      animation.effect.getComputedTiming().progress,
+      null
+    );
+    assert_equals(
+      window.getComputedStyle(animation.effect.target).getPropertyValue("opacity"),
+      "1"
+    );
+  }
+
+  promise_test(async t => {
+    const animation = new Animation(
+      createKeyframeEffectOpacity(t),
+      createScrollTimelineWithOffsets(t, "20%", "80%")
+    );
+
+    const scroller = animation.timeline.scrollSource;
+    const maxScroll = scroller.scrollHeight - scroller.clientHeight;
+
+    animation.play();
+    await animation.ready;
+
+    verifyTimelineBeforePhase(animation);
+    verifyEffectBeforePhase(animation);
+
+    animation.pause();
+    await waitForNextFrame();
+
+    verifyTimelineBeforePhase(animation);
+    verifyEffectBeforePhase(animation);
+
+    animation.play();
+    await waitForNextFrame();
+
+    verifyTimelineBeforePhase(animation);
+    verifyEffectBeforePhase(animation);
+  }, 'Verify that (play -> pause -> play) doesn\'t change phase/progress.');
+
+  promise_test(async t => {
+    const animation = new Animation(
+      createKeyframeEffectOpacity(t),
+      createScrollTimelineWithOffsets(t, "20%", "80%")
+    );
+
+    const scroller = animation.timeline.scrollSource;
+    const maxScroll = scroller.scrollHeight - scroller.clientHeight;
+
+    animation.play();
+    await animation.ready;
+
+    verifyTimelineBeforePhase(animation);
+    verifyEffectBeforePhase(animation);
+
+    animation.pause();
+    await waitForNextFrame();
+
+    verifyTimelineBeforePhase(animation);
+    verifyEffectBeforePhase(animation);
+
+    // Scrolling should not cause the animation effect to change.
+    scroller.scrollTop = 0.5 * maxScroll;
+    await waitForNextFrame();
+
+    // Check timeline phase
+    assert_equals(animation.timeline.phase, "active");
+    assert_equals(animation.timeline.currentTime, 500);
+    assert_equals(animation.currentTime, 0);
+    assert_equals(
+      animation.effect.getComputedTiming().localTime,
+      0,
+      "effect local time"
+    );
+
+    // Make sure the effect is still in the before phase even though the
+    // timeline is not.
+    verifyEffectBeforePhase(animation);
+  }, 'Pause in before phase, scroll timeline into active phase, animation ' +
+  'should remain in the before phase');
+
+promise_test(async t => {
+  const animation = new Animation(
+    createKeyframeEffectOpacity(t),
+    createScrollTimelineWithOffsets(t, "20%", "80%")
+  );
+  const scroller = animation.timeline.scrollSource;
+  const maxScroll = scroller.scrollHeight - scroller.clientHeight;
+
+  animation.play();
+  await animation.ready;
+
+  // Causes the timeline to be inactive
+  scroller.style.overflow = "visible";
+  await waitForNextFrame();
+  await waitForNextFrame();
+
+  // Check timeline phase
+  assert_equals(animation.timeline.phase, "inactive");
+  assert_equals(animation.timeline.currentTime, null);
+  assert_equals(animation.currentTime, null);
+  assert_equals(
+    animation.effect.getComputedTiming().localTime,
+    null,
+    "effect local time with inactive timeline"
+  );
+
+  verifyEffectBeforePhase(animation);
+
+  // Setting the current time while timeline is inactive should cause hold phase
+  // and hold time to be populated
+  animation.currentTime = 500;
+  await waitForNextFrame();
+  await waitForNextFrame();
+
+  // Check timeline phase
+  assert_equals(animation.timeline.phase, "inactive");
+  assert_equals(animation.timeline.currentTime, null);
+  assert_equals(animation.currentTime, 500);
+  assert_equals(
+    animation.effect.getComputedTiming().localTime,
+    500,
+    "effect local time after setting animation current time"
+  );
+
+  // Check effect phase
+  // progress == 0.5 AND opacity == 0.5 shows we are in the effect active phase
+  assert_equals(
+    animation.effect.getComputedTiming().progress,
+    0.5,
+    "effect progress"
+  );
+  assert_equals(
+    window.getComputedStyle(animation.effect.target).getPropertyValue("opacity"),
+    "0.5",
+    "effect opacity after setting animation current time"
+  );
+}, 'Make scroller inactive, then set current time to an in range time');
+
 </script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/element-internals-shadowroot.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/element-internals-shadowroot.tentative.html
new file mode 100644
index 00000000000..0f01cc41acf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/declarative/element-internals-shadowroot.tentative.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>ElementInternals.shadowRoot</title>
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel="help" href="https://github.com/w3c/webcomponents/issues/871">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+
+test(() => {
+  let constructed = false;
+  customElements.define('custom-open', class extends HTMLElement {
+    constructor() {
+      super();
+      const elementInternals = this.attachInternals();
+      assert_equals(elementInternals.shadowRoot, null);
+      const shadow = this.attachShadow({mode: 'open'});
+      assert_equals(elementInternals.shadowRoot, shadow);
+      constructed = true;
+    }
+  });
+  const element = document.createElement('custom-open');
+  assert_true(constructed);
+}, 'ElementInternals.shadowRoot allows access to open shadow root');
+
+test(() => {
+  let constructed = false;
+  customElements.define('custom-closed', class extends HTMLElement {
+    constructor() {
+      super();
+      const elementInternals = this.attachInternals();
+      assert_equals(elementInternals.shadowRoot, null);
+      const shadow = this.attachShadow({mode: 'closed'});
+      assert_equals(elementInternals.shadowRoot, shadow);
+      assert_equals(this.shadowRoot, null);
+      constructed = true;
+    }
+  });
+  const element = document.createElement('custom-closed');
+  assert_true(constructed);
+}, 'ElementInternals.shadowRoot allows access to closed shadow root');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index 8a1149c7f05..7bec438b773 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -198,6 +198,13 @@ def check_gitignore_file(repo_root, path):
     return [rules.GitIgnoreFile.error(path)]
 
 
+def check_mojom_js(repo_root, path):
+    # type: (Text, Text) -> List[rules.Error]
+    if path.endswith(".mojom.js"):
+        return [rules.MojomJSFile.error(path)]
+    return []
+
+
 def check_ahem_copy(repo_root, path):
     # type: (Text, Text) -> List[rules.Error]
     lpath = path.lower()
@@ -997,8 +1004,9 @@ def lint(repo_root, paths, output_format, ignore_glob=None):
                 logger.info(line)
     return sum(itervalues(error_count))
 
+
 path_lints = [check_file_type, check_path_length, check_worker_collision, check_ahem_copy,
-              check_tentative_directories, check_gitignore_file]
+              check_mojom_js, check_tentative_directories, check_gitignore_file]
 all_paths_lints = [check_css_globally_unique, check_unique_testharness_basenames]
 file_lints = [check_regexp_line, check_parsed, check_python_ast, check_script_metadata,
               check_ahem_system_font]
diff --git a/tests/wpt/web-platform-tests/tools/lint/rules.py b/tests/wpt/web-platform-tests/tools/lint/rules.py
index 1bf78b7bb40..f6e23aef58a 100644
--- a/tests/wpt/web-platform-tests/tools/lint/rules.py
+++ b/tests/wpt/web-platform-tests/tools/lint/rules.py
@@ -81,6 +81,18 @@ class GitIgnoreFile(Rule):
     description = ".gitignore found outside the root"
 
 
+class MojomJSFile(Rule):
+    name = "MOJOM-JS"
+    description = "Don't check *.mojom.js files into WPT"
+    to_fix = """
+        Check if the file is already included in mojojs.zip:
+        https://source.chromium.org/chromium/chromium/src/+/master:chrome/tools/build/linux/FILES.cfg
+        If yes, use `loadMojoResources` from `resources/test-only-api.js` to load
+        it; if not, contact ecosystem-infra@chromium.org for adding new files
+        to mojojs.zip.
+    """
+
+
 class AhemCopy(Rule):
     name = "AHEM COPY"
     description = "Don't add extra copies of Ahem, use /fonts/Ahem.ttf"
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
index 7368216cd3d..9fefb7a1d7e 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
@@ -7,6 +7,7 @@ from ..lint import check_path
 from .base import check_errors
 import pytest
 
+
 def test_allowed_path_length():
     basename = 29 * "test/"
 
@@ -29,6 +30,7 @@ def test_forbidden_path_length():
         check_errors(errors)
         assert errors == [("PATH LENGTH", message, filename, None)]
 
+
 @pytest.mark.parametrize("path_ending,generated", [(".worker.html", ".worker.js"),
                                                    (".any.worker.html", ".any.js"),
                                                    (".any.html", ".any.js")])
@@ -70,6 +72,7 @@ def test_ahem_copy(path):
 
     assert errors == [expected_error]
 
+
 @pytest.mark.parametrize("path", ["ahem.woff",
                                   "ahem.ttff",
                                   "support/ahem.woff",
@@ -79,6 +82,16 @@ def test_ahem_copy_negative(path):
 
     assert errors == []
 
+
+def test_mojom_js_file():
+    path = "resources/fake_device.mojom.js"
+    errors = check_path("/foo/", path)
+    assert errors == [("MOJOM-JS",
+                       "Don't check *.mojom.js files into WPT",
+                       path,
+                       None)]
+
+
 @pytest.mark.parametrize("path", ["css/foo.tentative/bar.html",
                                   "css/.tentative/bar.html",
                                   "css/tentative.bar/baz.html",
@@ -94,6 +107,7 @@ def test_tentative_directories(path):
 
     assert errors == [expected_error]
 
+
 @pytest.mark.parametrize("path", ["css/bar.html",
                                   "css/tentative/baz.html"])
 def test_tentative_directories_negative(path):
@@ -102,6 +116,7 @@ def test_tentative_directories_negative(path):
 
     assert errors == []
 
+
 @pytest.mark.parametrize("path", ["elsewhere/.gitignore",
                                   "else/where/.gitignore"
                                   "elsewhere/tools/.gitignore",
@@ -120,6 +135,7 @@ def test_gitignore_file(path):
 
     assert errors == [expected_error]
 
+
 @pytest.mark.parametrize("path", [".gitignore",
                                   "elsewhere/.gitignores",
                                   "elsewhere/name.gitignore",
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index 05223d374fe..1ba9f06aabc 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -56,6 +56,24 @@ def do_delayed_imports():
         from marionette_driver import marionette, errors
 
 
+def _switch_to_window(marionette, handle):
+    """Switch to the specified window; subsequent commands will be
+    directed at the new window.
+
+    This is a workaround for issue 24924[0]; marionettedriver 3.1.0 dropped the
+    'name' parameter from its switch_to_window command, but it is still needed
+    for at least Firefox 79.
+
+    [0]: https://github.com/web-platform-tests/wpt/issues/24924
+
+    :param marionette: The Marionette instance
+    :param handle: The id of the window to switch to.
+    """
+    marionette._send_message("WebDriver:SwitchToWindow",
+                             {"handle": handle, "name": handle, "focus": True})
+    marionette.window = handle
+
+
 class MarionetteBaseProtocolPart(BaseProtocolPart):
     def __init__(self, parent):
         super(MarionetteBaseProtocolPart, self).__init__(parent)
@@ -83,7 +101,7 @@ class MarionetteBaseProtocolPart(BaseProtocolPart):
         return self.marionette.current_window_handle
 
     def set_window(self, handle):
-        self.marionette.switch_to_window(handle)
+        _switch_to_window(self.marionette, handle)
 
     def load(self, url):
         self.marionette.navigate(url)
@@ -171,13 +189,13 @@ class MarionetteTestharnessProtocolPart(TestharnessProtocolPart):
         for handle in handles:
             try:
                 self.logger.info("Closing window %s" % handle)
-                self.marionette.switch_to_window(handle)
+                _switch_to_window(self.marionette, handle)
                 self.dismiss_alert(lambda: self.marionette.close())
             except errors.NoSuchWindowException:
                 # We might have raced with the previous test to close this
                 # window, skip it.
                 pass
-        self.marionette.switch_to_window(runner_handle)
+        _switch_to_window(self.marionette, runner_handle)
         return runner_handle
 
     def close_old_windows(self, url_protocol):
@@ -489,7 +507,7 @@ class MarionetteCoverageProtocolPart(CoverageProtocolPart):
     def dump(self):
         if len(self.marionette.window_handles):
             handle = self.marionette.window_handles[0]
-            self.marionette.switch_to_window(handle)
+            _switch_to_window(self.marionette, handle)
 
         script = """
             var callback = arguments[arguments.length - 1];
@@ -585,7 +603,7 @@ class MarionettePrintProtocolPart(PrintProtocolPart):
 
     def pdf_to_png(self, pdf_base64, page_ranges):
         handle = self.marionette.current_window_handle
-        self.marionette.switch_to_window(self.runner_handle)
+        _switch_to_window(self.marionette, self.runner_handle)
         try:
             rv = self.marionette.execute_async_script("""
 let callback = arguments[arguments.length - 1];
@@ -594,7 +612,7 @@ render('%s').then(result => callback(result))""" % pdf_base64, new_sandbox=False
             rv = [item for i, item in enumerate(rv) if i + 1 in page_numbers]
             return rv
         finally:
-            self.marionette.switch_to_window(handle)
+            _switch_to_window(self.marionette, handle)
 
 class MarionetteProtocol(Protocol):
     implements = [MarionetteBaseProtocolPart,
@@ -883,7 +901,7 @@ class MarionetteRefTestExecutor(RefTestExecutor):
             if self.protocol.marionette and self.protocol.marionette.session_id:
                 handles = self.protocol.marionette.window_handles
                 if handles:
-                    self.protocol.marionette.switch_to_window(handles[0])
+                    _switch_to_window(self.protocol.marionette, handles[0])
             super(MarionetteRefTestExecutor, self).teardown()
         except Exception:
             # Ignore errors during teardown
@@ -903,8 +921,8 @@ class MarionetteRefTestExecutor(RefTestExecutor):
         if not isinstance(self.implementation, InternalRefTestImplementation):
             if self.close_after_done and self.has_window:
                 self.protocol.marionette.close()
-                self.protocol.marionette.switch_to_window(
-                    self.protocol.marionette.window_handles[-1])
+                _switch_to_window(self.protocol.marionette,
+                                 self.protocol.marionette.window_handles[-1])
                 self.has_window = False
 
             if not self.has_window:
@@ -1012,7 +1030,7 @@ class InternalRefTestImplementation(RefTestImplementation):
                 # focus
                 handles = self.executor.protocol.marionette.window_handles
                 if handles:
-                    self.executor.protocol.marionette.switch_to_window(handles[0])
+                    _switch_to_window(self.executor.protocol.marionette, handles[0])
         except Exception:
             # Ignore errors during teardown
             self.logger.warning(traceback.format_exc())
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-track-reader.html b/tests/wpt/web-platform-tests/webcodecs/video-track-reader.html
new file mode 100644
index 00000000000..087e0bb935b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/video-track-reader.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html>
+<title>Test the VideoTrackReader API.</title>
+<body></body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/media.js"></script>
+<script>
+
+var testVideo = {
+  url: getVideoURI('/media/movie_5'),
+  height: 240,
+  width: 320,
+}
+
+async function getMediaStream() {
+  let video = document.createElement('video');
+  document.body.appendChild(video);
+  video.src = testVideo.url;
+  await video.play();
+
+  return video.captureStream();
+}
+
+async_test(async function(t) {
+  let stream = await getMediaStream();
+  let vtr = new VideoTrackReader(stream.getVideoTracks()[0]);
+
+  t.done();
+}, 'Test we can construct a VideoTrackReader.');
+
+async_test(async function(t) {
+  let stream = await getMediaStream();
+  let vtr = new VideoTrackReader(stream.getVideoTracks()[0]);
+
+  let numberFrames = 0;
+
+  vtr.start(t.step_func((frame) => {
+    assert_equals(frame.codedWidth, testVideo.width);
+    assert_equals(frame.codedHeight, testVideo.height);
+    assert_not_equals(frame.timestamp, null);
+    frame.destroy();
+
+    if (++numberFrames == 5){
+      vtr.stop();
+      t.done();
+    }
+  }));
+
+}, 'Test we can start and stop a VideoTrackReader.');
+
+async_test(async function(t) {
+  let stream = await getMediaStream();
+  let vtr = new VideoTrackReader(stream.getVideoTracks()[0]);
+
+  let stoppedOnce = false;
+
+  vtr.start(t.step_func(() => {
+    if(!stoppedOnce) {
+      vtr.stop();
+      vtr.start(t.step_func_done());
+      stoppedOnce = true;
+    } else {
+      assert_unreached("A stopped callback should never be called again");
+    }
+  }));
+
+}, 'Test we can restart a stopped VideoTrackReader.');
+
+async_test(async function(t) {
+  let stream = await getMediaStream();
+  let track = stream.getVideoTracks()[0];
+
+  let vtr_a = new VideoTrackReader(track);
+  let vtr_b = new VideoTrackReader(track);
+
+  let receivedFrame_a = false;
+  let receivedFrame_b = false;
+
+  vtr_a.start(t.step_func(() => {
+    receivedFrame_a = true;
+
+    if (receivedFrame_a && receivedFrame_b)
+      t.done();
+  }));
+
+  vtr_b.start(t.step_func(() => {
+    receivedFrame_b = true;
+
+    if (receivedFrame_a && receivedFrame_b)
+      t.done();
+  }));
+
+}, 'Test we can create multiple VideoTrackReaders from the same track.');
+
+async_test(async function(t) {
+  let stream = await getMediaStream();
+  let audioTrack = stream.getAudioTracks()[0];
+
+  assert_throws_js(TypeError, () => {
+    let vtr = new VideoTrackReader(audioTrack);
+  })
+
+  t.done();
+}, 'Test creating a VideoTrackReaders from an audio track throws.');
+
+async_test(async function(t) {
+  let stream = await getMediaStream();
+  let vtr = new VideoTrackReader(stream.getVideoTracks()[0]);
+
+  assert_throws_dom("InvalidStateError", () => {
+    vtr.stop();
+  })
+
+  t.done();
+}, 'Test stopping a stopped VideoTrackReader throws.');
+
+async_test(async function(t) {
+  let stream = await getMediaStream();
+  let vtr = new VideoTrackReader(stream.getVideoTracks()[0]);
+
+  vtr.start(() => {});
+
+  assert_throws_dom("InvalidStateError", () => {
+    vtr.start(() => {});
+  })
+
+  t.done();
+}, 'Test starting a started VideoTrackReader throws.');
+
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
index a752203587b..d021eee7c94 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
@@ -169,6 +169,5 @@ def test_drag_and_drop_with_draggable_element(session,
     drag_events_captured = [ev["type"] for ev in e if ev["type"].startswith("drag") or ev["type"].startswith("drop")]
     assert "dragend" in drag_events_captured
     assert "dragenter" in drag_events_captured
-    assert "dragexit" in drag_events_captured
     assert "dragleave" in drag_events_captured
-    assert "drop" in drag_events_captured
\ No newline at end of file
+    assert "drop" in drag_events_captured
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/test_actions_wdspec.html b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/test_actions_wdspec.html
index 39a8876e54a..0253add9607 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/test_actions_wdspec.html
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/test_actions_wdspec.html
@@ -178,7 +178,6 @@
           draggable.addEventListener("dragend", recordPointerEvent);
           draggable.addEventListener("dragleave", recordPointerEvent);
           draggable.addEventListener("dragover", recordPointerEvent);
-          draggable.addEventListener("dragexit", recordPointerEvent);
 
           var droppable = document.getElementById("droppable");
           droppable.addEventListener("drop", recordPointerEvent);
diff --git a/tests/wpt/web-platform-tests/webgpu/META.yml b/tests/wpt/web-platform-tests/webgpu/META.yml
index befe8a68dd5..163130faea3 100644
--- a/tests/wpt/web-platform-tests/webgpu/META.yml
+++ b/tests/wpt/web-platform-tests/webgpu/META.yml
@@ -1,5 +1,4 @@
 spec: https://gpuweb.github.io/gpuweb/
 suggested_reviewers:
   - kainino0x
-  - JusSn
   - kvark
diff --git a/tests/wpt/web-platform-tests/webgpu/README.md b/tests/wpt/web-platform-tests/webgpu/README.md
index ef0dbfee60c..24a68b3ad3e 100644
--- a/tests/wpt/web-platform-tests/webgpu/README.md
+++ b/tests/wpt/web-platform-tests/webgpu/README.md
@@ -5,6 +5,13 @@ support and hardware support, so this API cannot run on most automated testing
 infrastructure. Tests inside this directory should always be skipped if
 appropriate GPU hardware is not available.
 
-The contents of this directory are automatically generated from TypeScript
+~~The contents of this directory are automatically generated from TypeScript
 sources which live upstream in the [WebGPU CTS](https://github.com/gpuweb/cts).
-They are periodically built and pushed to WPT.
+They are periodically built and pushed to WPT.~~
+
+**NOTE:** This directory is currently empty while WebGPU is in flux, as it's
+not practical for browser developers to sync their WebGPU implementations with
+WPT auto-import and auto-export of these tests. Instead, browsers should pin
+("vendor") a specific version of the gpuweb/cts repository, and check the built
+files into the browser repository as non-exported wpt tests (like Chromium's
+`wpt_internal`).
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/file_loader.js b/tests/wpt/web-platform-tests/webgpu/common/framework/file_loader.js
deleted file mode 100644
index 0f25ca465d3..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/file_loader.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { parseQuery } from './query/parseQuery.js';
-import { loadTreeForQuery } from './tree.js'; // A listing file, e.g. either of:
-// - `src/webgpu/listing.ts` (which is dynamically computed, has a Promise<TestSuiteListing>)
-// - `out/webgpu/listing.js` (which is pre-baked, has a TestSuiteListing)
-
-// Base class for DefaultTestFileLoader and FakeTestFileLoader.
-export class TestFileLoader {
-  importSpecFile(suite, path) {
-    return this.import(`${suite}/${path.join('/')}.spec.js`);
-  }
-
-  async loadTree(query, subqueriesToExpand = []) {
-    return loadTreeForQuery(this, query, subqueriesToExpand.map(q => parseQuery(q)));
-  }
-
-  async loadCases(query) {
-    const tree = await this.loadTree(query);
-    return tree.iterateLeaves();
-  }
-
-}
-export class DefaultTestFileLoader extends TestFileLoader {
-  async listing(suite) {
-    return (await import(`../../${suite}/listing.js`)).listing;
-  }
-
-  import(path) {
-    return import(`../../${path}`);
-  }
-
-}
-//# sourceMappingURL=file_loader.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/fixture.js b/tests/wpt/web-platform-tests/webgpu/common/framework/fixture.js
deleted file mode 100644
index ef23f06596b..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/fixture.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { assert } from './util/util.js';
-export class SkipTestCase extends Error {} // A Fixture is a class used to instantiate each test case at run time.
-// A new instance of the Fixture is created for every single test case
-// (i.e. every time the test function is run).
-
-export class Fixture {
-  constructor(rec, params) {
-    _defineProperty(this, "params", void 0);
-
-    _defineProperty(this, "rec", void 0);
-
-    _defineProperty(this, "eventualExpectations", []);
-
-    _defineProperty(this, "numOutstandingAsyncExpectations", 0);
-
-    this.rec = rec;
-    this.params = params;
-  } // This has to be a member function instead of an async `createFixture` function, because
-  // we need to be able to ergonomically override it in subclasses.
-
-
-  async init() {}
-
-  debug(msg) {
-    this.rec.debug(new Error(msg));
-  }
-
-  skip(msg) {
-    throw new SkipTestCase(msg);
-  }
-
-  async finalize() {
-    assert(this.numOutstandingAsyncExpectations === 0, 'there were outstanding asynchronous expectations (e.g. shouldReject) at the end of the test');
-    await Promise.all(this.eventualExpectations);
-  }
-
-  warn(msg) {
-    this.rec.warn(new Error(msg));
-  }
-
-  fail(msg) {
-    this.rec.expectationFailed(new Error(msg));
-  }
-
-  async immediateAsyncExpectation(fn) {
-    this.numOutstandingAsyncExpectations++;
-    const ret = await fn();
-    this.numOutstandingAsyncExpectations--;
-    return ret;
-  }
-
-  eventualAsyncExpectation(fn) {
-    const promise = fn(new Error());
-    this.eventualExpectations.push(promise);
-    return promise;
-  }
-
-  expectErrorValue(expectedName, ex, niceStack) {
-    if (!(ex instanceof Error)) {
-      niceStack.message = `THREW non-error value, of type ${typeof ex}: ${ex}`;
-      this.rec.expectationFailed(niceStack);
-      return;
-    }
-
-    const actualName = ex.name;
-
-    if (actualName !== expectedName) {
-      niceStack.message = `THREW ${actualName}, instead of ${expectedName}: ${ex}`;
-      this.rec.expectationFailed(niceStack);
-    } else {
-      niceStack.message = `OK: threw ${actualName}${ex.message}`;
-      this.rec.debug(niceStack);
-    }
-  }
-
-  shouldReject(expectedName, p, msg) {
-    this.eventualAsyncExpectation(async niceStack => {
-      const m = msg ? ': ' + msg : '';
-
-      try {
-        await p;
-        niceStack.message = 'DID NOT REJECT' + m;
-        this.rec.expectationFailed(niceStack);
-      } catch (ex) {
-        niceStack.message = m;
-        this.expectErrorValue(expectedName, ex, niceStack);
-      }
-    });
-  }
-
-  shouldThrow(expectedName, fn, msg) {
-    const m = msg ? ': ' + msg : '';
-
-    try {
-      fn();
-      this.rec.expectationFailed(new Error('DID NOT THROW' + m));
-    } catch (ex) {
-      this.expectErrorValue(expectedName, ex, new Error(m));
-    }
-  }
-
-  expect(cond, msg) {
-    if (cond) {
-      const m = msg ? ': ' + msg : '';
-      this.rec.debug(new Error('expect OK' + m));
-    } else {
-      this.rec.expectationFailed(new Error(msg));
-    }
-
-    return cond;
-  }
-
-}
-//# sourceMappingURL=fixture.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/gpu/device_pool.js b/tests/wpt/web-platform-tests/webgpu/common/framework/gpu/device_pool.js
deleted file mode 100644
index 848e5802817..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/gpu/device_pool.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { assert, raceWithRejectOnTimeout, unreachable, assertReject } from '../util/util.js';
-import { getGPU } from './implementation.js';
-
-class TestFailedButDeviceReusable extends Error {}
-
-export class TestOOMedShouldAttemptGC extends Error {}
-const kPopErrorScopeTimeoutMS = 5000;
-export class DevicePool {
-  constructor() {
-    _defineProperty(this, "failed", false);
-
-    _defineProperty(this, "holder", undefined);
-  }
-
-  // undefined if "uninitialized" (not yet initialized, or lost)
-  async acquire() {
-    assert(!this.failed, 'WebGPU device previously failed to initialize; not retrying');
-
-    if (this.holder === undefined) {
-      try {
-        this.holder = await DevicePool.makeHolder();
-      } catch (ex) {
-        this.failed = true;
-        throw ex;
-      }
-    }
-
-    assert(!this.holder.acquired, 'Device was in use on DevicePool.acquire');
-    this.holder.acquired = true;
-    this.beginErrorScopes();
-    return this.holder.device;
-  } // When a test is done using a device, it's released back into the pool.
-  // This waits for error scopes, checks their results, and checks for various error conditions.
-
-
-  async release(device) {
-    const holder = this.holder;
-    assert(holder !== undefined, 'trying to release a device while pool is uninitialized');
-    assert(holder.acquired, 'trying to release a device while already released');
-    assert(device === holder.device, 'Released device was the wrong device');
-
-    try {
-      // Time out if popErrorScope never completes. This could happen due to a browser bug - e.g.,
-      // as of this writing, on Chrome GPU process crash, popErrorScope just hangs.
-      await raceWithRejectOnTimeout(this.endErrorScopes(), kPopErrorScopeTimeoutMS, 'finalization popErrorScope timed out'); // (Hopefully if the device was lost, it has been reported by the time endErrorScopes()
-      // has finished (or timed out). If not, it could cause a finite number of extra test
-      // failures following this one (but should recover eventually).)
-
-      const lostReason = holder.lostReason;
-
-      if (lostReason !== undefined) {
-        // Fail the current test.
-        unreachable(`Device was lost: ${lostReason}`);
-      }
-    } catch (ex) {
-      // Any error that isn't explicitly TestFailedButDeviceReusable forces a new device to be
-      // created for the next test.
-      if (!(ex instanceof TestFailedButDeviceReusable)) {
-        this.holder = undefined;
-      }
-
-      throw ex;
-    } finally {
-      // TODO: device.destroy()
-      // Mark the holder as free. (This only has an effect if the pool still has the holder.)
-      // This could be done at the top but is done here to guard against async-races during release.
-      holder.acquired = false;
-    }
-  } // Gets a device and creates a DeviceHolder.
-  // If the device is lost, DeviceHolder.lostReason gets set.
-
-
-  static async makeHolder() {
-    const gpu = getGPU();
-    const adapter = await gpu.requestAdapter();
-    const holder = {
-      acquired: false,
-      device: await adapter.requestDevice(),
-      lostReason: undefined
-    };
-    holder.device.lost.then(ev => {
-      holder.lostReason = ev.message;
-    });
-    return holder;
-  } // Create error scopes that wrap the entire test.
-
-
-  beginErrorScopes() {
-    assert(this.holder !== undefined);
-    this.holder.device.pushErrorScope('out-of-memory');
-    this.holder.device.pushErrorScope('validation');
-  } // End the whole-test error scopes. Check that there are no extra error scopes, and that no
-  // otherwise-uncaptured errors occurred during the test.
-
-
-  async endErrorScopes() {
-    assert(this.holder !== undefined);
-    let gpuValidationError;
-    let gpuOutOfMemoryError;
-
-    try {
-      // May reject if the device was lost.
-      gpuValidationError = await this.holder.device.popErrorScope();
-      gpuOutOfMemoryError = await this.holder.device.popErrorScope();
-    } catch (ex) {
-      assert(this.holder.lostReason !== undefined, "popErrorScope failed, but device.lost hasn't fired (yet)");
-      throw ex;
-    }
-
-    await assertReject(this.holder.device.popErrorScope(), 'There was an extra error scope on the stack after a test');
-
-    if (gpuValidationError !== null) {
-      assert(gpuValidationError instanceof GPUValidationError); // Allow the device to be reused.
-
-      throw new TestFailedButDeviceReusable(`Unexpected validation error occurred: ${gpuValidationError.message}`);
-    }
-
-    if (gpuOutOfMemoryError !== null) {
-      assert(gpuOutOfMemoryError instanceof GPUOutOfMemoryError); // Don't allow the device to be reused; unexpected OOM could break the device.
-
-      throw new TestOOMedShouldAttemptGC('Unexpected out-of-memory error occurred');
-    }
-  }
-
-}
-//# sourceMappingURL=device_pool.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/gpu/implementation.js b/tests/wpt/web-platform-tests/webgpu/common/framework/gpu/implementation.js
deleted file mode 100644
index 670872b5d6e..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/gpu/implementation.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-/// <reference types="@webgpu/types" />
-import { assert } from '../util/util.js';
-let impl = undefined;
-export function getGPU() {
-  if (impl) {
-    return impl;
-  }
-
-  assert(typeof navigator !== 'undefined' && navigator.gpu !== undefined, 'No WebGPU implementation found');
-  impl = navigator.gpu;
-  return impl;
-}
-//# sourceMappingURL=implementation.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/logging/log_message.js b/tests/wpt/web-platform-tests/webgpu/common/framework/logging/log_message.js
deleted file mode 100644
index 11f352f892e..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/logging/log_message.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { extractImportantStackTrace } from '../util/stack.js';
-export class LogMessageWithStack extends Error {
-  constructor(name, ex) {
-    super(ex.message);
-
-    _defineProperty(this, "stackHidden", false);
-
-    _defineProperty(this, "timesSeen", 1);
-
-    this.name = name;
-    this.stack = ex.stack;
-  }
-  /** Set a flag so the stack is not printed in toJSON(). */
-
-
-  setStackHidden() {
-    this.stackHidden = true;
-  }
-  /** Increment the "seen x times" counter. */
-
-
-  incrementTimesSeen() {
-    this.timesSeen++;
-  }
-
-  toJSON() {
-    let m = this.name + ': ';
-
-    if (!this.stackHidden && this.stack) {
-      // this.message is already included in this.stack
-      m += extractImportantStackTrace(this);
-    } else {
-      m += this.message;
-    }
-
-    if (this.timesSeen > 1) {
-      m += `\n(seen ${this.timesSeen} times with identical stack)`;
-    }
-
-    return m;
-  }
-
-}
-//# sourceMappingURL=log_message.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/logging/logger.js b/tests/wpt/web-platform-tests/webgpu/common/framework/logging/logger.js
deleted file mode 100644
index 8d66c554c5a..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/logging/logger.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { version } from '../version.js';
-import { TestCaseRecorder } from './test_case_recorder.js';
-export class Logger {
-  constructor(debug) {
-    _defineProperty(this, "debug", void 0);
-
-    _defineProperty(this, "results", new Map());
-
-    this.debug = debug;
-  }
-
-  record(name) {
-    const result = {
-      status: 'running',
-      timems: -1
-    };
-    this.results.set(name, result);
-    return [new TestCaseRecorder(result, this.debug), result];
-  }
-
-  asJSON(space) {
-    return JSON.stringify({
-      version,
-      results: Array.from(this.results)
-    }, undefined, space);
-  }
-
-}
-//# sourceMappingURL=logger.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/logging/result.js b/tests/wpt/web-platform-tests/webgpu/common/framework/logging/result.js
deleted file mode 100644
index 813e781ba28..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/logging/result.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-//# sourceMappingURL=result.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/logging/test_case_recorder.js b/tests/wpt/web-platform-tests/webgpu/common/framework/logging/test_case_recorder.js
deleted file mode 100644
index d16af0f2b86..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/logging/test_case_recorder.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { SkipTestCase } from '../fixture.js';
-import { now, assert } from '../util/util.js';
-import { LogMessageWithStack } from './log_message.js';
-var LogSeverity;
-
-(function (LogSeverity) {
-  LogSeverity[LogSeverity["Pass"] = 0] = "Pass";
-  LogSeverity[LogSeverity["Skip"] = 1] = "Skip";
-  LogSeverity[LogSeverity["Warn"] = 2] = "Warn";
-  LogSeverity[LogSeverity["ExpectFailed"] = 3] = "ExpectFailed";
-  LogSeverity[LogSeverity["ValidationFailed"] = 4] = "ValidationFailed";
-  LogSeverity[LogSeverity["ThrewException"] = 5] = "ThrewException";
-})(LogSeverity || (LogSeverity = {}));
-
-const kMaxLogStacks = 2;
-/** Holds onto a LiveTestCaseResult owned by the Logger, and writes the results into it. */
-
-export class TestCaseRecorder {
-  /** Used to dedup log messages which have identical stacks. */
-  constructor(result, debugging) {
-    _defineProperty(this, "result", void 0);
-
-    _defineProperty(this, "maxLogSeverity", LogSeverity.Pass);
-
-    _defineProperty(this, "startTime", -1);
-
-    _defineProperty(this, "logs", []);
-
-    _defineProperty(this, "logLinesAtCurrentSeverity", 0);
-
-    _defineProperty(this, "debugging", false);
-
-    _defineProperty(this, "messagesForPreviouslySeenStacks", new Map());
-
-    this.result = result;
-    this.debugging = debugging;
-  }
-
-  start() {
-    assert(this.startTime < 0, 'TestCaseRecorder cannot be reused');
-    this.startTime = now();
-  }
-
-  finish() {
-    assert(this.startTime >= 0, 'finish() before start()');
-    const timeMilliseconds = now() - this.startTime; // Round to next microsecond to avoid storing useless .xxxx00000000000002 in results.
-
-    this.result.timems = Math.ceil(timeMilliseconds * 1000) / 1000; // Convert numeric enum back to string (but expose 'exception' as 'fail')
-
-    this.result.status = this.maxLogSeverity === LogSeverity.Pass ? 'pass' : this.maxLogSeverity === LogSeverity.Skip ? 'skip' : this.maxLogSeverity === LogSeverity.Warn ? 'warn' : 'fail'; // Everything else is an error
-
-    this.result.logs = this.logs;
-  }
-
-  injectResult(injectedResult) {
-    Object.assign(this.result, injectedResult);
-  }
-
-  debug(ex) {
-    if (!this.debugging) {
-      return;
-    }
-
-    const logMessage = new LogMessageWithStack('DEBUG', ex);
-    logMessage.setStackHidden();
-    this.logImpl(LogSeverity.Pass, logMessage);
-  }
-
-  skipped(ex) {
-    this.logImpl(LogSeverity.Skip, new LogMessageWithStack('SKIP', ex));
-  }
-
-  warn(ex) {
-    this.logImpl(LogSeverity.Warn, new LogMessageWithStack('WARN', ex));
-  }
-
-  expectationFailed(ex) {
-    this.logImpl(LogSeverity.ExpectFailed, new LogMessageWithStack('EXPECTATION FAILED', ex));
-  }
-
-  validationFailed(ex) {
-    this.logImpl(LogSeverity.ValidationFailed, new LogMessageWithStack('VALIDATION FAILED', ex));
-  }
-
-  threw(ex) {
-    if (ex instanceof SkipTestCase) {
-      this.skipped(ex);
-      return;
-    }
-
-    this.logImpl(LogSeverity.ThrewException, new LogMessageWithStack('EXCEPTION', ex));
-  }
-
-  logImpl(level, logMessage) {
-    // Deduplicate errors with the exact same stack
-    if (logMessage.stack) {
-      const seen = this.messagesForPreviouslySeenStacks.get(logMessage.stack);
-
-      if (seen) {
-        seen.incrementTimesSeen();
-        return;
-      }
-
-      this.messagesForPreviouslySeenStacks.set(logMessage.stack, logMessage);
-    } // Mark printStack=false for all logs except 2 at the highest severity
-
-
-    if (level > this.maxLogSeverity) {
-      this.logLinesAtCurrentSeverity = 0;
-      this.maxLogSeverity = level;
-
-      if (!this.debugging) {
-        // Go back and turn off printStack for everything of a lower log level
-        for (const log of this.logs) {
-          log.setStackHidden();
-        }
-      }
-    }
-
-    if (level < this.maxLogSeverity || this.logLinesAtCurrentSeverity >= kMaxLogStacks) {
-      if (!this.debugging) {
-        logMessage.setStackHidden();
-      }
-    }
-
-    this.logs.push(logMessage);
-    this.logLinesAtCurrentSeverity++;
-  }
-
-}
-//# sourceMappingURL=test_case_recorder.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/params_builder.js b/tests/wpt/web-platform-tests/webgpu/common/framework/params_builder.js
deleted file mode 100644
index 10dd239df93..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/params_builder.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-let _Symbol$iterator;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { publicParamsEquals } from './params_utils.js';
-import { assert } from './util/util.js'; // https://stackoverflow.com/a/56375136
-
-export function poptions(name, values) {
-  const iter = makeReusableIterable(function* () {
-    for (const value of values) {
-      yield {
-        [name]: value
-      };
-    }
-  });
-  return iter;
-}
-export function pbool(name) {
-  return poptions(name, [false, true]);
-}
-export function params() {
-  return new ParamsBuilder();
-}
-_Symbol$iterator = Symbol.iterator;
-export class ParamsBuilder {
-  constructor() {
-    _defineProperty(this, "paramSpecs", [{}]);
-  }
-
-  [_Symbol$iterator]() {
-    const iter = this.paramSpecs[Symbol.iterator]();
-    return iter;
-  }
-
-  combine(newParams) {
-    const paramSpecs = this.paramSpecs;
-    this.paramSpecs = makeReusableIterable(function* () {
-      for (const a of paramSpecs) {
-        for (const b of newParams) {
-          yield mergeParams(a, b);
-        }
-      }
-    });
-    return this;
-  }
-
-  expand(expander) {
-    const paramSpecs = this.paramSpecs;
-    this.paramSpecs = makeReusableIterable(function* () {
-      for (const a of paramSpecs) {
-        for (const b of expander(a)) {
-          yield mergeParams(a, b);
-        }
-      }
-    });
-    return this;
-  }
-
-  filter(pred) {
-    const paramSpecs = this.paramSpecs;
-    this.paramSpecs = makeReusableIterable(function* () {
-      for (const p of paramSpecs) {
-        if (pred(p)) {
-          yield p;
-        }
-      }
-    });
-    return this;
-  }
-
-  unless(pred) {
-    return this.filter(x => !pred(x));
-  }
-
-  exclude(exclude) {
-    const excludeArray = Array.from(exclude);
-    const paramSpecs = this.paramSpecs;
-    this.paramSpecs = makeReusableIterable(function* () {
-      for (const p of paramSpecs) {
-        if (excludeArray.every(e => !publicParamsEquals(p, e))) {
-          yield p;
-        }
-      }
-    });
-    return this;
-  }
-
-} // If you create an Iterable by calling a generator function (e.g. in IIFE), it is exhausted after
-// one use. This just wraps a generator function in an object so it be iterated multiple times.
-
-function makeReusableIterable(generatorFn) {
-  return {
-    [Symbol.iterator]: generatorFn
-  };
-}
-
-// (keyof A & keyof B) is not empty, so they overlapped
-function mergeParams(a, b) {
-  for (const key of Object.keys(a)) {
-    assert(!(key in b), 'Duplicate key: ' + key);
-  }
-
-  return { ...a,
-    ...b
-  };
-}
-//# sourceMappingURL=params_builder.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/params_utils.js b/tests/wpt/web-platform-tests/webgpu/common/framework/params_utils.js
deleted file mode 100644
index 161feb5d430..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/params_utils.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { comparePublicParamsPaths, Ordering } from './query/compare.js';
-import { kWildcard, kParamSeparator, kParamKVSeparator } from './query/separators.js'; // Consider adding more types here if needed
-
-export function paramKeyIsPublic(key) {
-  return !key.startsWith('_');
-}
-export function extractPublicParams(params) {
-  const publicParams = {};
-
-  for (const k of Object.keys(params)) {
-    if (paramKeyIsPublic(k)) {
-      publicParams[k] = params[k];
-    }
-  }
-
-  return publicParams;
-}
-export const badParamValueChars = new RegExp('[' + kParamKVSeparator + kParamSeparator + kWildcard + ']');
-export function publicParamsEquals(x, y) {
-  return comparePublicParamsPaths(x, y) === Ordering.Equal;
-}
-//# sourceMappingURL=params_utils.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/query/compare.js b/tests/wpt/web-platform-tests/webgpu/common/framework/query/compare.js
deleted file mode 100644
index 52396f352e6..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/query/compare.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { paramKeyIsPublic } from '../params_utils.js';
-import { assert, objectEquals } from '../util/util.js';
-export let Ordering;
-/**
- * Compares two queries for their ordering (which is used to build the tree).
- *
- * See src/unittests/query_compare.spec.ts for examples.
- */
-
-(function (Ordering) {
-  Ordering[Ordering["Unordered"] = 0] = "Unordered";
-  Ordering[Ordering["StrictSuperset"] = 1] = "StrictSuperset";
-  Ordering[Ordering["Equal"] = 2] = "Equal";
-  Ordering[Ordering["StrictSubset"] = 3] = "StrictSubset";
-})(Ordering || (Ordering = {}));
-
-export function compareQueries(a, b) {
-  if (a.suite !== b.suite) {
-    return Ordering.Unordered;
-  }
-
-  const filePathOrdering = comparePaths(a.filePathParts, b.filePathParts);
-
-  if (filePathOrdering !== Ordering.Equal || a.isMultiFile || b.isMultiFile) {
-    return compareOneLevel(filePathOrdering, a.isMultiFile, b.isMultiFile);
-  }
-
-  assert('testPathParts' in a && 'testPathParts' in b);
-  const testPathOrdering = comparePaths(a.testPathParts, b.testPathParts);
-
-  if (testPathOrdering !== Ordering.Equal || a.isMultiTest || b.isMultiTest) {
-    return compareOneLevel(testPathOrdering, a.isMultiTest, b.isMultiTest);
-  }
-
-  assert('params' in a && 'params' in b);
-  const paramsPathOrdering = comparePublicParamsPaths(a.params, b.params);
-
-  if (paramsPathOrdering !== Ordering.Equal || a.isMultiCase || b.isMultiCase) {
-    return compareOneLevel(paramsPathOrdering, a.isMultiCase, b.isMultiCase);
-  }
-
-  return Ordering.Equal;
-}
-/**
- * Compares a single level of a query.
- *
- * "IsBig" means the query is big relative to the level, e.g. for test-level:
- *   - Anything >= `suite:a,*` is big
- *   - Anything <= `suite:a:*` is small
- */
-
-function compareOneLevel(ordering, aIsBig, bIsBig) {
-  assert(ordering !== Ordering.Equal || aIsBig || bIsBig);
-  if (ordering === Ordering.Unordered) return Ordering.Unordered;
-  if (aIsBig && bIsBig) return ordering;
-  if (!aIsBig && !bIsBig) return Ordering.Unordered; // Equal case is already handled
-  // Exactly one of (a, b) is big.
-
-  if (aIsBig && ordering !== Ordering.StrictSubset) return Ordering.StrictSuperset;
-  if (bIsBig && ordering !== Ordering.StrictSuperset) return Ordering.StrictSubset;
-  return Ordering.Unordered;
-}
-
-function comparePaths(a, b) {
-  const shorter = Math.min(a.length, b.length);
-
-  for (let i = 0; i < shorter; ++i) {
-    if (a[i] !== b[i]) {
-      return Ordering.Unordered;
-    }
-  }
-
-  if (a.length === b.length) {
-    return Ordering.Equal;
-  } else if (a.length < b.length) {
-    return Ordering.StrictSuperset;
-  } else {
-    return Ordering.StrictSubset;
-  }
-}
-
-export function comparePublicParamsPaths(a, b) {
-  const aKeys = Object.keys(a).filter(k => paramKeyIsPublic(k));
-  const commonKeys = new Set(aKeys.filter(k => k in b));
-
-  for (const k of commonKeys) {
-    if (!objectEquals(a[k], b[k])) {
-      return Ordering.Unordered;
-    }
-  }
-
-  const bKeys = Object.keys(b).filter(k => paramKeyIsPublic(k));
-  const aRemainingKeys = aKeys.length - commonKeys.size;
-  const bRemainingKeys = bKeys.length - commonKeys.size;
-  if (aRemainingKeys === 0 && bRemainingKeys === 0) return Ordering.Equal;
-  if (aRemainingKeys === 0) return Ordering.StrictSuperset;
-  if (bRemainingKeys === 0) return Ordering.StrictSubset;
-  return Ordering.Unordered;
-}
-//# sourceMappingURL=compare.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/query/encode_selectively.js b/tests/wpt/web-platform-tests/webgpu/common/framework/query/encode_selectively.js
deleted file mode 100644
index e153cf8ccd8..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/query/encode_selectively.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-/**
- * Encodes a stringified TestQuery so that it can be placed in a `?q=` parameter in a URL.
- *
- * `encodeURIComponent` encodes in accordance with `application/x-www-form-urlencoded`,
- * but URLs don't actually have to be as strict as HTML form encoding
- * (we interpret this purely from JavaScript).
- * So we encode the component, then selectively convert some %-encoded escape codes
- * back to their original form for readability/copyability.
- */
-export function encodeURIComponentSelectively(s) {
-  let ret = encodeURIComponent(s);
-  ret = ret.replace(/%22/g, '"'); // for JSON strings
-
-  ret = ret.replace(/%2C/g, ','); // for path separator, and JSON arrays
-
-  ret = ret.replace(/%3A/g, ':'); // for big separator
-
-  ret = ret.replace(/%3B/g, ';'); // for param separator
-
-  ret = ret.replace(/%3D/g, '='); // for params (k=v)
-
-  ret = ret.replace(/%5B/g, '['); // for JSON arrays
-
-  ret = ret.replace(/%5D/g, ']'); // for JSON arrays
-
-  return ret;
-}
-//# sourceMappingURL=encode_selectively.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/query/parseQuery.js b/tests/wpt/web-platform-tests/webgpu/common/framework/query/parseQuery.js
deleted file mode 100644
index 758227cc520..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/query/parseQuery.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { badParamValueChars, paramKeyIsPublic } from '../params_utils.js';
-import { assert } from '../util/util.js';
-import { TestQueryMultiFile, TestQueryMultiTest, TestQueryMultiCase, TestQuerySingleCase } from './query.js';
-import { kBigSeparator, kWildcard, kPathSeparator, kParamSeparator } from './separators.js';
-import { validQueryPart } from './validQueryPart.js';
-export function parseQuery(s) {
-  try {
-    return parseQueryImpl(s);
-  } catch (ex) {
-    ex.message += '\n  on: ' + s;
-    throw ex;
-  }
-}
-
-function parseQueryImpl(s) {
-  // Undo encodeURIComponentSelectively
-  s = decodeURIComponent(s); // bigParts are: suite, group, test, params (note kBigSeparator could appear in params)
-
-  const [suite, fileString, testString, paramsString] = s.split(kBigSeparator, 4);
-  assert(fileString !== undefined, `filter string must have at least one ${kBigSeparator}`);
-  const {
-    parts: file,
-    wildcard: filePathHasWildcard
-  } = parseBigPart(fileString, kPathSeparator);
-
-  if (testString === undefined) {
-    // Query is file-level
-    assert(filePathHasWildcard, `File-level query without wildcard ${kWildcard}. Did you want a file-level query \
-(append ${kPathSeparator}${kWildcard}) or test-level query (append ${kBigSeparator}${kWildcard})?`);
-    return new TestQueryMultiFile(suite, file);
-  }
-
-  assert(!filePathHasWildcard, `Wildcard ${kWildcard} must be at the end of the query string`);
-  const {
-    parts: test,
-    wildcard: testPathHasWildcard
-  } = parseBigPart(testString, kPathSeparator);
-
-  if (paramsString === undefined) {
-    // Query is test-level
-    assert(testPathHasWildcard, `Test-level query without wildcard ${kWildcard}; did you want a test-level query \
-(append ${kPathSeparator}${kWildcard}) or case-level query (append ${kBigSeparator}${kWildcard})?`);
-    assert(file.length > 0, 'File part of test-level query was empty (::)');
-    return new TestQueryMultiTest(suite, file, test);
-  } // Query is case-level
-
-
-  assert(!testPathHasWildcard, `Wildcard ${kWildcard} must be at the end of the query string`);
-  const {
-    parts: paramsParts,
-    wildcard: paramsHasWildcard
-  } = parseBigPart(paramsString, kParamSeparator);
-  assert(test.length > 0, 'Test part of case-level query was empty (::)');
-  const params = {};
-
-  for (const paramPart of paramsParts) {
-    const [k, v] = parseSingleParam(paramPart);
-    assert(validQueryPart.test(k), 'param key names must match ' + validQueryPart);
-    params[k] = v;
-  }
-
-  if (paramsHasWildcard) {
-    return new TestQueryMultiCase(suite, file, test, params);
-  } else {
-    return new TestQuerySingleCase(suite, file, test, params);
-  }
-} // webgpu:a,b,* or webgpu:a,b,c:*
-
-
-const kExampleQueries = `\
-webgpu${kBigSeparator}a${kPathSeparator}b${kPathSeparator}${kWildcard} or \
-webgpu${kBigSeparator}a${kPathSeparator}b${kPathSeparator}c${kBigSeparator}${kWildcard}`;
-
-function parseBigPart(s, separator) {
-  if (s === '') {
-    return {
-      parts: [],
-      wildcard: false
-    };
-  }
-
-  const parts = s.split(separator);
-  let endsWithWildcard = false;
-
-  for (const [i, part] of parts.entries()) {
-    if (i === parts.length - 1) {
-      endsWithWildcard = part === kWildcard;
-    }
-
-    assert(part.indexOf(kWildcard) === -1 || endsWithWildcard, `Wildcard ${kWildcard} must be complete last part of a path (e.g. ${kExampleQueries})`);
-  }
-
-  if (endsWithWildcard) {
-    // Remove the last element of the array (which is just the wildcard).
-    parts.length = parts.length - 1;
-  }
-
-  return {
-    parts,
-    wildcard: endsWithWildcard
-  };
-}
-
-function parseSingleParam(paramSubstring) {
-  assert(paramSubstring !== '', 'Param in a query must not be blank (is there a trailing comma?)');
-  const i = paramSubstring.indexOf('=');
-  assert(i !== -1, 'Param in a query must be of form key=value');
-  const k = paramSubstring.substring(0, i);
-  assert(paramKeyIsPublic(k), 'Param in a query must not be private (start with _)');
-  const v = paramSubstring.substring(i + 1);
-  return [k, parseSingleParamValue(v)];
-}
-
-function parseSingleParamValue(s) {
-  assert(!badParamValueChars.test(s), `param value must not match ${badParamValueChars} - was ${s}`);
-  return s === 'undefined' ? undefined : JSON.parse(s);
-}
-//# sourceMappingURL=parseQuery.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/query/query.js b/tests/wpt/web-platform-tests/webgpu/common/framework/query/query.js
deleted file mode 100644
index 8b352241f8b..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/query/query.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { assert } from '../util/util.js';
-import { encodeURIComponentSelectively } from './encode_selectively.js';
-import { kBigSeparator, kPathSeparator, kWildcard, kParamSeparator } from './separators.js';
-import { stringifyPublicParams } from './stringify_params.js';
-/**
- * Represents a test query of some level.
- *
- * TestQuery types are immutable.
- */
-
-// SingleCase
-
-/**
- * A multi-file test query, like `s:*` or `s:a,b,*`.
- *
- * Immutable (makes copies of constructor args).
- */
-export class TestQueryMultiFile {
-  constructor(suite, file) {
-    _defineProperty(this, "level", 1);
-
-    _defineProperty(this, "isMultiFile", true);
-
-    _defineProperty(this, "suite", void 0);
-
-    _defineProperty(this, "filePathParts", void 0);
-
-    this.suite = suite;
-    this.filePathParts = [...file];
-  }
-
-  toString() {
-    return encodeURIComponentSelectively(this.toStringHelper().join(kBigSeparator));
-  }
-
-  toStringHelper() {
-    return [this.suite, [...this.filePathParts, kWildcard].join(kPathSeparator)];
-  }
-
-}
-/**
- * A multi-test test query, like `s:f:*` or `s:f:a,b,*`.
- *
- * Immutable (makes copies of constructor args).
- */
-
-export class TestQueryMultiTest extends TestQueryMultiFile {
-  constructor(suite, file, test) {
-    super(suite, file);
-
-    _defineProperty(this, "level", 2);
-
-    _defineProperty(this, "isMultiFile", false);
-
-    _defineProperty(this, "isMultiTest", true);
-
-    _defineProperty(this, "testPathParts", void 0);
-
-    assert(file.length > 0, 'multi-test (or finer) query must have file-path');
-    this.testPathParts = [...test];
-  }
-
-  toStringHelper() {
-    return [this.suite, this.filePathParts.join(kPathSeparator), [...this.testPathParts, kWildcard].join(kPathSeparator)];
-  }
-
-}
-/**
- * A multi-case test query, like `s:f:t:*` or `s:f:t:a,b,*`.
- *
- * Immutable (makes copies of constructor args), except for param values
- * (which aren't normally supposed to change; they're marked readonly in CaseParams).
- */
-
-export class TestQueryMultiCase extends TestQueryMultiTest {
-  constructor(suite, file, test, params) {
-    super(suite, file, test);
-
-    _defineProperty(this, "level", 3);
-
-    _defineProperty(this, "isMultiTest", false);
-
-    _defineProperty(this, "isMultiCase", true);
-
-    _defineProperty(this, "params", void 0);
-
-    assert(test.length > 0, 'multi-case (or finer) query must have test-path');
-    this.params = { ...params
-    };
-  }
-
-  toStringHelper() {
-    const paramsParts = stringifyPublicParams(this.params);
-    return [this.suite, this.filePathParts.join(kPathSeparator), this.testPathParts.join(kPathSeparator), [...paramsParts, kWildcard].join(kParamSeparator)];
-  }
-
-}
-/**
- * A multi-case test query, like `s:f:t:` or `s:f:t:a=1,b=1`.
- *
- * Immutable (makes copies of constructor args).
- */
-
-export class TestQuerySingleCase extends TestQueryMultiCase {
-  constructor(...args) {
-    super(...args);
-
-    _defineProperty(this, "level", 4);
-
-    _defineProperty(this, "isMultiCase", false);
-  }
-
-  toStringHelper() {
-    const paramsParts = stringifyPublicParams(this.params);
-    return [this.suite, this.filePathParts.join(kPathSeparator), this.testPathParts.join(kPathSeparator), paramsParts.join(kParamSeparator)];
-  }
-
-}
-//# sourceMappingURL=query.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/query/separators.js b/tests/wpt/web-platform-tests/webgpu/common/framework/query/separators.js
deleted file mode 100644
index e378a9d1d29..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/query/separators.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-/** Separator between big parts: suite:file:test:case */
-export const kBigSeparator = ':';
-/** Separator between path,to,file or path,to,test */
-
-export const kPathSeparator = ',';
-/** Separator between k=v;k=v */
-
-export const kParamSeparator = ';';
-/** Separator between key and value in k=v */
-
-export const kParamKVSeparator = '=';
-/** Final wildcard, if query is not single-case */
-
-export const kWildcard = '*';
-//# sourceMappingURL=separators.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/query/stringify_params.js b/tests/wpt/web-platform-tests/webgpu/common/framework/query/stringify_params.js
deleted file mode 100644
index b5503ffb54e..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/query/stringify_params.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { badParamValueChars, paramKeyIsPublic } from '../params_utils.js';
-import { assert } from '../util/util.js';
-import { kParamKVSeparator } from './separators.js';
-export function stringifyPublicParams(p) {
-  return Object.keys(p).filter(k => paramKeyIsPublic(k)).map(k => stringifySingleParam(k, p[k]));
-}
-export function stringifySingleParam(k, v) {
-  return `${k}${kParamKVSeparator}${stringifySingleParamValue(v)}`;
-}
-
-function stringifySingleParamValue(v) {
-  const s = v === undefined ? 'undefined' : JSON.stringify(v);
-  assert(!badParamValueChars.test(s), `JSON.stringified param value must not match ${badParamValueChars} - was ${s}`);
-  return s;
-}
-//# sourceMappingURL=stringify_params.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/query/validQueryPart.js b/tests/wpt/web-platform-tests/webgpu/common/framework/query/validQueryPart.js
deleted file mode 100644
index 3c051afc94b..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/query/validQueryPart.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-/** Applies to group parts, test parts, params keys. */
-export const validQueryPart = /^[a-zA-Z0-9_]+$/;
-//# sourceMappingURL=validQueryPart.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/test_group.js b/tests/wpt/web-platform-tests/webgpu/common/framework/test_group.js
deleted file mode 100644
index 5ced9cd3d37..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/test_group.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { extractPublicParams, publicParamsEquals } from './params_utils.js';
-import { kPathSeparator } from './query/separators.js';
-import { stringifyPublicParams } from './query/stringify_params.js';
-import { validQueryPart } from './query/validQueryPart.js';
-import { assert } from './util/util.js';
-export function makeTestGroup(fixture) {
-  return new TestGroup(fixture);
-} // Interface for running tests
-
-export function makeTestGroupForUnitTesting(fixture) {
-  return new TestGroup(fixture);
-}
-
-class TestGroup {
-  constructor(fixture) {
-    _defineProperty(this, "fixture", void 0);
-
-    _defineProperty(this, "seen", new Set());
-
-    _defineProperty(this, "tests", []);
-
-    this.fixture = fixture;
-  }
-
-  *iterate() {
-    for (const test of this.tests) {
-      yield* test.iterate();
-    }
-  }
-
-  checkName(name) {
-    assert( // Shouldn't happen due to the rule above. Just makes sure that treated
-    // unencoded strings as encoded strings is OK.
-    name === decodeURIComponent(name), `Not decodeURIComponent-idempotent: ${name} !== ${decodeURIComponent(name)}`);
-    assert(!this.seen.has(name), `Duplicate test name: ${name}`);
-    this.seen.add(name);
-  } // TODO: This could take a fixture, too, to override the one for the group.
-
-
-  test(name) {
-    this.checkName(name);
-    const parts = name.split(kPathSeparator);
-
-    for (const p of parts) {
-      assert(validQueryPart.test(p), `Invalid test name part ${p}; must match ${validQueryPart}`);
-    }
-
-    const test = new TestBuilder(parts, this.fixture);
-    this.tests.push(test);
-    return test;
-  }
-
-  checkCaseNamesAndDuplicates() {
-    for (const test of this.tests) {
-      test.checkCaseNamesAndDuplicates();
-    }
-  }
-
-}
-
-class TestBuilder {
-  constructor(testPath, fixture) {
-    _defineProperty(this, "testPath", void 0);
-
-    _defineProperty(this, "fixture", void 0);
-
-    _defineProperty(this, "testFn", void 0);
-
-    _defineProperty(this, "cases", undefined);
-
-    this.testPath = testPath;
-    this.fixture = fixture;
-  }
-
-  fn(fn) {
-    this.testFn = fn;
-  }
-
-  checkCaseNamesAndDuplicates() {
-    if (this.cases === undefined) {
-      return;
-    } // This is n^2.
-
-
-    const seen = [];
-
-    for (const testcase of this.cases) {
-      // stringifyPublicParams also checks for invalid params values
-      const testcaseString = stringifyPublicParams(testcase);
-      assert(!seen.some(x => publicParamsEquals(x, testcase)), `Duplicate public test case params: ${testcaseString}`);
-      seen.push(testcase);
-    }
-  }
-
-  params(casesIterable) {
-    assert(this.cases === undefined, 'test case is already parameterized');
-    this.cases = Array.from(casesIterable);
-    return this;
-  }
-
-  *iterate() {
-    assert(this.testFn !== undefined, 'No test function (.fn()) for test');
-
-    for (const params of this.cases || [{}]) {
-      yield new RunCaseSpecific(this.testPath, params, this.fixture, this.testFn);
-    }
-  }
-
-}
-
-class RunCaseSpecific {
-  constructor(testPath, params, fixture, fn) {
-    _defineProperty(this, "id", void 0);
-
-    _defineProperty(this, "params", void 0);
-
-    _defineProperty(this, "fixture", void 0);
-
-    _defineProperty(this, "fn", void 0);
-
-    this.id = {
-      test: testPath,
-      params: extractPublicParams(params)
-    };
-    this.params = params;
-    this.fixture = fixture;
-    this.fn = fn;
-  }
-
-  async run(rec) {
-    rec.start();
-
-    try {
-      const inst = new this.fixture(rec, this.params || {});
-
-      try {
-        await inst.init();
-        await this.fn(inst);
-      } finally {
-        // Runs as long as constructor succeeded, even if initialization or the test failed.
-        await inst.finalize();
-      }
-    } catch (ex) {
-      // There was an exception from constructor, init, test, or finalize.
-      // An error from init or test may have been a SkipTestCase.
-      // An error from finalize may have been an eventualAsyncExpectation failure
-      // or unexpected validation/OOM error from the GPUDevice.
-      rec.threw(ex);
-    }
-
-    rec.finish();
-  }
-
-}
-//# sourceMappingURL=test_group.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/test_suite_listing.js b/tests/wpt/web-platform-tests/webgpu/common/framework/test_suite_listing.js
deleted file mode 100644
index 99c900217c1..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/test_suite_listing.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-//# sourceMappingURL=test_suite_listing.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/tree.js b/tests/wpt/web-platform-tests/webgpu/common/framework/tree.js
deleted file mode 100644
index 69dfac21a63..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/tree.js
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { compareQueries, Ordering } from './query/compare.js';
-import { TestQueryMultiCase, TestQuerySingleCase, TestQueryMultiFile, TestQueryMultiTest } from './query/query.js';
-import { kBigSeparator, kWildcard, kPathSeparator, kParamSeparator } from './query/separators.js';
-import { stringifySingleParam } from './query/stringify_params.js';
-import { assert } from './util/util.js'; // `loadTreeForQuery()` loads a TestTree for a given queryToLoad.
-// The resulting tree is a linked-list all the way from `suite:*` to queryToLoad,
-// and under queryToLoad is a tree containing every case matched by queryToLoad.
-//
-// `subqueriesToExpand` influences the `collapsible` flag on nodes in the resulting tree.
-// A node is considered "collapsible" if none of the subqueriesToExpand is a StrictSubset
-// of that node.
-//
-// In WebKit/Blink-style web_tests, an expectation file marks individual cts.html "variants" as
-// "Failure", "Crash", etc.
-// By passing in the list of expectations as the subqueriesToExpand, we can programmatically
-// subdivide the cts.html "variants" list to be able to implement arbitrarily-fine suppressions
-// (instead of having to suppress entire test files, which would lose a lot of coverage).
-//
-// `iterateCollapsedQueries()` produces the list of queries for the variants list.
-//
-// Though somewhat complicated, this system has important benefits:
-//   - Avoids having to suppress entire test files, which would cause large test coverage loss.
-//   - Minimizes the number of page loads needed for fine-grained suppressions.
-//     (In the naive case, we could do one page load per test case - but the test suite would
-//     take impossibly long to run.)
-//   - Enables developers to put any number of tests in one file as appropriate, without worrying
-//     about expectation granularity.
-
-export class TestTree {
-  constructor(root) {
-    _defineProperty(this, "root", void 0);
-
-    this.root = root;
-  }
-
-  iterateCollapsedQueries() {
-    return TestTree.iterateSubtreeCollapsedQueries(this.root);
-  }
-
-  iterateLeaves() {
-    return TestTree.iterateSubtreeLeaves(this.root);
-  }
-  /**
-   * If a parent and its child are at different levels, then
-   * generally the parent has only one child, i.e.:
-   *   a,* { a,b,* { a,b:* { ... } } }
-   * Collapse that down into:
-   *   a,* { a,b:* { ... } }
-   * which is less needlessly verbose when displaying the tree in the standalone runner.
-   */
-
-
-  dissolveLevelBoundaries() {
-    const newRoot = dissolveLevelBoundaries(this.root);
-    assert(newRoot === this.root);
-  }
-
-  toString() {
-    return TestTree.subtreeToString('(root)', this.root, '');
-  }
-
-  static *iterateSubtreeCollapsedQueries(subtree) {
-    for (const [, child] of subtree.children) {
-      if ('children' in child && !child.collapsible) {
-        yield* TestTree.iterateSubtreeCollapsedQueries(child);
-      } else {
-        yield child.query;
-      }
-    }
-  }
-
-  static *iterateSubtreeLeaves(subtree) {
-    for (const [, child] of subtree.children) {
-      if ('children' in child) {
-        yield* TestTree.iterateSubtreeLeaves(child);
-      } else {
-        yield child;
-      }
-    }
-  }
-
-  static subtreeToString(name, tree, indent) {
-    const collapsible = 'run' in tree ? '>' : tree.collapsible ? '+' : '-';
-    let s = indent + `${collapsible} ${JSON.stringify(name)} => ${tree.query}`;
-
-    if ('children' in tree) {
-      if (tree.description !== undefined) {
-        s += `\n${indent}  | ${JSON.stringify(tree.description)}`;
-      }
-
-      for (const [name, child] of tree.children) {
-        s += '\n' + TestTree.subtreeToString(name, child, indent + '  ');
-      }
-    }
-
-    return s;
-  }
-
-} // TODO: Consider having subqueriesToExpand actually impact the depth-order of params in the tree.
-
-export async function loadTreeForQuery(loader, queryToLoad, subqueriesToExpand) {
-  const suite = queryToLoad.suite;
-  const specs = await loader.listing(suite);
-  const subqueriesToExpandEntries = Array.from(subqueriesToExpand.entries());
-  const seenSubqueriesToExpand = new Array(subqueriesToExpand.length);
-  seenSubqueriesToExpand.fill(false);
-
-  const isCollapsible = subquery => subqueriesToExpandEntries.every(([i, toExpand]) => {
-    const ordering = compareQueries(toExpand, subquery); // If toExpand == subquery, no expansion is needed (but it's still "seen").
-
-    if (ordering === Ordering.Equal) seenSubqueriesToExpand[i] = true;
-    return ordering !== Ordering.StrictSubset;
-  }); // L0 = suite-level, e.g. suite:*
-  // L1 =  file-level, e.g. suite:a,b:*
-  // L2 =  test-level, e.g. suite:a,b:c,d:*
-  // L3 =  case-level, e.g. suite:a,b:c,d:
-
-
-  let foundCase = false; // L0 is suite:*
-
-  const subtreeL0 = makeTreeForSuite(suite);
-  isCollapsible(subtreeL0.query); // mark seenSubqueriesToExpand
-
-  for (const entry of specs) {
-    if (entry.file.length === 0 && 'readme' in entry) {
-      // Suite-level readme.
-      assert(subtreeL0.description === undefined);
-      subtreeL0.description = entry.readme.trim();
-      continue;
-    }
-
-    {
-      const queryL1 = new TestQueryMultiFile(suite, entry.file);
-      const orderingL1 = compareQueries(queryL1, queryToLoad);
-
-      if (orderingL1 === Ordering.Unordered) {
-        // File path is not matched by this query.
-        continue;
-      }
-    }
-
-    if ('readme' in entry) {
-      // Entry is a README that is an ancestor or descendant of the query.
-      // (It's included for display in the standalone runner.)
-      // readmeSubtree is suite:a,b,*
-      // (This is always going to dedup with a file path, if there are any test spec files under
-      // the directory that has the README).
-      const readmeSubtree = addSubtreeForDirPath(subtreeL0, entry.file);
-      assert(readmeSubtree.description === undefined);
-      readmeSubtree.description = entry.readme.trim();
-      continue;
-    } // Entry is a spec file.
-
-
-    const spec = await loader.importSpecFile(queryToLoad.suite, entry.file);
-    const description = spec.description.trim(); // subtreeL1 is suite:a,b:*
-
-    const subtreeL1 = addSubtreeForFilePath(subtreeL0, entry.file, description, isCollapsible); // TODO: If tree generation gets too slow, avoid actually iterating the cases in a file
-    // if there's no need to (based on the subqueriesToExpand).
-
-    for (const t of spec.g.iterate()) {
-      {
-        const queryL3 = new TestQuerySingleCase(suite, entry.file, t.id.test, t.id.params);
-        const orderingL3 = compareQueries(queryL3, queryToLoad);
-
-        if (orderingL3 === Ordering.Unordered || orderingL3 === Ordering.StrictSuperset) {
-          // Case is not matched by this query.
-          continue;
-        }
-      } // subtreeL2 is suite:a,b:c,d:*
-
-      const subtreeL2 = addSubtreeForTestPath(subtreeL1, t.id.test, isCollapsible); // Leaf for case is suite:a,b:c,d:x=1;y=2
-
-      addLeafForCase(subtreeL2, t, isCollapsible);
-      foundCase = true;
-    }
-  }
-
-  for (const [i, sq] of subqueriesToExpandEntries) {
-    const seen = seenSubqueriesToExpand[i];
-    assert(seen, `subqueriesToExpand entry did not match anything \
-(can happen due to overlap with another subquery): ${sq.toString()}`);
-  }
-
-  assert(foundCase, 'Query does not match any cases');
-  return new TestTree(subtreeL0);
-}
-
-function makeTreeForSuite(suite) {
-  return {
-    readableRelativeName: suite + kBigSeparator,
-    query: new TestQueryMultiFile(suite, []),
-    children: new Map(),
-    collapsible: false
-  };
-}
-
-function addSubtreeForDirPath(tree, file) {
-  const subqueryFile = []; // To start, tree is suite:*
-  // This loop goes from that -> suite:a,* -> suite:a,b,*
-
-  for (const part of file) {
-    subqueryFile.push(part);
-    tree = getOrInsertSubtree(part, tree, () => {
-      const query = new TestQueryMultiFile(tree.query.suite, subqueryFile);
-      return {
-        readableRelativeName: part + kPathSeparator + kWildcard,
-        query,
-        collapsible: false
-      };
-    });
-  }
-
-  return tree;
-}
-
-function addSubtreeForFilePath(tree, file, description, checkCollapsible) {
-  // To start, tree is suite:*
-  // This goes from that -> suite:a,* -> suite:a,b,*
-  tree = addSubtreeForDirPath(tree, file); // This goes from that -> suite:a,b:*
-
-  const subtree = getOrInsertSubtree('', tree, () => {
-    const query = new TestQueryMultiTest(tree.query.suite, tree.query.filePathParts, []);
-    assert(file.length > 0, 'file path is empty');
-    return {
-      readableRelativeName: file[file.length - 1] + kBigSeparator + kWildcard,
-      query,
-      description,
-      collapsible: checkCollapsible(query)
-    };
-  });
-  return subtree;
-}
-
-function addSubtreeForTestPath(tree, test, isCollapsible) {
-  const subqueryTest = []; // To start, tree is suite:a,b:*
-  // This loop goes from that -> suite:a,b:c,* -> suite:a,b:c,d,*
-
-  for (const part of test) {
-    subqueryTest.push(part);
-    tree = getOrInsertSubtree(part, tree, () => {
-      const query = new TestQueryMultiTest(tree.query.suite, tree.query.filePathParts, subqueryTest);
-      return {
-        readableRelativeName: part + kPathSeparator + kWildcard,
-        query,
-        collapsible: isCollapsible(query)
-      };
-    });
-  } // This goes from that -> suite:a,b:c,d:*
-
-
-  return getOrInsertSubtree('', tree, () => {
-    const query = new TestQueryMultiCase(tree.query.suite, tree.query.filePathParts, subqueryTest, {});
-    assert(subqueryTest.length > 0, 'subqueryTest is empty');
-    return {
-      readableRelativeName: subqueryTest[subqueryTest.length - 1] + kBigSeparator + kWildcard,
-      kWildcard,
-      query,
-      collapsible: isCollapsible(query)
-    };
-  });
-}
-
-function addLeafForCase(tree, t, checkCollapsible) {
-  const query = tree.query;
-  let name = '';
-  const subqueryParams = {}; // To start, tree is suite:a,b:c,d:*
-  // This loop goes from that -> suite:a,b:c,d:x=1;* -> suite:a,b:c,d:x=1;y=2;*
-
-  for (const [k, v] of Object.entries(t.id.params)) {
-    name = stringifySingleParam(k, v);
-    subqueryParams[k] = v;
-    tree = getOrInsertSubtree(name, tree, () => {
-      const subquery = new TestQueryMultiCase(query.suite, query.filePathParts, query.testPathParts, subqueryParams);
-      return {
-        readableRelativeName: name + kParamSeparator + kWildcard,
-        query: subquery,
-        collapsible: checkCollapsible(subquery)
-      };
-    });
-  } // This goes from that -> suite:a,b:c,d:x=1;y=2
-
-
-  const subquery = new TestQuerySingleCase(query.suite, query.filePathParts, query.testPathParts, subqueryParams);
-  checkCollapsible(subquery); // mark seenSubqueriesToExpand
-
-  insertLeaf(tree, subquery, t);
-}
-
-function getOrInsertSubtree(key, parent, createSubtree) {
-  let v;
-  const child = parent.children.get(key);
-
-  if (child !== undefined) {
-    assert('children' in child); // Make sure cached subtree is not actually a leaf
-
-    v = child;
-  } else {
-    v = { ...createSubtree(),
-      children: new Map()
-    };
-    parent.children.set(key, v);
-  }
-
-  return v;
-}
-
-function insertLeaf(parent, query, t) {
-  const key = '';
-  const leaf = {
-    readableRelativeName: readableNameForCase(query),
-    query,
-    run: rec => t.run(rec)
-  };
-  assert(!parent.children.has(key));
-  parent.children.set(key, leaf);
-}
-
-function dissolveLevelBoundaries(tree) {
-  if ('children' in tree) {
-    if (tree.children.size === 1 && tree.description === undefined) {
-      // Loops exactly once
-      for (const [, child] of tree.children) {
-        if (child.query.level > tree.query.level) {
-          const newtree = dissolveLevelBoundaries(child);
-          return newtree;
-        }
-      }
-    }
-
-    for (const [k, child] of tree.children) {
-      const newChild = dissolveLevelBoundaries(child);
-
-      if (newChild !== child) {
-        tree.children.set(k, newChild);
-      }
-    }
-  }
-
-  return tree;
-}
-/** Generate a readable relative name for a case (used in standalone). */
-
-
-function readableNameForCase(query) {
-  const paramsKeys = Object.keys(query.params);
-
-  if (paramsKeys.length === 0) {
-    return query.testPathParts[query.testPathParts.length - 1] + kBigSeparator;
-  } else {
-    const lastKey = paramsKeys[paramsKeys.length - 1];
-    return stringifySingleParam(lastKey, query.params[lastKey]);
-  }
-}
-//# sourceMappingURL=tree.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/util/async_mutex.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/async_mutex.js
deleted file mode 100644
index cb900605bcf..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/util/async_mutex.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-export class AsyncMutex {
-  constructor() {
-    _defineProperty(this, "newestQueueItem", void 0);
-  }
-
-  // Run an async function with a lock on this mutex.
-  // Waits until the mutex is available, locks it, runs the function, then releases it.
-  async with(fn) {
-    const p = (async () => {
-      // If the mutex is locked, wait for the last thing in the queue before running.
-      // (Everything in the queue runs in order, so this is after everything currently enqueued.)
-      if (this.newestQueueItem) {
-        await this.newestQueueItem;
-      }
-
-      return fn();
-    })(); // Push the newly-created Promise onto the queue by replacing the old "newest" item.
-
-
-    this.newestQueueItem = p; // And return so the caller can wait on the result.
-
-    return p;
-  }
-
-}
-//# sourceMappingURL=async_mutex.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/util/collect_garbage.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/collect_garbage.js
deleted file mode 100644
index d4b5bb19b23..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/util/collect_garbage.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { resolveOnTimeout } from './util.js';
-export async function attemptGarbageCollection() {
-  const w = self;
-
-  if (w.GCController) {
-    w.GCController.collect();
-    return;
-  }
-
-  if (w.opera && w.opera.collect) {
-    w.opera.collect();
-    return;
-  }
-
-  try {
-    w.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindowUtils).garbageCollect();
-    return;
-  } catch (e) {}
-
-  if (w.gc) {
-    w.gc();
-    return;
-  }
-
-  if (w.CollectGarbage) {
-    w.CollectGarbage();
-    return;
-  }
-
-  let i;
-
-  function gcRec(n) {
-    if (n < 1) return;
-    let temp = {
-      i: 'ab' + i + i / 100000
-    };
-    temp = temp + 'foo';
-    temp; // dummy use of unused variable
-
-    gcRec(n - 1);
-  }
-
-  for (i = 0; i < 1000; i++) {
-    gcRec(10);
-  }
-
-  return resolveOnTimeout(35); // Let the event loop run a few frames in case it helps.
-}
-//# sourceMappingURL=collect_garbage.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/util/stack.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/stack.js
deleted file mode 100644
index 99653f88806..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/util/stack.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-// Returns the stack trace of an Error, but without the extra boilerplate at the bottom
-// (e.g. RunCaseSpecific, processTicksAndRejections, etc.), for logging.
-export function extractImportantStackTrace(e) {
-  if (!e.stack) {
-    return '';
-  }
-
-  const lines = e.stack.split('\n');
-
-  for (let i = lines.length - 1; i >= 0; --i) {
-    const line = lines[i];
-
-    if (line.indexOf('.spec.') !== -1) {
-      return lines.slice(0, i + 1).join('\n');
-    }
-  }
-
-  return e.stack;
-} // *** Examples ***
-//
-// Node fail()
-// > Error:
-// >    at CaseRecorder.fail (/Users/kainino/src/cts/src/common/framework/logger.ts:99:30)
-// >    at RunCaseSpecific.exports.g.test.t [as fn] (/Users/kainino/src/cts/src/unittests/logger.spec.ts:80:7)
-// x    at RunCaseSpecific.run (/Users/kainino/src/cts/src/common/framework/test_group.ts:121:18)
-// x    at processTicksAndRejections (internal/process/task_queues.js:86:5)
-//
-// Node throw
-// > Error: hello
-// >     at RunCaseSpecific.g.test.t [as fn] (/Users/kainino/src/cts/src/unittests/test_group.spec.ts:51:11)
-// x     at RunCaseSpecific.run (/Users/kainino/src/cts/src/common/framework/test_group.ts:121:18)
-// x     at processTicksAndRejections (internal/process/task_queues.js:86:5)
-//
-// Firefox fail()
-// > fail@http://localhost:8080/out/framework/logger.js:104:30
-// > expect@http://localhost:8080/out/framework/default_fixture.js:59:16
-// > @http://localhost:8080/out/unittests/util.spec.js:35:5
-// x run@http://localhost:8080/out/framework/test_group.js:119:18
-//
-// Firefox throw
-// > @http://localhost:8080/out/unittests/test_group.spec.js:48:11
-// x run@http://localhost:8080/out/framework/test_group.js:119:18
-//
-// Safari fail()
-// > fail@http://localhost:8080/out/framework/logger.js:104:39
-// > expect@http://localhost:8080/out/framework/default_fixture.js:59:20
-// > http://localhost:8080/out/unittests/util.spec.js:35:11
-// x http://localhost:8080/out/framework/test_group.js:119:20
-// x asyncFunctionResume@[native code]
-// x [native code]
-// x promiseReactionJob@[native code]
-//
-// Safari throw
-// > http://localhost:8080/out/unittests/test_group.spec.js:48:20
-// x http://localhost:8080/out/framework/test_group.js:119:20
-// x asyncFunctionResume@[native code]
-// x [native code]
-// x promiseReactionJob@[native code]
-//
-// Chrome fail()
-// x Error
-// x     at CaseRecorder.fail (http://localhost:8080/out/framework/logger.js:104:30)
-// x     at DefaultFixture.expect (http://localhost:8080/out/framework/default_fixture.js:59:16)
-// >     at RunCaseSpecific.fn (http://localhost:8080/out/unittests/util.spec.js:35:5)
-// x     at RunCaseSpecific.run (http://localhost:8080/out/framework/test_group.js:119:18)
-// x     at async runCase (http://localhost:8080/out/runtime/standalone.js:37:17)
-// x     at async http://localhost:8080/out/runtime/standalone.js:102:7
-//
-// Chrome throw
-// x Error: hello
-// >     at RunCaseSpecific.fn (http://localhost:8080/out/unittests/test_group.spec.js:48:11)
-// x     at RunCaseSpecific.run (http://localhost:8080/out/framework/test_group.js:119:18)"
-// x     at async Promise.all (index 0)
-// x     at async TestGroupTest.run (http://localhost:8080/out/unittests/test_group_test.js:6:5)
-// x     at async RunCaseSpecific.fn (http://localhost:8080/out/unittests/test_group.spec.js:53:15)
-// x     at async RunCaseSpecific.run (http://localhost:8080/out/framework/test_group.js:119:7)
-// x     at async runCase (http://localhost:8080/out/runtime/standalone.js:37:17)
-// x     at async http://localhost:8080/out/runtime/standalone.js:102:7
-//# sourceMappingURL=stack.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/util/timeout.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/timeout.js
deleted file mode 100644
index e565a518efc..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/util/timeout.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const timeout = typeof step_timeout !== 'undefined' ? step_timeout : setTimeout;
-//# sourceMappingURL=timeout.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/util/util.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/util.js
deleted file mode 100644
index b64379982a6..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/util/util.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { timeout } from './timeout.js';
-export function assert(condition, msg) {
-  if (!condition) {
-    throw new Error(msg && (typeof msg === 'string' ? msg : msg()));
-  }
-}
-export async function assertReject(p, msg) {
-  try {
-    await p;
-    unreachable(msg);
-  } catch (ex) {// Assertion OK
-  }
-}
-export function unreachable(msg) {
-  throw new Error(msg);
-} // performance.now() is available in all browsers, but not in scope by default in Node.
-
-const perf = typeof performance !== 'undefined' ? performance : require('perf_hooks').performance;
-export function now() {
-  return perf.now();
-}
-export function resolveOnTimeout(ms) {
-  return new Promise(resolve => {
-    timeout(() => {
-      resolve();
-    }, ms);
-  });
-}
-export class PromiseTimeoutError extends Error {}
-export function rejectOnTimeout(ms, msg) {
-  return new Promise((_resolve, reject) => {
-    timeout(() => {
-      reject(new PromiseTimeoutError(msg));
-    }, ms);
-  });
-}
-export function raceWithRejectOnTimeout(p, ms, msg) {
-  return Promise.race([p, rejectOnTimeout(ms, msg)]);
-}
-export function objectEquals(x, y) {
-  if (typeof x !== 'object' || typeof y !== 'object') return x === y;
-  if (x === null || y === null) return x === y;
-  if (x.constructor !== y.constructor) return false;
-  if (x instanceof Function) return x === y;
-  if (x instanceof RegExp) return x === y;
-  if (x === y || x.valueOf() === y.valueOf()) return true;
-  if (Array.isArray(x) && Array.isArray(y) && x.length !== y.length) return false;
-  if (x instanceof Date) return false;
-  if (!(x instanceof Object)) return false;
-  if (!(y instanceof Object)) return false;
-  const x1 = x;
-  const y1 = y;
-  const p = Object.keys(x);
-  return Object.keys(y).every(i => p.indexOf(i) !== -1) && p.every(i => objectEquals(x1[i], y1[i]));
-}
-export function range(n, fn) {
-  return [...new Array(n)].map((_, i) => fn(i));
-}
-//# sourceMappingURL=util.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/version.js b/tests/wpt/web-platform-tests/webgpu/common/framework/version.js
deleted file mode 100644
index 4b233137825..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/framework/version.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// AUTO-GENERATED - DO NOT EDIT. See tools/gen_version.
-
-export const version = '21f8f997c1db17e2daa6d0c9e8794a5c3216f373';
diff --git a/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/options.js b/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/options.js
deleted file mode 100644
index 1a90beadf1e..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/options.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-const url = new URL(window.location.toString());
-export function optionEnabled(opt) {
-  const val = url.searchParams.get(opt);
-  return val !== null && val !== '0';
-}
-//# sourceMappingURL=options.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker-worker.js b/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker-worker.js
deleted file mode 100644
index a02c98c2bbf..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker-worker.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { DefaultTestFileLoader } from '../../framework/file_loader.js';
-import { Logger } from '../../framework/logging/logger.js';
-import { parseQuery } from '../../framework/query/parseQuery.js';
-import { assert } from '../../framework/util/util.js';
-// should be DedicatedWorkerGlobalScope
-const loader = new DefaultTestFileLoader();
-
-self.onmessage = async ev => {
-  const query = ev.data.query;
-  const debug = ev.data.debug;
-  const log = new Logger(debug);
-  const testcases = Array.from(await loader.loadCases(parseQuery(query)));
-  assert(testcases.length === 1, 'worker query resulted in != 1 cases');
-  const testcase = testcases[0];
-  const [rec, result] = log.record(testcase.query.toString());
-  await testcase.run(rec);
-  self.postMessage({
-    query,
-    result
-  });
-};
-//# sourceMappingURL=test_worker-worker.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker.js b/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker.js
deleted file mode 100644
index 7e8b9a47c07..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { LogMessageWithStack } from '../../framework/logging/log_message.js';
-export class TestWorker {
-  constructor(debug) {
-    _defineProperty(this, "debug", void 0);
-
-    _defineProperty(this, "worker", void 0);
-
-    _defineProperty(this, "resolvers", new Map());
-
-    this.debug = debug;
-    const selfPath = import.meta.url;
-    const selfPathDir = selfPath.substring(0, selfPath.lastIndexOf('/'));
-    const workerPath = selfPathDir + '/test_worker-worker.js';
-    this.worker = new Worker(workerPath, {
-      type: 'module'
-    });
-
-    this.worker.onmessage = ev => {
-      const query = ev.data.query;
-      const result = ev.data.result;
-
-      if (result.logs) {
-        for (const l of result.logs) {
-          Object.setPrototypeOf(l, LogMessageWithStack.prototype);
-        }
-      }
-
-      this.resolvers.get(query)(result); // TODO(kainino0x): update the Logger with this result (or don't have a logger and update the
-      // entire results JSON somehow at some point).
-    };
-  }
-
-  async run(rec, query) {
-    this.worker.postMessage({
-      query,
-      debug: this.debug
-    });
-    const workerResult = await new Promise(resolve => {
-      this.resolvers.set(query, resolve);
-    });
-    rec.injectResult(workerResult);
-  }
-
-}
-//# sourceMappingURL=test_worker.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/runtime/wpt.js b/tests/wpt/web-platform-tests/webgpu/common/runtime/wpt.js
deleted file mode 100644
index dc38b77b1d5..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/common/runtime/wpt.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { DefaultTestFileLoader } from '../framework/file_loader.js';
-import { Logger } from '../framework/logging/logger.js';
-import { parseQuery } from '../framework/query/parseQuery.js';
-import { AsyncMutex } from '../framework/util/async_mutex.js';
-import { assert } from '../framework/util/util.js';
-import { optionEnabled } from './helper/options.js';
-import { TestWorker } from './helper/test_worker.js';
-
-(async () => {
-  const loader = new DefaultTestFileLoader();
-  const qs = new URLSearchParams(window.location.search).getAll('q');
-  assert(qs.length === 1, 'currently, there must be exactly one ?q=');
-  const testcases = await loader.loadCases(parseQuery(qs[0]));
-  await addWPTTests(testcases);
-})(); // Note: `async_test`s must ALL be added within the same task. This function *must not* be async.
-
-
-function addWPTTests(testcases) {
-  const worker = optionEnabled('worker') ? new TestWorker(false) : undefined;
-  const log = new Logger(false);
-  const mutex = new AsyncMutex();
-  const running = [];
-
-  for (const testcase of testcases) {
-    const name = testcase.query.toString();
-
-    const wpt_fn = function () {
-      const p = mutex.with(async () => {
-        const [rec, res] = log.record(name);
-
-        if (worker) {
-          await worker.run(rec, name);
-        } else {
-          await testcase.run(rec);
-        }
-
-        this.step(() => {
-          // Unfortunately, it seems not possible to surface any logs for warn/skip.
-          if (res.status === 'fail') {
-            throw (res.logs || []).map(s => s.toJSON()).join('\n\n');
-          }
-        });
-        this.done();
-      });
-      running.push(p);
-      return p;
-    };
-
-    async_test(wpt_fn, name);
-  }
-
-  return Promise.all(running).then(() => log);
-}
-//# sourceMappingURL=wpt.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/cts.html b/tests/wpt/web-platform-tests/webgpu/cts.html
deleted file mode 100644
index e78afee421a..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/cts.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- AUTO-GENERATED - DO NOT EDIT. See WebGPU CTS: tools/gen_wpt_cts_html. -->
-<!--
-    This test suite is built from the TypeScript sources at:
-    https://github.com/gpuweb/cts
-
-    If you are debugging WebGPU conformance tests, it's highly recommended that
-    you use the standalone interactive runner in that repository, which
-    provides tools for easier debugging and editing (source maps, debug
-    logging, warn/skip functionality, etc.)
-
-    NOTE:
-    The WPT version of this file is generated with *one variant per test spec
-    file*. If your harness needs more fine-grained suppressions, you'll need to
-    generate your own variants list from your suppression list.
-    See `tools/gen_wpt_cts_html` to do this.
-
-    When run under browser CI, the original cts.html should be skipped, and
-    this alternate version should be run instead, under a non-exported WPT test
-    directory (e.g. Chromium's wpt_internal).
--->
-
-<!doctype html>
-<title>WebGPU CTS</title>
-<meta charset=utf-8>
-<link rel=help href='https://gpuweb.github.io/gpuweb/'>
-
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script type=module src=/webgpu/common/runtime/wpt.js></script>
-<meta name=variant content='?q=webgpu:api,operation,buffers,create_mapped:*'>
-<meta name=variant content='?q=webgpu:api,operation,buffers,map:*'>
-<meta name=variant content='?q=webgpu:api,operation,buffers,map_detach:*'>
-<meta name=variant content='?q=webgpu:api,operation,buffers,map_oom:*'>
-<meta name=variant content='?q=webgpu:api,operation,command_buffer,basic:*'>
-<meta name=variant content='?q=webgpu:api,operation,command_buffer,copies:*'>
-<meta name=variant content='?q=webgpu:api,operation,command_buffer,render,basic:*'>
-<meta name=variant content='?q=webgpu:api,operation,fences:*'>
-<meta name=variant content='?q=webgpu:api,operation,resource_init,copied_texture_clear:*'>
-<meta name=variant content='?q=webgpu:api,validation,createBindGroup:*'>
-<meta name=variant content='?q=webgpu:api,validation,createBindGroupLayout:*'>
-<meta name=variant content='?q=webgpu:api,validation,createPipelineLayout:*'>
-<meta name=variant content='?q=webgpu:api,validation,createTexture:*'>
-<meta name=variant content='?q=webgpu:api,validation,createView:*'>
-<meta name=variant content='?q=webgpu:api,validation,error_scope:*'>
-<meta name=variant content='?q=webgpu:api,validation,fences:*'>
-<meta name=variant content='?q=webgpu:api,validation,queue_submit:*'>
-<meta name=variant content='?q=webgpu:api,validation,render_pass_descriptor:*'>
-<meta name=variant content='?q=webgpu:api,validation,setBindGroup:*'>
-<meta name=variant content='?q=webgpu:api,validation,setBlendColor:*'>
-<meta name=variant content='?q=webgpu:api,validation,setScissorRect:*'>
-<meta name=variant content='?q=webgpu:api,validation,setStencilReference:*'>
-<meta name=variant content='?q=webgpu:api,validation,setViewport:*'>
-<meta name=variant content='?q=webgpu:examples:*'>
-<meta name=variant content='?q=webgpu:idl,constants,flags:*'>
-<meta name=variant content='?q=webgpu:web-platform,canvas,context_creation:*'>
-<meta name=variant content='?q=webgpu:web-platform,copyImageBitmapToTexture:*'>
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/create_mapped.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/create_mapped.spec.js
deleted file mode 100644
index 1c3b1254d50..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/create_mapped.spec.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = '';
-import { params, pbool, poptions } from '../../../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { MappingTest } from './mapping_test.js';
-export const g = makeTestGroup(MappingTest);
-g.test('createBufferMapped').params(params().combine(poptions('size', [12, 512 * 1024])).combine(pbool('mappable'))).fn(t => {
-  const {
-    size,
-    mappable
-  } = t.params;
-  const [buffer, arrayBuffer] = t.device.createBufferMapped({
-    size,
-    usage: GPUBufferUsage.COPY_SRC | (mappable ? GPUBufferUsage.MAP_WRITE : 0)
-  });
-  t.checkMapWrite(buffer, arrayBuffer, size);
-});
-//# sourceMappingURL=create_mapped.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map.spec.js
deleted file mode 100644
index e8c86ec1b8a..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map.spec.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = '';
-import { pbool, poptions, params } from '../../../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { MappingTest } from './mapping_test.js';
-export const g = makeTestGroup(MappingTest);
-g.test('mapWriteAsync').params(poptions('size', [12, 512 * 1024])).fn(async t => {
-  const {
-    size
-  } = t.params;
-  const buffer = t.device.createBuffer({
-    size,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.MAP_WRITE
-  });
-  const arrayBuffer = await buffer.mapWriteAsync();
-  t.checkMapWrite(buffer, arrayBuffer, size);
-});
-g.test('mapReadAsync').params(poptions('size', [12, 512 * 1024])).fn(async t => {
-  const {
-    size
-  } = t.params;
-  const [buffer, init] = t.device.createBufferMapped({
-    size,
-    usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ
-  });
-  const expected = new Uint32Array(new ArrayBuffer(size));
-  const data = new Uint32Array(init);
-
-  for (let i = 0; i < data.length; ++i) {
-    data[i] = expected[i] = i + 1;
-  }
-
-  buffer.unmap();
-  const actual = new Uint8Array(await buffer.mapReadAsync());
-  t.expectBuffer(actual, new Uint8Array(expected.buffer));
-});
-g.test('createBufferMapped').params(params().combine(poptions('size', [12, 512 * 1024])).combine(pbool('mappable'))).fn(async t => {
-  const {
-    size,
-    mappable
-  } = t.params;
-  const [buffer, arrayBuffer] = t.device.createBufferMapped({
-    size,
-    usage: GPUBufferUsage.COPY_SRC | (mappable ? GPUBufferUsage.MAP_WRITE : 0)
-  });
-  t.checkMapWrite(buffer, arrayBuffer, size);
-});
-//# sourceMappingURL=map.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_detach.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_detach.spec.js
deleted file mode 100644
index 8ae0be0b197..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_detach.spec.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = '';
-import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { GPUTest } from '../../../gpu_test.js';
-
-class F extends GPUTest {
-  checkDetach(buffer, arrayBuffer, unmap, destroy) {
-    const view = new Uint8Array(arrayBuffer);
-    this.expect(arrayBuffer.byteLength === 4);
-    this.expect(view.length === 4);
-    if (unmap) buffer.unmap();
-    if (destroy) buffer.destroy();
-    this.expect(arrayBuffer.byteLength === 0, 'ArrayBuffer should be detached');
-    this.expect(view.byteLength === 0, 'ArrayBufferView should be detached');
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('mapWriteAsync').params([{
-  unmap: true,
-  destroy: false
-}, //
-{
-  unmap: false,
-  destroy: true
-}, {
-  unmap: true,
-  destroy: true
-}]).fn(async t => {
-  const buffer = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.MAP_WRITE
-  });
-  const arrayBuffer = await buffer.mapWriteAsync();
-  t.checkDetach(buffer, arrayBuffer, t.params.unmap, t.params.destroy);
-});
-g.test('mapReadAsync').params([{
-  unmap: true,
-  destroy: false
-}, //
-{
-  unmap: false,
-  destroy: true
-}, {
-  unmap: true,
-  destroy: true
-}]).fn(async t => {
-  const buffer = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.MAP_READ
-  });
-  const arrayBuffer = await buffer.mapReadAsync();
-  t.checkDetach(buffer, arrayBuffer, t.params.unmap, t.params.destroy);
-});
-g.test('create_mapped').params([{
-  unmap: true,
-  destroy: false
-}, {
-  unmap: false,
-  destroy: true
-}, {
-  unmap: true,
-  destroy: true
-}]).fn(async t => {
-  const desc = {
-    size: 4,
-    usage: GPUBufferUsage.MAP_WRITE
-  };
-  const [buffer, arrayBuffer] = t.device.createBufferMapped(desc);
-  const view = new Uint8Array(arrayBuffer);
-  t.expect(arrayBuffer.byteLength === 4);
-  t.expect(view.length === 4);
-  if (t.params.unmap) buffer.unmap();
-  if (t.params.destroy) buffer.destroy();
-  t.expect(arrayBuffer.byteLength === 0, 'ArrayBuffer should be detached');
-  t.expect(view.byteLength === 0, 'ArrayBufferView should be detached');
-});
-//# sourceMappingURL=map_detach.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_oom.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_oom.spec.js
deleted file mode 100644
index 8494dc7ddc7..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_oom.spec.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = '';
-import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { GPUTest } from '../../../gpu_test.js';
-
-function getBufferDesc(usage) {
-  return {
-    size: Number.MAX_SAFE_INTEGER,
-    usage
-  };
-}
-
-export const g = makeTestGroup(GPUTest);
-g.test('mapWriteAsync').fn(async t => {
-  const buffer = t.expectGPUError('out-of-memory', () => {
-    return t.device.createBuffer(getBufferDesc(GPUBufferUsage.MAP_WRITE));
-  });
-  t.shouldReject('OperationError', buffer.mapWriteAsync());
-});
-g.test('mapReadAsync').fn(async t => {
-  const buffer = t.expectGPUError('out-of-memory', () => {
-    return t.device.createBuffer(getBufferDesc(GPUBufferUsage.MAP_READ));
-  });
-  t.shouldReject('OperationError', buffer.mapReadAsync());
-});
-g.test('createBufferMapped').fn(async t => {
-  t.shouldThrow('RangeError', () => {
-    t.device.createBufferMapped(getBufferDesc(GPUBufferUsage.COPY_SRC));
-  });
-});
-//# sourceMappingURL=map_oom.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/mapping_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/mapping_test.js
deleted file mode 100644
index b7349059035..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/mapping_test.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { GPUTest } from '../../../gpu_test.js';
-export class MappingTest extends GPUTest {
-  checkMapWrite(buffer, mappedContents, size) {
-    this.checkMapWriteZeroed(mappedContents, size);
-    const mappedView = new Uint32Array(mappedContents);
-    const expected = new Uint32Array(new ArrayBuffer(size));
-    this.expect(mappedView.byteLength === size);
-
-    for (let i = 0; i < mappedView.length; ++i) {
-      mappedView[i] = expected[i] = i + 1;
-    }
-
-    buffer.unmap();
-    this.expectContents(buffer, expected);
-  }
-
-  checkMapWriteZeroed(arrayBuffer, expectedSize) {
-    this.expect(arrayBuffer.byteLength === expectedSize);
-    const view = new Uint8Array(arrayBuffer);
-    this.expectZero(view);
-  }
-
-  expectZero(actual) {
-    const size = actual.byteLength;
-
-    for (let i = 0; i < size; ++i) {
-      if (actual[i] !== 0) {
-        this.fail(`at [${i}], expected zero, got ${actual[i]}`);
-        break;
-      }
-    }
-  }
-
-}
-//# sourceMappingURL=mapping_test.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/basic.spec.js
deleted file mode 100644
index 547a08683f7..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/basic.spec.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-Basic tests.
-`;
-import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { GPUTest } from '../../../gpu_test.js';
-export const g = makeTestGroup(GPUTest);
-g.test('empty').fn(async t => {
-  const encoder = t.device.createCommandEncoder();
-  const cmd = encoder.finish();
-  t.device.defaultQueue.submit([cmd]);
-});
-//# sourceMappingURL=basic.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/copies.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/copies.spec.js
deleted file mode 100644
index cc2ea6deae1..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/copies.spec.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-copy{Buffer,Texture}To{Buffer,Texture} tests.
-`;
-import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { GPUTest } from '../../../gpu_test.js';
-export const g = makeTestGroup(GPUTest);
-g.test('b2b').fn(async t => {
-  const data = new Uint32Array([0x01020304]);
-  const [src, map] = t.device.createBufferMapped({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  new Uint32Array(map).set(data);
-  src.unmap();
-  const dst = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  const encoder = t.device.createCommandEncoder();
-  encoder.copyBufferToBuffer(src, 0, dst, 0, 4);
-  t.device.defaultQueue.submit([encoder.finish()]);
-  t.expectContents(dst, data);
-});
-g.test('b2t2b').fn(async t => {
-  const data = new Uint32Array([0x01020304]);
-  const [src, map] = t.device.createBufferMapped({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  new Uint32Array(map).set(data);
-  src.unmap();
-  const dst = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  const mid = t.device.createTexture({
-    size: {
-      width: 1,
-      height: 1,
-      depth: 1
-    },
-    format: 'rgba8uint',
-    usage: GPUTextureUsage.COPY_SRC | GPUTextureUsage.COPY_DST
-  });
-  const encoder = t.device.createCommandEncoder();
-  encoder.copyBufferToTexture({
-    buffer: src,
-    bytesPerRow: 256
-  }, {
-    texture: mid,
-    mipLevel: 0,
-    origin: {
-      x: 0,
-      y: 0,
-      z: 0
-    }
-  }, {
-    width: 1,
-    height: 1,
-    depth: 1
-  });
-  encoder.copyTextureToBuffer({
-    texture: mid,
-    mipLevel: 0,
-    origin: {
-      x: 0,
-      y: 0,
-      z: 0
-    }
-  }, {
-    buffer: dst,
-    bytesPerRow: 256
-  }, {
-    width: 1,
-    height: 1,
-    depth: 1
-  });
-  t.device.defaultQueue.submit([encoder.finish()]);
-  t.expectContents(dst, data);
-});
-g.test('b2t2t2b').fn(async t => {
-  const data = new Uint32Array([0x01020304]);
-  const [src, map] = t.device.createBufferMapped({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  new Uint32Array(map).set(data);
-  src.unmap();
-  const dst = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  const midDesc = {
-    size: {
-      width: 1,
-      height: 1,
-      depth: 1
-    },
-    format: 'rgba8uint',
-    usage: GPUTextureUsage.COPY_SRC | GPUTextureUsage.COPY_DST
-  };
-  const mid1 = t.device.createTexture(midDesc);
-  const mid2 = t.device.createTexture(midDesc);
-  const encoder = t.device.createCommandEncoder();
-  encoder.copyBufferToTexture({
-    buffer: src,
-    bytesPerRow: 256
-  }, {
-    texture: mid1,
-    mipLevel: 0,
-    origin: {
-      x: 0,
-      y: 0,
-      z: 0
-    }
-  }, {
-    width: 1,
-    height: 1,
-    depth: 1
-  });
-  encoder.copyTextureToTexture({
-    texture: mid1,
-    mipLevel: 0,
-    origin: {
-      x: 0,
-      y: 0,
-      z: 0
-    }
-  }, {
-    texture: mid2,
-    mipLevel: 0,
-    origin: {
-      x: 0,
-      y: 0,
-      z: 0
-    }
-  }, {
-    width: 1,
-    height: 1,
-    depth: 1
-  });
-  encoder.copyTextureToBuffer({
-    texture: mid2,
-    mipLevel: 0,
-    origin: {
-      x: 0,
-      y: 0,
-      z: 0
-    }
-  }, {
-    buffer: dst,
-    bytesPerRow: 256
-  }, {
-    width: 1,
-    height: 1,
-    depth: 1
-  });
-  t.device.defaultQueue.submit([encoder.finish()]);
-  t.expectContents(dst, data);
-});
-//# sourceMappingURL=copies.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/render/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/render/basic.spec.js
deleted file mode 100644
index 815eb5b70b0..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/render/basic.spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-Basic command buffer rendering tests.
-`;
-import { makeTestGroup } from '../../../../../common/framework/test_group.js';
-import { GPUTest } from '../../../../gpu_test.js';
-export const g = makeTestGroup(GPUTest);
-g.test('clear').fn(async t => {
-  const dst = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  const colorAttachment = t.device.createTexture({
-    format: 'rgba8unorm',
-    size: {
-      width: 1,
-      height: 1,
-      depth: 1
-    },
-    usage: GPUTextureUsage.COPY_SRC | GPUTextureUsage.OUTPUT_ATTACHMENT
-  });
-  const colorAttachmentView = colorAttachment.createView();
-  const encoder = t.device.createCommandEncoder();
-  const pass = encoder.beginRenderPass({
-    colorAttachments: [{
-      attachment: colorAttachmentView,
-      loadValue: {
-        r: 0.0,
-        g: 1.0,
-        b: 0.0,
-        a: 1.0
-      },
-      storeOp: 'store'
-    }]
-  });
-  pass.endPass();
-  encoder.copyTextureToBuffer({
-    texture: colorAttachment,
-    mipLevel: 0,
-    origin: {
-      x: 0,
-      y: 0,
-      z: 0
-    }
-  }, {
-    buffer: dst,
-    bytesPerRow: 256
-  }, {
-    width: 1,
-    height: 1,
-    depth: 1
-  });
-  t.device.defaultQueue.submit([encoder.finish()]);
-  t.expectContents(dst, new Uint8Array([0x00, 0xff, 0x00, 0xff]));
-});
-//# sourceMappingURL=basic.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/fences.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/fences.spec.js
deleted file mode 100644
index f9f079b6241..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/fences.spec.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = '';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { attemptGarbageCollection } from '../../../common/framework/util/collect_garbage.js';
-import { raceWithRejectOnTimeout } from '../../../common/framework/util/util.js';
-import { GPUTest } from '../../gpu_test.js';
-export const g = makeTestGroup(GPUTest);
-g.test('initial,no_descriptor').fn(t => {
-  const fence = t.queue.createFence();
-  t.expect(fence.getCompletedValue() === 0);
-});
-g.test('initial,empty_descriptor').fn(t => {
-  const fence = t.queue.createFence({});
-  t.expect(fence.getCompletedValue() === 0);
-});
-g.test('initial,descriptor_with_initialValue').fn(t => {
-  const fence = t.queue.createFence({
-    initialValue: 2
-  });
-  t.expect(fence.getCompletedValue() === 2);
-}); // Promise resolves when onCompletion value is less than signal value.
-
-g.test('wait,less_than_signaled').fn(async t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 2);
-  await fence.onCompletion(1);
-  t.expect(fence.getCompletedValue() === 2);
-}); // Promise resolves when onCompletion value is equal to signal value.
-
-g.test('wait,equal_to_signaled').fn(async t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 2);
-  await fence.onCompletion(2);
-  t.expect(fence.getCompletedValue() === 2);
-}); // All promises resolve when signal is called once.
-
-g.test('wait,signaled_once').fn(async t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 20);
-  const promises = [];
-
-  for (let i = 0; i <= 20; ++i) {
-    promises.push(fence.onCompletion(i).then(() => {
-      t.expect(fence.getCompletedValue() >= i);
-    }));
-  }
-
-  await Promise.all(promises);
-}); // Promise resolves when signal is called multiple times.
-
-g.test('wait,signaled_multiple_times').fn(async t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 1);
-  t.queue.signal(fence, 2);
-  await fence.onCompletion(2);
-  t.expect(fence.getCompletedValue() === 2);
-}); // Promise resolves if fence has already completed.
-
-g.test('wait,already_completed').fn(async t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 2); // Wait for value to update.
-
-  while (fence.getCompletedValue() < 2) {
-    await new Promise(resolve => {
-      requestAnimationFrame(resolve);
-    });
-  }
-
-  t.expect(fence.getCompletedValue() === 2);
-  await fence.onCompletion(2);
-  t.expect(fence.getCompletedValue() === 2);
-}); // Test many calls to signal and wait on fence values one at a time.
-
-g.test('wait,many,serially').fn(async t => {
-  const fence = t.queue.createFence();
-
-  for (let i = 1; i <= 20; ++i) {
-    t.queue.signal(fence, i);
-    await fence.onCompletion(i);
-    t.expect(fence.getCompletedValue() === i);
-  }
-}); // Test many calls to signal and wait on all fence values.
-
-g.test('wait,many,parallel').fn(async t => {
-  const fence = t.queue.createFence();
-  const promises = [];
-
-  for (let i = 1; i <= 20; ++i) {
-    t.queue.signal(fence, i);
-    promises.push(fence.onCompletion(i).then(() => {
-      t.expect(fence.getCompletedValue() >= i);
-    }));
-  }
-
-  await Promise.all(promises);
-  t.expect(fence.getCompletedValue() === 20);
-}); // Test onCompletion promise resolves within a time limit.
-
-g.test('wait,resolves_within_timeout').fn(t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 2);
-  return raceWithRejectOnTimeout((async () => {
-    await fence.onCompletion(2);
-    t.expect(fence.getCompletedValue() === 2);
-  })(), 100, 'The fence has not been resolved within time limit.');
-}); // Test dropping references to the fence and onCompletion promise does not crash.
-
-g.test('drop,fence_and_promise').fn(async t => {
-  {
-    const fence = t.queue.createFence();
-    t.queue.signal(fence, 2);
-    fence.onCompletion(2);
-  }
-  await attemptGarbageCollection();
-}); // Test dropping references to the fence and holding the promise does not crash.
-
-g.test('drop,promise').fn(async t => {
-  let promise;
-  {
-    const fence = t.queue.createFence();
-    t.queue.signal(fence, 2);
-    promise = fence.onCompletion(2);
-  }
-  await attemptGarbageCollection();
-  await promise;
-});
-//# sourceMappingURL=fences.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/resource_init/copied_texture_clear.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/resource_init/copied_texture_clear.spec.js
deleted file mode 100644
index f5b8b697d74..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/resource_init/copied_texture_clear.spec.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = 'Test uninitialized textures are initialized to zero when copied.';
-import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { assert, unreachable } from '../../../../common/framework/util/util.js';
-import { ReadMethod, TextureZeroInitTest } from './texture_zero_init_test.js';
-
-class CopiedTextureClearTest extends TextureZeroInitTest {
-  checkContentsByBufferCopy(texture, state, subresourceRange) {
-    for (const {
-      level: mipLevel,
-      slice
-    } of subresourceRange.each()) {
-      assert(this.params.dimension === '2d');
-      this.expectSingleColor(texture, this.params.format, {
-        size: [this.textureWidth, this.textureHeight, 1],
-        dimension: this.params.dimension,
-        slice,
-        layout: {
-          mipLevel
-        },
-        exp: this.stateToTexelComponents[state]
-      });
-    }
-  }
-
-  checkContentsByTextureCopy(texture, state, subresourceRange) {
-    for (const {
-      level,
-      slice
-    } of subresourceRange.each()) {
-      assert(this.params.dimension === '2d');
-      const width = this.textureWidth >> level;
-      const height = this.textureHeight >> level;
-      const dst = this.device.createTexture({
-        size: [width, height, 1],
-        format: this.params.format,
-        usage: GPUTextureUsage.COPY_DST | GPUTextureUsage.COPY_SRC
-      });
-      const commandEncoder = this.device.createCommandEncoder();
-      commandEncoder.copyTextureToTexture({
-        texture,
-        mipLevel: level,
-        arrayLayer: slice
-      }, {
-        texture: dst,
-        mipLevel: 0,
-        arrayLayer: 0
-      }, {
-        width,
-        height,
-        depth: 1
-      });
-      this.queue.submit([commandEncoder.finish()]);
-      this.expectSingleColor(dst, this.params.format, {
-        size: [width, height, 1],
-        exp: this.stateToTexelComponents[state]
-      });
-    }
-  }
-
-  checkContents(texture, state, subresourceRange) {
-    switch (this.params.readMethod) {
-      case ReadMethod.CopyToBuffer:
-        this.checkContentsByBufferCopy(texture, state, subresourceRange);
-        break;
-
-      case ReadMethod.CopyToTexture:
-        this.checkContentsByTextureCopy(texture, state, subresourceRange);
-        break;
-
-      default:
-        unreachable();
-    }
-  }
-
-}
-
-export const g = makeTestGroup(CopiedTextureClearTest);
-g.test('uninitialized_texture_is_zero').params(TextureZeroInitTest.generateParams([ReadMethod.CopyToBuffer, ReadMethod.CopyToTexture])).fn(t => {
-  t.run();
-});
-//# sourceMappingURL=copied_texture_clear.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/resource_init/texture_zero_init_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/resource_init/texture_zero_init_test.js
deleted file mode 100644
index 8dda949f859..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/resource_init/texture_zero_init_test.js
+++ /dev/null
@@ -1,562 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { params, poptions, pbool } from '../../../../common/framework/params_builder.js';
-import { assert, unreachable } from '../../../../common/framework/util/util.js';
-import { kTextureAspects, kTextureFormatInfo, kTextureFormats } from '../../../capability_info.js';
-import { GPUTest } from '../../../gpu_test.js';
-import { createTextureUploadBuffer } from '../../../util/texture/layout.js';
-import { SubresourceRange } from '../../../util/texture/subresource.js';
-import { getTexelDataRepresentation } from '../../../util/texture/texelData.js';
-var UninitializeMethod;
-
-(function (UninitializeMethod) {
-  UninitializeMethod["Creation"] = "Creation";
-  UninitializeMethod["StoreOpClear"] = "StoreOpClear";
-})(UninitializeMethod || (UninitializeMethod = {}));
-
-const kUninitializeMethods = Object.keys(UninitializeMethod);
-export let ReadMethod;
-
-(function (ReadMethod) {
-  ReadMethod["Sample"] = "Sample";
-  ReadMethod["CopyToBuffer"] = "CopyToBuffer";
-  ReadMethod["CopyToTexture"] = "CopyToTexture";
-  ReadMethod["DepthTest"] = "DepthTest";
-  ReadMethod["StencilTest"] = "StencilTest";
-  ReadMethod["ColorBlending"] = "ColorBlending";
-  ReadMethod["Storage"] = "Storage";
-})(ReadMethod || (ReadMethod = {}));
-
-const kMipLevelCounts = [1, 5]; // For each mip level count, define the mip ranges to leave uninitialized.
-
-const kUninitializedMipRangesToTest = {
-  1: [{
-    begin: 0,
-    end: 1
-  }],
-  // Test the only mip
-  5: [{
-    begin: 0,
-    end: 2
-  }, {
-    begin: 3,
-    end: 4
-  }] // Test a range and a single mip
-
-}; // Test with these sample counts.
-
-const kSampleCounts = [1, 4]; // Test with these slice counts. This means the depth of a 3d texture or the number
-// or layers in a 2D or a 1D texture array.
-
-// For each slice count, define the slices to leave uninitialized.
-const kUninitializedSliceRangesToTest = {
-  1: [{
-    begin: 0,
-    end: 1
-  }],
-  // Test the only slice
-  7: [{
-    begin: 2,
-    end: 4
-  }, {
-    begin: 6,
-    end: 7
-  }] // Test a range and a single slice
-
-}; // Test with these combinations of texture dimension and sliceCount.
-
-const kCreationSizes = [// { dimension: '1d', sliceCount: 7 }, // TODO: 1d textures
-{
-  dimension: '2d',
-  sliceCount: 1
-}, // 2d textures
-{
-  dimension: '2d',
-  sliceCount: 7
-} // 2d array textures
-// { dimension: '3d', sliceCount: 7 }, // TODO: 3d textures
-]; // Enums to abstract over color / depth / stencil values in textures. Depending on the texture format,
-// the data for each value may have a different representation. These enums are converted to a
-// representation such that their values can be compared. ex.) An integer is needed to upload to an
-// unsigned normalized format, but its value is read as a float in the shader.
-
-export let InitializedState;
-
-(function (InitializedState) {
-  InitializedState[InitializedState["Canary"] = 0] = "Canary";
-  InitializedState[InitializedState["Zero"] = 1] = "Zero";
-})(InitializedState || (InitializedState = {}));
-
-export function initializedStateAsFloat(state) {
-  switch (state) {
-    case InitializedState.Zero:
-      return 0;
-
-    case InitializedState.Canary:
-      return 1;
-
-    default:
-      unreachable();
-  }
-}
-export function initializedStateAsUint(state) {
-  switch (state) {
-    case InitializedState.Zero:
-      return 0;
-
-    case InitializedState.Canary:
-      return 255;
-
-    default:
-      unreachable();
-  }
-}
-export function initializedStateAsSint(state) {
-  switch (state) {
-    case InitializedState.Zero:
-      return 0;
-
-    case InitializedState.Canary:
-      return -1;
-
-    default:
-      unreachable();
-  }
-}
-export function initializedStateAsColor(state, format) {
-  let value;
-
-  if (format.indexOf('uint') !== -1) {
-    value = initializedStateAsUint(state);
-  } else if (format.indexOf('sint') !== -1) {
-    value = initializedStateAsSint(state);
-  } else {
-    value = initializedStateAsFloat(state);
-  }
-
-  return [value, value, value, value];
-}
-export function initializedStateAsDepth(state) {
-  switch (state) {
-    case InitializedState.Zero:
-      return 0;
-
-    case InitializedState.Canary:
-      return 1;
-
-    default:
-      unreachable();
-  }
-}
-export function initializedStateAsStencil(state) {
-  switch (state) {
-    case InitializedState.Zero:
-      return 0;
-
-    case InitializedState.Canary:
-      return 42;
-
-    default:
-      unreachable();
-  }
-}
-
-function getRequiredTextureUsage(format, sampleCount, uninitializeMethod, readMethod) {
-  let usage = GPUTextureUsage.COPY_DST;
-
-  switch (uninitializeMethod) {
-    case UninitializeMethod.Creation:
-      break;
-
-    case UninitializeMethod.StoreOpClear:
-      usage |= GPUTextureUsage.OUTPUT_ATTACHMENT;
-      break;
-
-    default:
-      unreachable();
-  }
-
-  switch (readMethod) {
-    case ReadMethod.CopyToBuffer:
-    case ReadMethod.CopyToTexture:
-      usage |= GPUTextureUsage.COPY_SRC;
-      break;
-
-    case ReadMethod.Sample:
-      usage |= GPUTextureUsage.SAMPLED;
-      break;
-
-    case ReadMethod.Storage:
-      usage |= GPUTextureUsage.STORAGE;
-      break;
-
-    case ReadMethod.DepthTest:
-    case ReadMethod.StencilTest:
-    case ReadMethod.ColorBlending:
-      usage |= GPUTextureUsage.OUTPUT_ATTACHMENT;
-      break;
-
-    default:
-      unreachable();
-  }
-
-  if (sampleCount > 1) {
-    // Copies to multisampled textures are not allowed. We need OutputAttachment to initialize
-    // canary data in multisampled textures.
-    usage |= GPUTextureUsage.OUTPUT_ATTACHMENT;
-  }
-
-  if (!kTextureFormatInfo[format].copyable) {
-    // Copies are not possible. We need OutputAttachment to initialize
-    // canary data.
-    assert(kTextureFormatInfo[format].renderable);
-    usage |= GPUTextureUsage.OUTPUT_ATTACHMENT;
-  }
-
-  return usage;
-}
-
-export class TextureZeroInitTest extends GPUTest {
-  constructor(rec, params) {
-    super(rec, params);
-
-    _defineProperty(this, "stateToTexelComponents", void 0);
-
-    const stateToTexelComponents = state => {
-      const [R, G, B, A] = initializedStateAsColor(state, this.params.format);
-      return {
-        R,
-        G,
-        B,
-        A,
-        Depth: initializedStateAsDepth(state),
-        Stencil: initializedStateAsStencil(state)
-      };
-    };
-
-    this.stateToTexelComponents = {
-      [InitializedState.Zero]: stateToTexelComponents(InitializedState.Zero),
-      [InitializedState.Canary]: stateToTexelComponents(InitializedState.Canary)
-    };
-  }
-
-  get params() {
-    return super.params;
-  }
-
-  get textureWidth() {
-    let width = 1 << this.params.mipLevelCount;
-
-    if (this.params.nonPowerOfTwo) {
-      width = 2 * width - 1;
-    }
-
-    return width;
-  }
-
-  get textureHeight() {
-    let height = 1 << this.params.mipLevelCount;
-
-    if (this.params.nonPowerOfTwo) {
-      height = 2 * height - 1;
-    }
-
-    return height;
-  } // Used to iterate subresources and check that their uninitialized contents are zero when accessed
-
-
-  *iterateUninitializedSubresources() {
-    for (const mipRange of kUninitializedMipRangesToTest[this.params.mipLevelCount]) {
-      for (const sliceRange of kUninitializedSliceRangesToTest[this.params.sliceCount]) {
-        yield new SubresourceRange({
-          mipRange,
-          sliceRange
-        });
-      }
-    }
-  } // Used to iterate and initialize other subresources not checked for zero-initialization.
-  // Zero-initialization of uninitialized subresources should not have side effects on already
-  // initialized subresources.
-
-
-  *iterateInitializedSubresources() {
-    const uninitialized = new Array(this.params.mipLevelCount);
-
-    for (let level = 0; level < uninitialized.length; ++level) {
-      uninitialized[level] = new Array(this.params.sliceCount);
-    }
-
-    for (const subresources of this.iterateUninitializedSubresources()) {
-      for (const {
-        level,
-        slice
-      } of subresources.each()) {
-        uninitialized[level][slice] = true;
-      }
-    }
-
-    for (let level = 0; level < uninitialized.length; ++level) {
-      for (let slice = 0; slice < uninitialized[level].length; ++slice) {
-        if (!uninitialized[level][slice]) {
-          yield new SubresourceRange({
-            mipRange: {
-              begin: level,
-              count: 1
-            },
-            sliceRange: {
-              begin: slice,
-              count: 1
-            }
-          });
-        }
-      }
-    }
-  }
-
-  *generateTextureViewDescriptorsForRendering(aspect, subresourceRange) {
-    const viewDescriptor = {
-      dimension: '2d',
-      aspect
-    };
-
-    if (subresourceRange === undefined) {
-      return viewDescriptor;
-    }
-
-    for (const {
-      level,
-      slice
-    } of subresourceRange.each()) {
-      yield { ...viewDescriptor,
-        baseMipLevel: level,
-        mipLevelCount: 1,
-        baseArrayLayer: slice,
-        arrayLayerCount: 1
-      };
-    }
-  }
-
-  initializeWithStoreOp(state, texture, subresourceRange) {
-    const commandEncoder = this.device.createCommandEncoder();
-
-    for (const viewDescriptor of this.generateTextureViewDescriptorsForRendering(this.params.aspect, subresourceRange)) {
-      if (kTextureFormatInfo[this.params.format].color) {
-        commandEncoder.beginRenderPass({
-          colorAttachments: [{
-            attachment: texture.createView(viewDescriptor),
-            storeOp: 'store',
-            loadValue: initializedStateAsColor(state, this.params.format)
-          }]
-        }).endPass();
-      } else {
-        commandEncoder.beginRenderPass({
-          colorAttachments: [],
-          depthStencilAttachment: {
-            attachment: texture.createView(viewDescriptor),
-            depthStoreOp: 'store',
-            depthLoadValue: initializedStateAsDepth(state),
-            stencilStoreOp: 'store',
-            stencilLoadValue: initializedStateAsStencil(state)
-          }
-        }).endPass();
-      }
-    }
-
-    this.queue.submit([commandEncoder.finish()]);
-  }
-
-  initializeWithCopy(texture, state, subresourceRange) {
-    if (this.params.dimension === '1d' || this.params.dimension === '3d') {
-      // TODO: https://github.com/gpuweb/gpuweb/issues/69
-      // Copies with 1D and 3D textures are not yet specified
-      unreachable();
-    }
-
-    const firstSubresource = subresourceRange.each().next().value;
-    assert(typeof firstSubresource !== 'undefined');
-    const largestWidth = this.textureWidth >> firstSubresource.level;
-    const largestHeight = this.textureHeight >> firstSubresource.level;
-    const texelData = new Uint8Array(getTexelDataRepresentation(this.params.format).getBytes(this.stateToTexelComponents[state]));
-    const {
-      buffer,
-      bytesPerRow,
-      rowsPerImage
-    } = createTextureUploadBuffer(texelData, this.device, this.params.format, this.params.dimension, [largestWidth, largestHeight, 1]);
-    const commandEncoder = this.device.createCommandEncoder();
-
-    for (const {
-      level,
-      slice
-    } of subresourceRange.each()) {
-      const width = this.textureWidth >> level;
-      const height = this.textureHeight >> level;
-      commandEncoder.copyBufferToTexture({
-        buffer,
-        bytesPerRow,
-        rowsPerImage
-      }, {
-        texture,
-        mipLevel: level,
-        arrayLayer: slice
-      }, {
-        width,
-        height,
-        depth: 1
-      });
-    }
-
-    this.queue.submit([commandEncoder.finish()]);
-    buffer.destroy();
-  }
-
-  initializeTexture(texture, state, subresourceRange) {
-    if (this.params.sampleCount > 1 || !kTextureFormatInfo[this.params.format].copyable) {
-      // Copies to multisampled textures not yet specified.
-      // Use a storeOp for now.
-      assert(kTextureFormatInfo[this.params.format].renderable);
-      this.initializeWithStoreOp(state, texture, subresourceRange);
-    } else {
-      this.initializeWithCopy(texture, state, subresourceRange);
-    }
-  }
-
-  discardTexture(texture, subresourceRange) {
-    const commandEncoder = this.device.createCommandEncoder();
-
-    for (const desc of this.generateTextureViewDescriptorsForRendering(this.params.aspect, subresourceRange)) {
-      if (kTextureFormatInfo[this.params.format].color) {
-        commandEncoder.beginRenderPass({
-          colorAttachments: [{
-            attachment: texture.createView(desc),
-            storeOp: 'clear',
-            loadValue: 'load'
-          }]
-        }).endPass();
-      } else {
-        commandEncoder.beginRenderPass({
-          colorAttachments: [],
-          depthStencilAttachment: {
-            attachment: texture.createView(desc),
-            depthStoreOp: 'clear',
-            depthLoadValue: 'load',
-            stencilStoreOp: 'clear',
-            stencilLoadValue: 'load'
-          }
-        }).endPass();
-      }
-    }
-
-    this.queue.submit([commandEncoder.finish()]);
-  }
-
-  static generateParams(readMethods) {
-    return (// TODO: Consider making a list of "valid" texture descriptors in capability_info.
-      params().combine(poptions('format', kTextureFormats)).combine(poptions('aspect', kTextureAspects)).unless(({
-        format,
-        aspect
-      }) => aspect === 'depth-only' && !kTextureFormatInfo[format].depth || aspect === 'stencil-only' && !kTextureFormatInfo[format].stencil).combine(poptions('mipLevelCount', kMipLevelCounts)).combine(poptions('sampleCount', kSampleCounts)) // Multisampled textures may only have one mip
-      .unless(({
-        sampleCount,
-        mipLevelCount
-      }) => sampleCount > 1 && mipLevelCount > 1).combine(poptions('uninitializeMethod', kUninitializeMethods)).combine(poptions('readMethod', readMethods)).unless(({
-        readMethod,
-        format
-      }) => // It doesn't make sense to copy from a packed depth format.
-      // This is not specified yet, but it will probably be disallowed as the bits may
-      // be vendor-specific.
-      // TODO: Test copying out of the stencil aspect.
-      (readMethod === ReadMethod.CopyToBuffer || readMethod === ReadMethod.CopyToTexture) && (format === 'depth24plus' || format === 'depth24plus-stencil8')).unless(({
-        readMethod,
-        format
-      }) => readMethod === ReadMethod.DepthTest && !kTextureFormatInfo[format].depth || readMethod === ReadMethod.StencilTest && !kTextureFormatInfo[format].stencil || readMethod === ReadMethod.ColorBlending && !kTextureFormatInfo[format].color || // TODO: Test with depth sampling
-      readMethod === ReadMethod.Sample && kTextureFormatInfo[format].depth).unless(({
-        readMethod,
-        sampleCount
-      }) => // We can only read from multisampled textures by sampling.
-      sampleCount > 1 && (readMethod === ReadMethod.CopyToBuffer || readMethod === ReadMethod.CopyToTexture)).combine(kCreationSizes) // Multisampled 3D / 2D array textures not supported.
-      .unless(({
-        sampleCount,
-        sliceCount
-      }) => sampleCount > 1 && sliceCount > 1).filter(({
-        format,
-        sampleCount,
-        uninitializeMethod,
-        readMethod
-      }) => {
-        const usage = getRequiredTextureUsage(format, sampleCount, uninitializeMethod, readMethod);
-
-        if (usage & GPUTextureUsage.OUTPUT_ATTACHMENT && !kTextureFormatInfo[format].renderable) {
-          return false;
-        }
-
-        if (usage & GPUTextureUsage.STORAGE && !kTextureFormatInfo[format].storage) {
-          return false;
-        }
-
-        return true;
-      }).combine(pbool('nonPowerOfTwo'))
-    );
-  }
-
-  run() {
-    const {
-      format,
-      dimension,
-      mipLevelCount,
-      sliceCount,
-      sampleCount,
-      uninitializeMethod,
-      readMethod
-    } = this.params;
-    const usage = getRequiredTextureUsage(format, sampleCount, uninitializeMethod, readMethod);
-    const texture = this.device.createTexture({
-      size: [this.textureWidth, this.textureHeight, sliceCount],
-      format,
-      dimension,
-      usage,
-      mipLevelCount,
-      sampleCount
-    }); // Initialize some subresources with canary values
-
-    for (const subresourceRange of this.iterateInitializedSubresources()) {
-      this.initializeTexture(texture, InitializedState.Canary, subresourceRange);
-    }
-
-    switch (uninitializeMethod) {
-      case UninitializeMethod.Creation:
-        break;
-
-      case UninitializeMethod.StoreOpClear:
-        // Initialize the rest of the resources.
-        for (const subresourceRange of this.iterateUninitializedSubresources()) {
-          this.initializeTexture(texture, InitializedState.Canary, subresourceRange);
-        } // Then use a store op to discard their contents.
-
-
-        for (const subresourceRange of this.iterateUninitializedSubresources()) {
-          this.discardTexture(texture, subresourceRange);
-        }
-
-        break;
-
-      default:
-        unreachable();
-    } // Check that all uninitialized resources are zero.
-
-
-    for (const subresourceRange of this.iterateUninitializedSubresources()) {
-      this.checkContents(texture, InitializedState.Zero, subresourceRange);
-    } // Check the all other resources are unchanged.
-
-
-    for (const subresourceRange of this.iterateInitializedSubresources()) {
-      this.checkContents(texture, InitializedState.Canary, subresourceRange);
-    }
-  }
-
-}
-//# sourceMappingURL=texture_zero_init_test.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroup.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroup.spec.js
deleted file mode 100644
index 5deed893d5e..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroup.spec.js
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-createBindGroup validation tests.
-`;
-import { poptions, params } from '../../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { unreachable } from '../../../common/framework/util/util.js';
-import { kBindingTypes, kBindingTypeInfo, kBindableResources, kTextureUsages, kTextureBindingTypes, kTextureBindingTypeInfo } from '../../capability_info.js';
-import { ValidationTest } from './validation_test.js';
-
-function clone(descriptor) {
-  return JSON.parse(JSON.stringify(descriptor));
-}
-
-export const g = makeTestGroup(ValidationTest);
-g.test('binding_count_mismatch').fn(async t => {
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.COMPUTE,
-      type: 'storage-buffer'
-    }]
-  });
-  const goodDescriptor = {
-    entries: [{
-      binding: 0,
-      resource: {
-        buffer: t.getStorageBuffer()
-      }
-    }],
-    layout: bindGroupLayout
-  }; // Control case
-
-  t.device.createBindGroup(goodDescriptor); // Another binding is not expected.
-
-  const badDescriptor = {
-    entries: [{
-      binding: 0,
-      resource: {
-        buffer: t.getStorageBuffer()
-      }
-    }, // Another binding is added.
-    {
-      binding: 1,
-      resource: {
-        buffer: t.getStorageBuffer()
-      }
-    }],
-    layout: bindGroupLayout
-  };
-  t.expectValidationError(() => {
-    t.device.createBindGroup(badDescriptor);
-  });
-});
-g.test('binding_must_be_present_in_layout').fn(async t => {
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.COMPUTE,
-      type: 'storage-buffer'
-    }]
-  });
-  const goodDescriptor = {
-    entries: [{
-      binding: 0,
-      resource: {
-        buffer: t.getStorageBuffer()
-      }
-    }],
-    layout: bindGroupLayout
-  }; // Control case
-
-  t.device.createBindGroup(goodDescriptor); // Binding index 0 must be present.
-
-  const badDescriptor = {
-    entries: [{
-      binding: 1,
-      resource: {
-        buffer: t.getStorageBuffer()
-      }
-    }],
-    layout: bindGroupLayout
-  };
-  t.expectValidationError(() => {
-    t.device.createBindGroup(badDescriptor);
-  });
-});
-g.test('buffer_binding_must_contain_exactly_one_buffer_of_its_type').params(params().combine(poptions('bindingType', kBindingTypes)).combine(poptions('resourceType', kBindableResources))).fn(t => {
-  const {
-    bindingType,
-    resourceType
-  } = t.params;
-  const info = kBindingTypeInfo[bindingType];
-  const storageTextureFormat = info.resource === 'storageTex' ? 'rgba8unorm' : undefined;
-  const layout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.COMPUTE,
-      type: bindingType,
-      storageTextureFormat
-    }]
-  });
-  const resource = t.getBindingResource(resourceType);
-  const resourceBindingMatches = info.resource === resourceType;
-  t.expectValidationError(() => {
-    t.device.createBindGroup({
-      layout,
-      entries: [{
-        binding: 0,
-        resource
-      }]
-    });
-  }, !resourceBindingMatches);
-});
-g.test('texture_binding_must_have_correct_usage').params(params().combine(poptions('type', kTextureBindingTypes)).combine(poptions('usage', kTextureUsages))).fn(async t => {
-  const {
-    type,
-    usage
-  } = t.params;
-  const info = kTextureBindingTypeInfo[type];
-  const storageTextureFormat = info.resource === 'storageTex' ? 'rgba8unorm' : undefined;
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.FRAGMENT,
-      type,
-      storageTextureFormat
-    }]
-  });
-  const descriptor = {
-    size: {
-      width: 16,
-      height: 16,
-      depth: 1
-    },
-    format: 'rgba8unorm',
-    usage
-  };
-  const shouldError = usage !== info.usage;
-  t.expectValidationError(() => {
-    t.device.createBindGroup({
-      entries: [{
-        binding: 0,
-        resource: t.device.createTexture(descriptor).createView()
-      }],
-      layout: bindGroupLayout
-    });
-  }, shouldError);
-});
-g.test('texture_must_have_correct_component_type').params(poptions('textureComponentType', ['float', 'sint', 'uint'])).fn(async t => {
-  const {
-    textureComponentType
-  } = t.params;
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.FRAGMENT,
-      type: 'sampled-texture',
-      textureComponentType
-    }]
-  }); // TODO: Test more texture component types.
-
-  let format;
-
-  if (textureComponentType === 'float') {
-    format = 'r8unorm';
-  } else if (textureComponentType === 'sint') {
-    format = 'r8sint';
-  } else if (textureComponentType === 'uint') {
-    format = 'r8uint';
-  } else {
-    unreachable('Unexpected texture component type');
-  }
-
-  const goodDescriptor = {
-    size: {
-      width: 16,
-      height: 16,
-      depth: 1
-    },
-    format,
-    usage: GPUTextureUsage.SAMPLED
-  }; // Control case
-
-  t.device.createBindGroup({
-    entries: [{
-      binding: 0,
-      resource: t.device.createTexture(goodDescriptor).createView()
-    }],
-    layout: bindGroupLayout
-  });
-
-  function* mismatchedTextureFormats() {
-    if (textureComponentType !== 'float') {
-      yield 'r8unorm';
-    }
-
-    if (textureComponentType !== 'sint') {
-      yield 'r8sint';
-    }
-
-    if (textureComponentType !== 'uint') {
-      yield 'r8uint';
-    }
-  } // Mismatched texture binding formats are not valid.
-
-
-  for (const mismatchedTextureFormat of mismatchedTextureFormats()) {
-    const badDescriptor = clone(goodDescriptor);
-    badDescriptor.format = mismatchedTextureFormat;
-    t.expectValidationError(() => {
-      t.device.createBindGroup({
-        entries: [{
-          binding: 0,
-          resource: t.device.createTexture(badDescriptor).createView()
-        }],
-        layout: bindGroupLayout
-      });
-    });
-  }
-}); // TODO: Write test for all dimensions.
-
-g.test('texture_must_have_correct_dimension').fn(async t => {
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.FRAGMENT,
-      type: 'sampled-texture',
-      viewDimension: '2d'
-    }]
-  });
-  const goodDescriptor = {
-    size: {
-      width: 16,
-      height: 16,
-      depth: 1
-    },
-    format: 'rgba8unorm',
-    usage: GPUTextureUsage.SAMPLED
-  }; // Control case
-
-  t.device.createBindGroup({
-    entries: [{
-      binding: 0,
-      resource: t.device.createTexture(goodDescriptor).createView()
-    }],
-    layout: bindGroupLayout
-  }); // Mismatched texture binding formats are not valid.
-
-  const badDescriptor = clone(goodDescriptor);
-  badDescriptor.size.depth = 2;
-  t.expectValidationError(() => {
-    t.device.createBindGroup({
-      entries: [{
-        binding: 0,
-        resource: t.device.createTexture(badDescriptor).createView()
-      }],
-      layout: bindGroupLayout
-    });
-  });
-});
-g.test('buffer_offset_and_size_for_bind_groups_match').params([{
-  offset: 0,
-  size: 512,
-  _success: true
-}, // offset 0 is valid
-{
-  offset: 256,
-  size: 256,
-  _success: true
-}, // offset 256 (aligned) is valid
-// Touching the end of the buffer
-{
-  offset: 0,
-  size: 1024,
-  _success: true
-}, {
-  offset: 0,
-  size: undefined,
-  _success: true
-}, {
-  offset: 256 * 3,
-  size: 256,
-  _success: true
-}, {
-  offset: 256 * 3,
-  size: undefined,
-  _success: true
-}, // Zero-sized bindings
-{
-  offset: 0,
-  size: 0,
-  _success: true
-}, {
-  offset: 256,
-  size: 0,
-  _success: true
-}, {
-  offset: 1024,
-  size: 0,
-  _success: true
-}, {
-  offset: 1024,
-  size: undefined,
-  _success: true
-}, // Unaligned buffer offset is invalid
-{
-  offset: 1,
-  size: 256,
-  _success: false
-}, {
-  offset: 1,
-  size: undefined,
-  _success: false
-}, {
-  offset: 128,
-  size: 256,
-  _success: false
-}, {
-  offset: 255,
-  size: 256,
-  _success: false
-}, // Out-of-bounds
-{
-  offset: 256 * 5,
-  size: 0,
-  _success: false
-}, // offset is OOB
-{
-  offset: 0,
-  size: 256 * 5,
-  _success: false
-}, // size is OOB
-{
-  offset: 1024,
-  size: 1,
-  _success: false
-} // offset+size is OOB
-]).fn(async t => {
-  const {
-    offset,
-    size,
-    _success
-  } = t.params;
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.COMPUTE,
-      type: 'storage-buffer'
-    }]
-  });
-  const buffer = t.device.createBuffer({
-    size: 1024,
-    usage: GPUBufferUsage.STORAGE
-  });
-  const descriptor = {
-    entries: [{
-      binding: 0,
-      resource: {
-        buffer,
-        offset,
-        size
-      }
-    }],
-    layout: bindGroupLayout
-  };
-
-  if (_success) {
-    // Control case
-    t.device.createBindGroup(descriptor);
-  } else {
-    // Buffer offset and/or size don't match in bind groups.
-    t.expectValidationError(() => {
-      t.device.createBindGroup(descriptor);
-    });
-  }
-});
-//# sourceMappingURL=createBindGroup.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroupLayout.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroupLayout.spec.js
deleted file mode 100644
index 2fec032c178..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroupLayout.spec.js
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-createBindGroupLayout validation tests.
-`;
-import { poptions, params } from '../../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { kBindingTypeInfo, kBindingTypes, kMaxBindingsPerBindGroup, kShaderStages } from '../../capability_info.js';
-import { ValidationTest } from './validation_test.js';
-
-function clone(descriptor) {
-  return JSON.parse(JSON.stringify(descriptor));
-}
-
-export const g = makeTestGroup(ValidationTest);
-g.test('some_binding_index_was_specified_more_than_once').fn(async t => {
-  const goodDescriptor = {
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.COMPUTE,
-      type: 'storage-buffer'
-    }, {
-      binding: 1,
-      visibility: GPUShaderStage.COMPUTE,
-      type: 'storage-buffer'
-    }]
-  }; // Control case
-
-  t.device.createBindGroupLayout(goodDescriptor);
-  const badDescriptor = clone(goodDescriptor);
-  badDescriptor.entries[1].binding = 0; // Binding index 0 can't be specified twice.
-
-  t.expectValidationError(() => {
-    t.device.createBindGroupLayout(badDescriptor);
-  });
-});
-g.test('visibility_of_bindings_can_be_0').fn(async t => {
-  t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: 0,
-      type: 'storage-buffer'
-    }]
-  });
-});
-g.test('number_of_dynamic_buffers_exceeds_the_maximum_value').params([{
-  type: 'storage-buffer',
-  maxDynamicBufferCount: 4
-}, {
-  type: 'uniform-buffer',
-  maxDynamicBufferCount: 8
-}]).fn(async t => {
-  const {
-    type,
-    maxDynamicBufferCount
-  } = t.params;
-  const maxDynamicBufferBindings = [];
-
-  for (let i = 0; i < maxDynamicBufferCount; i++) {
-    maxDynamicBufferBindings.push({
-      binding: i,
-      visibility: GPUShaderStage.COMPUTE,
-      type,
-      hasDynamicOffset: true
-    });
-  }
-
-  const goodDescriptor = {
-    entries: [...maxDynamicBufferBindings, {
-      binding: maxDynamicBufferBindings.length,
-      visibility: GPUShaderStage.COMPUTE,
-      type,
-      hasDynamicOffset: false
-    }]
-  }; // Control case
-
-  t.device.createBindGroupLayout(goodDescriptor); // Dynamic buffers exceed maximum in a bind group layout.
-
-  const badDescriptor = clone(goodDescriptor);
-  badDescriptor.entries[maxDynamicBufferCount].hasDynamicOffset = true;
-  t.expectValidationError(() => {
-    t.device.createBindGroupLayout(badDescriptor);
-  });
-});
-g.test('dynamic_set_to_true_is_allowed_only_for_buffers').params(poptions('type', kBindingTypes)).fn(async t => {
-  const {
-    type
-  } = t.params;
-  const success = kBindingTypeInfo[type].perPipelineLimitClass.maxDynamic > 0;
-  const descriptor = {
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.FRAGMENT,
-      type,
-      hasDynamicOffset: true
-    }]
-  };
-  t.expectValidationError(() => {
-    t.device.createBindGroupLayout(descriptor);
-  }, !success);
-}); // One bind group layout will be filled with kPerStageBindingLimit[...] of the type |type|.
-// For each item in the array returned here, a case will be generated which tests a pipeline
-// layout with one extra bind group layout with one extra binding. That extra binding will have:
-//
-//   - If extraTypeSame, any of the binding types which counts toward the same limit as |type|.
-//     (i.e. 'storage-buffer' <-> 'readonly-storage-buffer').
-//   - Otherwise, an arbitrary other type.
-
-function* pickExtraBindingTypes(bindingType, extraTypeSame) {
-  const info = kBindingTypeInfo[bindingType];
-
-  if (extraTypeSame) {
-    for (const extraBindingType of kBindingTypes) {
-      if (info.perStageLimitClass.class === kBindingTypeInfo[extraBindingType].perStageLimitClass.class) {
-        yield extraBindingType;
-      }
-    }
-  } else {
-    yield info.perStageLimitClass.class === 'sampler' ? 'sampled-texture' : 'sampler';
-  }
-}
-
-const kCasesForMaxResourcesPerStageTests = params().combine(poptions('maxedType', kBindingTypes)).combine(poptions('maxedVisibility', kShaderStages)).filter(p => (kBindingTypeInfo[p.maxedType].validStages & p.maxedVisibility) !== 0).expand(function* (p) {
-  for (const extraTypeSame of [true, false]) {
-    yield* poptions('extraType', pickExtraBindingTypes(p.maxedType, extraTypeSame));
-  }
-}).combine(poptions('extraVisibility', kShaderStages)).filter(p => (kBindingTypeInfo[p.extraType].validStages & p.extraVisibility) !== 0); // Should never fail unless kMaxBindingsPerBindGroup is exceeded, because the validation for
-// resources-of-type-per-stage is in pipeline layout creation.
-
-g.test('max_resources_per_stage,in_bind_group_layout').params(kCasesForMaxResourcesPerStageTests).fn(async t => {
-  const {
-    maxedType,
-    extraType,
-    maxedVisibility,
-    extraVisibility
-  } = t.params;
-  const maxedTypeInfo = kBindingTypeInfo[maxedType];
-  const maxedCount = maxedTypeInfo.perStageLimitClass.max;
-  const extraTypeInfo = kBindingTypeInfo[extraType];
-  const maxResourceBindings = [];
-
-  for (let i = 0; i < maxedCount; i++) {
-    maxResourceBindings.push({
-      binding: i,
-      visibility: maxedVisibility,
-      type: maxedType,
-      storageTextureFormat: maxedTypeInfo.resource === 'storageTex' ? 'rgba8unorm' : undefined
-    });
-  }
-
-  const goodDescriptor = {
-    entries: maxResourceBindings
-  }; // Control
-
-  t.device.createBindGroupLayout(goodDescriptor);
-  const newDescriptor = clone(goodDescriptor);
-  newDescriptor.entries.push({
-    binding: maxedCount,
-    visibility: extraVisibility,
-    type: extraType,
-    storageTextureFormat: extraTypeInfo.resource === 'storageTex' ? 'rgba8unorm' : undefined
-  });
-  const shouldError = maxedCount >= kMaxBindingsPerBindGroup;
-  t.expectValidationError(() => {
-    t.device.createBindGroupLayout(newDescriptor);
-  }, shouldError);
-}); // One pipeline layout can have a maximum number of each type of binding *per stage* (which is
-// different for each type). Test that the max works, then add one more binding of same-or-different
-// type and same-or-different visibility.
-
-g.test('max_resources_per_stage,in_pipeline_layout').params(kCasesForMaxResourcesPerStageTests).fn(async t => {
-  const {
-    maxedType,
-    extraType,
-    maxedVisibility,
-    extraVisibility
-  } = t.params;
-  const maxedTypeInfo = kBindingTypeInfo[maxedType];
-  const maxedCount = maxedTypeInfo.perStageLimitClass.max;
-  const extraTypeInfo = kBindingTypeInfo[extraType];
-  const maxResourceBindings = [];
-
-  for (let i = 0; i < maxedCount; i++) {
-    maxResourceBindings.push({
-      binding: i,
-      visibility: maxedVisibility,
-      type: maxedType,
-      storageTextureFormat: maxedTypeInfo.resource === 'storageTex' ? 'rgba8unorm' : undefined
-    });
-  }
-
-  const goodLayout = t.device.createBindGroupLayout({
-    entries: maxResourceBindings
-  }); // Control
-
-  t.device.createPipelineLayout({
-    bindGroupLayouts: [goodLayout]
-  });
-  const extraLayout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: extraVisibility,
-      type: extraType,
-      storageTextureFormat: extraTypeInfo.resource === 'storageTex' ? 'rgba8unorm' : undefined
-    }]
-  }); // Some binding types use the same limit, e.g. 'storage-buffer' and 'readonly-storage-buffer'.
-
-  const newBindingCountsTowardSamePerStageLimit = (maxedVisibility & extraVisibility) !== 0 && kBindingTypeInfo[maxedType].perStageLimitClass.class === kBindingTypeInfo[extraType].perStageLimitClass.class;
-  const layoutExceedsPerStageLimit = newBindingCountsTowardSamePerStageLimit;
-  t.expectValidationError(() => {
-    t.device.createPipelineLayout({
-      bindGroupLayouts: [goodLayout, extraLayout]
-    });
-  }, layoutExceedsPerStageLimit);
-});
-//# sourceMappingURL=createBindGroupLayout.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createPipelineLayout.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createPipelineLayout.spec.js
deleted file mode 100644
index 4e293fa725d..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createPipelineLayout.spec.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-createPipelineLayout validation tests.
-`;
-import { pbool, poptions, params } from '../../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { kBindingTypeInfo, kBindingTypes, kShaderStageCombinations } from '../../capability_info.js';
-import { ValidationTest } from './validation_test.js';
-
-function clone(descriptor) {
-  return JSON.parse(JSON.stringify(descriptor));
-}
-
-export const g = makeTestGroup(ValidationTest);
-g.test('number_of_dynamic_buffers_exceeds_the_maximum_value').params(params().combine(poptions('visibility', [0, 2, 4, 6])).combine(poptions('type', ['uniform-buffer', 'storage-buffer', 'readonly-storage-buffer']))).fn(async t => {
-  const {
-    type,
-    visibility
-  } = t.params;
-  const {
-    maxDynamic
-  } = kBindingTypeInfo[type].perPipelineLimitClass;
-  const maxDynamicBufferBindings = [];
-
-  for (let binding = 0; binding < maxDynamic; binding++) {
-    maxDynamicBufferBindings.push({
-      binding,
-      visibility,
-      type,
-      hasDynamicOffset: true
-    });
-  }
-
-  const maxDynamicBufferBindGroupLayout = t.device.createBindGroupLayout({
-    entries: maxDynamicBufferBindings
-  });
-  const goodDescriptor = {
-    entries: [{
-      binding: 0,
-      visibility,
-      type,
-      hasDynamicOffset: false
-    }]
-  };
-  const goodPipelineLayoutDescriptor = {
-    bindGroupLayouts: [maxDynamicBufferBindGroupLayout, t.device.createBindGroupLayout(goodDescriptor)]
-  }; // Control case
-
-  t.device.createPipelineLayout(goodPipelineLayoutDescriptor); // Check dynamic buffers exceed maximum in pipeline layout.
-
-  const badDescriptor = clone(goodDescriptor);
-  badDescriptor.entries[0].hasDynamicOffset = true;
-  const badPipelineLayoutDescriptor = {
-    bindGroupLayouts: [maxDynamicBufferBindGroupLayout, t.device.createBindGroupLayout(badDescriptor)]
-  };
-  t.expectValidationError(() => {
-    t.device.createPipelineLayout(badPipelineLayoutDescriptor);
-  });
-});
-g.test('visibility_and_dynamic_offsets').params(params().combine(poptions('type', kBindingTypes)).combine(pbool('hasDynamicOffset')).combine(poptions('visibility', kShaderStageCombinations))).fn(t => {
-  const {
-    type,
-    hasDynamicOffset,
-    visibility
-  } = t.params;
-  const info = kBindingTypeInfo[type];
-  const descriptor = {
-    entries: [{
-      binding: 0,
-      visibility,
-      type,
-      hasDynamicOffset
-    }]
-  };
-  const supportsDynamicOffset = kBindingTypeInfo[type].perPipelineLimitClass.maxDynamic > 0;
-  let success = true;
-  if (!supportsDynamicOffset && hasDynamicOffset) success = false;
-  if ((visibility & ~info.validStages) !== 0) success = false;
-  t.expectValidationError(() => {
-    t.device.createPipelineLayout({
-      bindGroupLayouts: [t.device.createBindGroupLayout(descriptor)]
-    });
-  }, !success);
-});
-g.test('number_of_bind_group_layouts_exceeds_the_maximum_value').fn(async t => {
-  const bindGroupLayoutDescriptor = {
-    entries: []
-  }; // 4 is the maximum number of bind group layouts.
-
-  const maxBindGroupLayouts = [1, 2, 3, 4].map(() => t.device.createBindGroupLayout(bindGroupLayoutDescriptor));
-  const goodPipelineLayoutDescriptor = {
-    bindGroupLayouts: maxBindGroupLayouts
-  }; // Control case
-
-  t.device.createPipelineLayout(goodPipelineLayoutDescriptor); // Check bind group layouts exceed maximum in pipeline layout.
-
-  const badPipelineLayoutDescriptor = {
-    bindGroupLayouts: [...maxBindGroupLayouts, t.device.createBindGroupLayout(bindGroupLayoutDescriptor)]
-  };
-  t.expectValidationError(() => {
-    t.device.createPipelineLayout(badPipelineLayoutDescriptor);
-  });
-});
-//# sourceMappingURL=createPipelineLayout.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createTexture.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createTexture.spec.js
deleted file mode 100644
index 2ef8d195233..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createTexture.spec.js
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-createTexture validation tests.
-`;
-import { poptions } from '../../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { kTextureFormatInfo, kTextureFormats } from '../../capability_info.js';
-import { ValidationTest } from './validation_test.js';
-
-class F extends ValidationTest {
-  getDescriptor(options = {}) {
-    const {
-      width = 32,
-      height = 32,
-      arrayLayerCount = 1,
-      mipLevelCount = 1,
-      sampleCount = 1,
-      format = 'rgba8unorm'
-    } = options;
-    return {
-      size: {
-        width,
-        height,
-        depth: arrayLayerCount
-      },
-      mipLevelCount,
-      sampleCount,
-      dimension: '2d',
-      format,
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT | GPUTextureUsage.SAMPLED
-    };
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('validation_of_sampleCount').params([// TODO: Consider making a list of "valid"+"invalid" texture descriptors in capability_info.
-{
-  sampleCount: 0,
-  _success: false
-}, // sampleCount of 0 is not allowed
-{
-  sampleCount: 1,
-  _success: true
-}, // sampleCount of 1 is allowed
-{
-  sampleCount: 2,
-  _success: false
-}, // sampleCount of 2 is not allowed
-{
-  sampleCount: 3,
-  _success: false
-}, // sampleCount of 3 is not allowed
-{
-  sampleCount: 4,
-  _success: true
-}, // sampleCount of 4 is allowed
-{
-  sampleCount: 8,
-  _success: false
-}, // sampleCount of 8 is not allowed
-{
-  sampleCount: 16,
-  _success: false
-}, // sampleCount of 16 is not allowed
-{
-  sampleCount: 4,
-  mipLevelCount: 2,
-  _success: false
-}, // multisampled multi-level not allowed
-{
-  sampleCount: 4,
-  arrayLayerCount: 2,
-  _success: false
-} // multisampled multi-layer is not allowed
-]).fn(async t => {
-  const {
-    sampleCount,
-    mipLevelCount,
-    arrayLayerCount,
-    _success
-  } = t.params;
-  const descriptor = t.getDescriptor({
-    sampleCount,
-    mipLevelCount,
-    arrayLayerCount
-  });
-  t.expectValidationError(() => {
-    t.device.createTexture(descriptor);
-  }, !_success);
-});
-g.test('validation_of_mipLevelCount').params([{
-  width: 32,
-  height: 32,
-  mipLevelCount: 1,
-  _success: true
-}, // mipLevelCount of 1 is allowed
-{
-  width: 32,
-  height: 32,
-  mipLevelCount: 0,
-  _success: false
-}, // mipLevelCount of 0 is not allowed
-{
-  width: 32,
-  height: 32,
-  mipLevelCount: 6,
-  _success: true
-}, // full mip chains are allowed (Mip level sizes: 32, 16, 8, 4, 2, 1)
-{
-  width: 31,
-  height: 32,
-  mipLevelCount: 6,
-  _success: true
-}, // full mip chains are allowed (Mip level sizes: 31x32, 15x16, 7x8, 3x4, 1x2, 1x1)
-{
-  width: 32,
-  height: 31,
-  mipLevelCount: 6,
-  _success: true
-}, // full mip chains are allowed (Mip level sizes: 32x31, 16x15, 8x7, 4x3, 2x1, 1x1)
-{
-  width: 31,
-  height: 32,
-  mipLevelCount: 7,
-  _success: false
-}, // too big mip chains on width are disallowed (Mip level sizes: 31x32, 15x16, 7x8, 3x4, 1x2, 1x1, ?x?)
-{
-  width: 32,
-  height: 31,
-  mipLevelCount: 7,
-  _success: false
-}, // too big mip chains on height are disallowed (Mip level sizes: 32x31, 16x15, 8x7, 4x3, 2x1, 1x1, ?x?)
-{
-  width: 32,
-  height: 32,
-  mipLevelCount: 100,
-  _success: false
-}, // undefined shift check if miplevel is bigger than the integer bit width
-{
-  width: 32,
-  height: 8,
-  mipLevelCount: 6,
-  _success: true
-} // non square mip map halves the resolution until a 1x1 dimension. (Mip maps: 32 * 8, 16 * 4, 8 * 2, 4 * 1, 2 * 1, 1 * 1)
-]).fn(async t => {
-  const {
-    width,
-    height,
-    mipLevelCount,
-    _success
-  } = t.params;
-  const descriptor = t.getDescriptor({
-    width,
-    height,
-    mipLevelCount
-  });
-  t.expectValidationError(() => {
-    t.device.createTexture(descriptor);
-  }, !_success);
-});
-g.test('it_is_valid_to_destroy_a_texture').fn(t => {
-  const descriptor = t.getDescriptor();
-  const texture = t.device.createTexture(descriptor);
-  texture.destroy();
-});
-g.test('it_is_valid_to_destroy_a_destroyed_texture').fn(t => {
-  const descriptor = t.getDescriptor();
-  const texture = t.device.createTexture(descriptor);
-  texture.destroy();
-  texture.destroy();
-});
-g.test('it_is_invalid_to_submit_a_destroyed_texture_before_and_after_encode').params([{
-  destroyBeforeEncode: false,
-  destroyAfterEncode: false,
-  _success: true
-}, {
-  destroyBeforeEncode: true,
-  destroyAfterEncode: false,
-  _success: false
-}, {
-  destroyBeforeEncode: false,
-  destroyAfterEncode: true,
-  _success: false
-}]).fn(async t => {
-  const {
-    destroyBeforeEncode,
-    destroyAfterEncode,
-    _success
-  } = t.params;
-  const descriptor = t.getDescriptor();
-  const texture = t.device.createTexture(descriptor);
-  const textureView = texture.createView();
-
-  if (destroyBeforeEncode) {
-    texture.destroy();
-  }
-
-  const commandEncoder = t.device.createCommandEncoder();
-  const renderPass = commandEncoder.beginRenderPass({
-    colorAttachments: [{
-      attachment: textureView,
-      loadValue: {
-        r: 1.0,
-        g: 0.0,
-        b: 0.0,
-        a: 1.0
-      }
-    }]
-  });
-  renderPass.endPass();
-  const commandBuffer = commandEncoder.finish();
-
-  if (destroyAfterEncode) {
-    texture.destroy();
-  }
-
-  t.expectValidationError(() => {
-    t.queue.submit([commandBuffer]);
-  }, !_success);
-});
-g.test('it_is_invalid_to_have_an_output_attachment_texture_with_non_renderable_format').params(poptions('format', kTextureFormats)).fn(async t => {
-  const format = t.params.format;
-  const info = kTextureFormatInfo[format];
-  const descriptor = t.getDescriptor({
-    width: 1,
-    height: 1,
-    format
-  });
-  t.expectValidationError(() => {
-    t.device.createTexture(descriptor);
-  }, !info.renderable);
-}); // TODO: Add tests for compressed texture formats
-//# sourceMappingURL=createTexture.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createView.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createView.spec.js
deleted file mode 100644
index 3ad1ca97d7d..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createView.spec.js
+++ /dev/null
@@ -1,416 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-createView validation tests.
-`;
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js';
-const ARRAY_LAYER_COUNT_2D = 6;
-const MIP_LEVEL_COUNT = 6;
-const FORMAT = 'rgba8unorm';
-
-class F extends ValidationTest {
-  createTexture(options = {}) {
-    const {
-      width = 32,
-      height = 32,
-      arrayLayerCount = 1,
-      mipLevelCount = MIP_LEVEL_COUNT,
-      sampleCount = 1
-    } = options;
-    return this.device.createTexture({
-      size: {
-        width,
-        height,
-        depth: arrayLayerCount
-      },
-      mipLevelCount,
-      sampleCount,
-      dimension: '2d',
-      format: FORMAT,
-      usage: GPUTextureUsage.SAMPLED
-    });
-  }
-
-  getDescriptor(options = {}) {
-    const {
-      format = FORMAT,
-      dimension = '2d',
-      baseMipLevel = 0,
-      mipLevelCount = MIP_LEVEL_COUNT,
-      baseArrayLayer = 0,
-      arrayLayerCount = 1
-    } = options;
-    return {
-      format,
-      dimension,
-      baseMipLevel,
-      mipLevelCount,
-      baseArrayLayer,
-      arrayLayerCount
-    };
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('creating_texture_view_on_a_2D_non_array_texture').params([{
-  _success: true
-}, // default view works
-{
-  arrayLayerCount: 1,
-  _success: true
-}, // it is OK to create a 2D texture view on a 2D texture
-{
-  arrayLayerCount: 2,
-  _success: false
-}, // it is an error to view a layer past the end of the texture
-{
-  dimension: '2d-array',
-  arrayLayerCount: 1,
-  _success: true
-}, // it is OK to create a 1-layer 2D array texture view on a 2D texture
-// mip level is in range
-{
-  mipLevelCount: 1,
-  baseMipLevel: MIP_LEVEL_COUNT - 1,
-  _success: true
-}, {
-  mipLevelCount: 2,
-  baseMipLevel: MIP_LEVEL_COUNT - 2,
-  _success: true
-}, // baseMipLevel == k && mipLevelCount == 0 means to use levels k..end
-{
-  mipLevelCount: 0,
-  baseMipLevel: 0,
-  _success: true
-}, {
-  mipLevelCount: 0,
-  baseMipLevel: 1,
-  _success: true
-}, {
-  mipLevelCount: 0,
-  baseMipLevel: MIP_LEVEL_COUNT - 1,
-  _success: true
-}, {
-  mipLevelCount: 0,
-  baseMipLevel: MIP_LEVEL_COUNT,
-  _success: false
-}, // it is an error to make the mip level out of range
-{
-  mipLevelCount: MIP_LEVEL_COUNT + 1,
-  baseMipLevel: 0,
-  _success: false
-}, {
-  mipLevelCount: MIP_LEVEL_COUNT,
-  baseMipLevel: 1,
-  _success: false
-}, {
-  mipLevelCount: 2,
-  baseMipLevel: MIP_LEVEL_COUNT - 1,
-  _success: false
-}, {
-  mipLevelCount: 1,
-  baseMipLevel: MIP_LEVEL_COUNT,
-  _success: false
-}]).fn(async t => {
-  const {
-    dimension = '2d',
-    arrayLayerCount,
-    mipLevelCount,
-    baseMipLevel,
-    _success
-  } = t.params;
-  const texture = t.createTexture({
-    arrayLayerCount: 1
-  });
-  const descriptor = t.getDescriptor({
-    dimension,
-    arrayLayerCount,
-    mipLevelCount,
-    baseMipLevel
-  });
-  t.expectValidationError(() => {
-    texture.createView(descriptor);
-  }, !_success);
-});
-g.test('creating_texture_view_on_a_2D_array_texture').params([{
-  _success: true
-}, // default view works
-{
-  dimension: '2d',
-  arrayLayerCount: 1,
-  _success: true
-}, // it is OK to create a 2D texture view on a 2D array texture
-{
-  arrayLayerCount: ARRAY_LAYER_COUNT_2D,
-  _success: true
-}, // it is OK to create a 2D array texture view on a 2D array texture
-// baseArrayLayer == k && arrayLayerCount == 0 means to use layers k..end.
-{
-  arrayLayerCount: 0,
-  baseArrayLayer: 0,
-  _success: true
-}, {
-  arrayLayerCount: 0,
-  baseArrayLayer: 1,
-  _success: true
-}, {
-  arrayLayerCount: 0,
-  baseArrayLayer: ARRAY_LAYER_COUNT_2D - 1,
-  _success: true
-}, {
-  arrayLayerCount: 0,
-  baseArrayLayer: ARRAY_LAYER_COUNT_2D,
-  _success: false
-}, // It is an error for the array layer range of the view to exceed that of the texture
-{
-  arrayLayerCount: ARRAY_LAYER_COUNT_2D + 1,
-  baseArrayLayer: 0,
-  _success: false
-}, {
-  arrayLayerCount: ARRAY_LAYER_COUNT_2D,
-  baseArrayLayer: 1,
-  _success: false
-}, {
-  arrayLayerCount: 2,
-  baseArrayLayer: ARRAY_LAYER_COUNT_2D - 1,
-  _success: false
-}, {
-  arrayLayerCount: 1,
-  baseArrayLayer: ARRAY_LAYER_COUNT_2D,
-  _success: false
-}]).fn(async t => {
-  const {
-    dimension = '2d-array',
-    arrayLayerCount,
-    baseArrayLayer,
-    _success
-  } = t.params;
-  const texture = t.createTexture({
-    arrayLayerCount: ARRAY_LAYER_COUNT_2D
-  });
-  const descriptor = t.getDescriptor({
-    dimension,
-    arrayLayerCount,
-    baseArrayLayer
-  });
-  t.expectValidationError(() => {
-    texture.createView(descriptor);
-  }, !_success);
-});
-g.test('Using_defaults_validates_the_same_as_setting_values_for_more_than_1_array_layer').params([{
-  _success: true
-}, {
-  format: 'rgba8unorm',
-  _success: true
-}, {
-  format: 'r8unorm',
-  _success: false
-}, {
-  dimension: '2d-array',
-  _success: true
-}, {
-  dimension: '2d',
-  _success: false
-}, {
-  arrayLayerCount: ARRAY_LAYER_COUNT_2D,
-  _success: false
-}, // setting array layers to non-0 means the dimensionality will default to 2D so by itself it causes an error.
-{
-  arrayLayerCount: ARRAY_LAYER_COUNT_2D,
-  dimension: '2d-array',
-  _success: true
-}, {
-  arrayLayerCount: ARRAY_LAYER_COUNT_2D,
-  dimension: '2d-array',
-  mipLevelCount: MIP_LEVEL_COUNT,
-  _success: true
-}]).fn(async t => {
-  const {
-    format,
-    dimension,
-    arrayLayerCount,
-    mipLevelCount,
-    _success
-  } = t.params;
-  const texture = t.createTexture({
-    arrayLayerCount: ARRAY_LAYER_COUNT_2D
-  });
-  const descriptor = {
-    format,
-    dimension,
-    arrayLayerCount,
-    mipLevelCount
-  };
-  t.expectValidationError(() => {
-    texture.createView(descriptor);
-  }, !_success);
-});
-g.test('Using_defaults_validates_the_same_as_setting_values_for_only_1_array_layer').params([{
-  _success: true
-}, {
-  format: 'rgba8unorm',
-  _success: true
-}, {
-  format: 'r8unorm',
-  _success: false
-}, {
-  dimension: '2d-array',
-  _success: true
-}, {
-  dimension: '2d',
-  _success: true
-}, {
-  arrayLayerCount: 0,
-  _success: true
-}, {
-  arrayLayerCount: 1,
-  _success: true
-}, {
-  arrayLayerCount: 2,
-  _success: false
-}, {
-  mipLevelCount: MIP_LEVEL_COUNT,
-  _success: true
-}, {
-  mipLevelCount: 1,
-  _success: true
-}]).fn(async t => {
-  const {
-    format,
-    dimension,
-    arrayLayerCount,
-    mipLevelCount,
-    _success
-  } = t.params;
-  const texture = t.createTexture({
-    arrayLayerCount: 1
-  });
-  const descriptor = {
-    format,
-    dimension,
-    arrayLayerCount,
-    mipLevelCount
-  };
-  t.expectValidationError(() => {
-    texture.createView(descriptor);
-  }, !_success);
-});
-g.test('creating_cube_map_texture_view').params([{
-  dimension: 'cube',
-  arrayLayerCount: 6,
-  _success: true
-}, // it is OK to create a cube map texture view with arrayLayerCount == 6
-// it is an error to create a cube map texture view with arrayLayerCount != 6
-{
-  dimension: 'cube',
-  arrayLayerCount: 3,
-  _success: false
-}, {
-  dimension: 'cube',
-  arrayLayerCount: 7,
-  _success: false
-}, {
-  dimension: 'cube',
-  arrayLayerCount: 12,
-  _success: false
-}, {
-  dimension: 'cube',
-  _success: false
-}, {
-  dimension: 'cube-array',
-  arrayLayerCount: 12,
-  _success: true
-}, // it is OK to create a cube map array texture view with arrayLayerCount % 6 == 0
-// it is an error to create a cube map array texture view with arrayLayerCount % 6 != 0
-{
-  dimension: 'cube-array',
-  arrayLayerCount: 11,
-  _success: false
-}, {
-  dimension: 'cube-array',
-  arrayLayerCount: 13,
-  _success: false
-}]).fn(async t => {
-  const {
-    dimension = '2d-array',
-    arrayLayerCount,
-    _success
-  } = t.params;
-  const texture = t.createTexture({
-    arrayLayerCount: 16
-  });
-  const descriptor = t.getDescriptor({
-    dimension,
-    arrayLayerCount
-  });
-  t.expectValidationError(() => {
-    texture.createView(descriptor);
-  }, !_success);
-});
-g.test('creating_cube_map_texture_view_with_a_non_square_texture').params([{
-  dimension: 'cube',
-  arrayLayerCount: 6
-}, // it is an error to create a cube map texture view with width != height.
-{
-  dimension: 'cube-array',
-  arrayLayerCount: 12
-} // it is an error to create a cube map array texture view with width != height.
-]).fn(async t => {
-  const {
-    dimension,
-    arrayLayerCount
-  } = t.params;
-  const nonSquareTexture = t.createTexture({
-    arrayLayerCount: 18,
-    width: 32,
-    height: 16,
-    mipLevelCount: 5
-  });
-  const descriptor = t.getDescriptor({
-    dimension,
-    arrayLayerCount
-  });
-  t.expectValidationError(() => {
-    nonSquareTexture.createView(descriptor);
-  });
-}); // TODO: add more tests when rules are fully implemented.
-
-g.test('test_the_format_compatibility_rules_when_creating_a_texture_view').fn(async t => {
-  const texture = t.createTexture({
-    arrayLayerCount: 1
-  });
-  const descriptor = t.getDescriptor({
-    format: 'depth24plus-stencil8'
-  }); // it is invalid to create a view in depth-stencil format on a RGBA texture
-
-  t.expectValidationError(() => {
-    texture.createView(descriptor);
-  });
-});
-g.test('it_is_invalid_to_use_a_texture_view_created_from_a_destroyed_texture').fn(async t => {
-  const texture = t.createTexture({
-    arrayLayerCount: 1
-  });
-  const commandEncoder = t.device.createCommandEncoder();
-  const renderPass = commandEncoder.beginRenderPass({
-    colorAttachments: [{
-      attachment: texture.createView(),
-      loadValue: {
-        r: 1.0,
-        g: 0.0,
-        b: 0.0,
-        a: 1.0
-      }
-    }]
-  });
-  renderPass.endPass();
-  texture.destroy();
-  t.expectValidationError(() => {
-    commandEncoder.finish();
-  });
-}); // TODO: Add tests for TextureAspect
-//# sourceMappingURL=createView.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/error_scope.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/error_scope.spec.js
deleted file mode 100644
index 3edbec2dc41..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/error_scope.spec.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-export const description = `
-error scope validation tests.
-`;
-import { Fixture } from '../../../common/framework/fixture.js';
-import { getGPU } from '../../../common/framework/gpu/implementation.js';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { assert, raceWithRejectOnTimeout } from '../../../common/framework/util/util.js';
-
-class F extends Fixture {
-  constructor(...args) {
-    super(...args);
-
-    _defineProperty(this, "_device", undefined);
-  }
-
-  get device() {
-    assert(this._device !== undefined);
-    return this._device;
-  }
-
-  async init() {
-    super.init();
-    const gpu = getGPU();
-    const adapter = await gpu.requestAdapter();
-    this._device = await adapter.requestDevice();
-  }
-
-  createErrorBuffer() {
-    this.device.createBuffer({
-      size: 1024,
-      usage: 0xffff // Invalid GPUBufferUsage
-
-    }); // TODO: Remove when chrome does it automatically.
-
-    this.device.defaultQueue.submit([]);
-  } // Expect an uncapturederror event to occur. Note: this MUST be awaited, because
-  // otherwise it could erroneously pass by capturing an error from later in the test.
-
-
-  async expectUncapturedError(fn) {
-    return this.immediateAsyncExpectation(() => {
-      // TODO: Make arbitrary timeout value a test runner variable
-      const TIMEOUT_IN_MS = 1000;
-      const promise = new Promise(resolve => {
-        const eventListener = event => {
-          this.debug(`Got uncaptured error event with ${event.error}`);
-          resolve(event);
-        };
-
-        this.device.addEventListener('uncapturederror', eventListener, {
-          once: true
-        });
-      });
-      fn();
-      return raceWithRejectOnTimeout(promise, TIMEOUT_IN_MS, 'Timeout occurred waiting for uncaptured error');
-    });
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('simple_case_where_the_error_scope_catches_an_error').fn(async t => {
-  t.device.pushErrorScope('validation');
-  t.createErrorBuffer();
-  const error = await t.device.popErrorScope();
-  t.expect(error instanceof GPUValidationError);
-});
-g.test('errors_bubble_to_the_parent_scope_if_not_handled_by_the_current_scope').fn(async t => {
-  t.device.pushErrorScope('validation');
-  t.device.pushErrorScope('out-of-memory');
-  t.createErrorBuffer();
-  {
-    const error = await t.device.popErrorScope();
-    t.expect(error === null);
-  }
-  {
-    const error = await t.device.popErrorScope();
-    t.expect(error instanceof GPUValidationError);
-  }
-});
-g.test('if_an_error_scope_matches_an_error_it_does_not_bubble_to_the_parent_scope').fn(async t => {
-  t.device.pushErrorScope('validation');
-  t.device.pushErrorScope('validation');
-  t.createErrorBuffer();
-  {
-    const error = await t.device.popErrorScope();
-    t.expect(error instanceof GPUValidationError);
-  }
-  {
-    const error = await t.device.popErrorScope();
-    t.expect(error === null);
-  }
-});
-g.test('if_no_error_scope_handles_an_error_it_fires_an_uncapturederror_event').fn(async t => {
-  t.device.pushErrorScope('out-of-memory');
-  const uncapturedErrorEvent = await t.expectUncapturedError(() => {
-    t.createErrorBuffer();
-  });
-  t.expect(uncapturedErrorEvent.error instanceof GPUValidationError);
-  const error = await t.device.popErrorScope();
-  t.expect(error === null);
-});
-g.test('push,popping_sibling_error_scopes_must_be_balanced').fn(async t => {
-  {
-    const promise = t.device.popErrorScope();
-    t.shouldReject('OperationError', promise);
-  }
-  const promises = [];
-
-  for (let i = 0; i < 1000; i++) {
-    t.device.pushErrorScope('validation');
-    promises.push(t.device.popErrorScope());
-  }
-
-  const errors = await Promise.all(promises);
-  t.expect(errors.every(e => e === null));
-  {
-    const promise = t.device.popErrorScope();
-    t.shouldReject('OperationError', promise);
-  }
-});
-g.test('push,popping_nested_error_scopes_must_be_balanced').fn(async t => {
-  {
-    const promise = t.device.popErrorScope();
-    t.shouldReject('OperationError', promise);
-  }
-  const promises = [];
-
-  for (let i = 0; i < 1000; i++) {
-    t.device.pushErrorScope('validation');
-  }
-
-  for (let i = 0; i < 1000; i++) {
-    promises.push(t.device.popErrorScope());
-  }
-
-  const errors = await Promise.all(promises);
-  t.expect(errors.every(e => e === null));
-  {
-    const promise = t.device.popErrorScope();
-    t.shouldReject('OperationError', promise);
-  }
-});
-//# sourceMappingURL=error_scope.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/fences.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/fences.spec.js
deleted file mode 100644
index 2ab0691e3ce..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/fences.spec.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-fences validation tests.
-`;
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js';
-export const g = makeTestGroup(ValidationTest); // TODO: Remove if https://github.com/gpuweb/gpuweb/issues/377 is decided
-
-g.test('wait_on_a_fence_without_signaling_the_value_is_invalid').fn(async t => {
-  const fence = t.queue.createFence();
-  t.expectValidationError(() => {
-    const promise = fence.onCompletion(2);
-    t.shouldReject('OperationError', promise);
-  });
-}); // TODO: Remove if https://github.com/gpuweb/gpuweb/issues/377 is decided
-
-g.test('wait_on_a_fence_with_a_value_greater_than_signaled_value_is_invalid').fn(async t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 2);
-  t.expectValidationError(() => {
-    const promise = fence.onCompletion(3);
-    t.shouldReject('OperationError', promise);
-  });
-});
-g.test('signal_a_value_lower_than_signaled_value_is_invalid').fn(async t => {
-  const fence = t.queue.createFence({
-    initialValue: 1
-  });
-  t.expectValidationError(() => {
-    t.queue.signal(fence, 0);
-  });
-});
-g.test('signal_a_value_equal_to_signaled_value_is_invalid').fn(async t => {
-  const fence = t.queue.createFence({
-    initialValue: 1
-  });
-  t.expectValidationError(() => {
-    t.queue.signal(fence, 1);
-  });
-});
-g.test('increasing_fence_value_by_more_than_1_succeeds').fn(async t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 2);
-  await fence.onCompletion(2);
-  t.queue.signal(fence, 6);
-  await fence.onCompletion(6);
-});
-g.test('signal_a_fence_on_a_different_device_than_it_was_created_on_is_invalid').fn(async t => {
-  const fence = t.queue.createFence();
-  const anotherDevice = await t.device.adapter.requestDevice();
-  const anotherQueue = anotherDevice.defaultQueue;
-  t.expectValidationError(() => {
-    anotherQueue.signal(fence, 2);
-  });
-});
-g.test('signal_a_fence_on_a_different_device_does_not_update_fence_signaled_value').fn(async t => {
-  const fence = t.queue.createFence({
-    initialValue: 1
-  });
-  const anotherDevice = await t.device.adapter.requestDevice();
-  const anotherQueue = anotherDevice.defaultQueue;
-  t.expectValidationError(() => {
-    anotherQueue.signal(fence, 2);
-  });
-  t.expect(fence.getCompletedValue() === 1);
-  t.queue.signal(fence, 2);
-  await fence.onCompletion(2);
-});
-//# sourceMappingURL=fences.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/queue_submit.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/queue_submit.spec.js
deleted file mode 100644
index 24e386b9d22..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/queue_submit.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-queue submit validation tests.
-`;
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js';
-export const g = makeTestGroup(ValidationTest);
-g.test('submitting_with_a_mapped_buffer_is_disallowed').fn(async t => {
-  const buffer = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.MAP_WRITE | GPUBufferUsage.COPY_SRC
-  });
-  const targetBuffer = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_DST
-  });
-
-  const getCommandBuffer = () => {
-    const commandEncoder = t.device.createCommandEncoder();
-    commandEncoder.copyBufferToBuffer(buffer, 0, targetBuffer, 0, 4);
-    return commandEncoder.finish();
-  }; // Submitting when the buffer has never been mapped should succeed
-
-
-  t.queue.submit([getCommandBuffer()]); // Map the buffer, submitting when the buffer is mapped should fail
-
-  await buffer.mapWriteAsync();
-  t.queue.submit([]);
-  t.expectValidationError(() => {
-    t.queue.submit([getCommandBuffer()]);
-  }); // Unmap the buffer, queue submit should succeed
-
-  buffer.unmap();
-  t.queue.submit([getCommandBuffer()]);
-});
-//# sourceMappingURL=queue_submit.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/render_pass_descriptor.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/render_pass_descriptor.spec.js
deleted file mode 100644
index 3c1b111fea4..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/render_pass_descriptor.spec.js
+++ /dev/null
@@ -1,559 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-render pass descriptor validation tests.
-`;
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js';
-
-class F extends ValidationTest {
-  createTexture(options = {}) {
-    const {
-      format = 'rgba8unorm',
-      width = 16,
-      height = 16,
-      arrayLayerCount = 1,
-      mipLevelCount = 1,
-      sampleCount = 1,
-      usage = GPUTextureUsage.OUTPUT_ATTACHMENT
-    } = options;
-    return this.device.createTexture({
-      size: {
-        width,
-        height,
-        depth: arrayLayerCount
-      },
-      format,
-      mipLevelCount,
-      sampleCount,
-      usage
-    });
-  }
-
-  getColorAttachment(texture, textureViewDescriptor) {
-    const attachment = texture.createView(textureViewDescriptor);
-    return {
-      attachment,
-      loadValue: {
-        r: 1.0,
-        g: 0.0,
-        b: 0.0,
-        a: 1.0
-      }
-    };
-  }
-
-  getDepthStencilAttachment(texture, textureViewDescriptor) {
-    const attachment = texture.createView(textureViewDescriptor);
-    return {
-      attachment,
-      depthLoadValue: 1.0,
-      depthStoreOp: 'store',
-      stencilLoadValue: 0,
-      stencilStoreOp: 'store'
-    };
-  }
-
-  async tryRenderPass(success, descriptor) {
-    const commandEncoder = this.device.createCommandEncoder();
-    const renderPass = commandEncoder.beginRenderPass(descriptor);
-    renderPass.endPass();
-    this.expectValidationError(() => {
-      commandEncoder.finish();
-    }, !success);
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('a_render_pass_with_only_one_color_is_ok').fn(t => {
-  const colorTexture = t.createTexture({
-    format: 'rgba8unorm'
-  });
-  const descriptor = {
-    colorAttachments: [t.getColorAttachment(colorTexture)]
-  };
-  t.tryRenderPass(true, descriptor);
-});
-g.test('a_render_pass_with_only_one_depth_attachment_is_ok').fn(t => {
-  const depthStencilTexture = t.createTexture({
-    format: 'depth24plus-stencil8'
-  });
-  const descriptor = {
-    colorAttachments: [],
-    depthStencilAttachment: t.getDepthStencilAttachment(depthStencilTexture)
-  };
-  t.tryRenderPass(true, descriptor);
-});
-g.test('OOB_color_attachment_indices_are_handled').params([{
-  colorAttachmentsCount: 4,
-  _success: true
-}, // Control case
-{
-  colorAttachmentsCount: 5,
-  _success: false
-} // Out of bounds
-]).fn(async t => {
-  const {
-    colorAttachmentsCount,
-    _success
-  } = t.params;
-  const colorAttachments = [];
-
-  for (let i = 0; i < colorAttachmentsCount; i++) {
-    const colorTexture = t.createTexture();
-    colorAttachments.push(t.getColorAttachment(colorTexture));
-  }
-
-  await t.tryRenderPass(_success, {
-    colorAttachments
-  });
-});
-g.test('attachments_must_have_the_same_size').fn(async t => {
-  const colorTexture1x1A = t.createTexture({
-    width: 1,
-    height: 1,
-    format: 'rgba8unorm'
-  });
-  const colorTexture1x1B = t.createTexture({
-    width: 1,
-    height: 1,
-    format: 'rgba8unorm'
-  });
-  const colorTexture2x2 = t.createTexture({
-    width: 2,
-    height: 2,
-    format: 'rgba8unorm'
-  });
-  const depthStencilTexture1x1 = t.createTexture({
-    width: 1,
-    height: 1,
-    format: 'depth24plus-stencil8'
-  });
-  const depthStencilTexture2x2 = t.createTexture({
-    width: 2,
-    height: 2,
-    format: 'depth24plus-stencil8'
-  });
-  {
-    // Control case: all the same size (1x1)
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(colorTexture1x1A), t.getColorAttachment(colorTexture1x1B)],
-      depthStencilAttachment: t.getDepthStencilAttachment(depthStencilTexture1x1)
-    };
-    t.tryRenderPass(true, descriptor);
-  }
-  {
-    // One of the color attachments has a different size
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(colorTexture1x1A), t.getColorAttachment(colorTexture2x2)]
-    };
-    await t.tryRenderPass(false, descriptor);
-  }
-  {
-    // The depth stencil attachment has a different size
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(colorTexture1x1A), t.getColorAttachment(colorTexture1x1B)],
-      depthStencilAttachment: t.getDepthStencilAttachment(depthStencilTexture2x2)
-    };
-    await t.tryRenderPass(false, descriptor);
-  }
-});
-g.test('attachments_must_match_whether_they_are_used_for_color_or_depth_stencil').fn(async t => {
-  const colorTexture = t.createTexture({
-    format: 'rgba8unorm'
-  });
-  const depthStencilTexture = t.createTexture({
-    format: 'depth24plus-stencil8'
-  });
-  {
-    // Using depth-stencil for color
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(depthStencilTexture)]
-    };
-    await t.tryRenderPass(false, descriptor);
-  }
-  {
-    // Using color for depth-stencil
-    const descriptor = {
-      colorAttachments: [],
-      depthStencilAttachment: t.getDepthStencilAttachment(colorTexture)
-    };
-    await t.tryRenderPass(false, descriptor);
-  }
-});
-g.test('check_layer_count_for_color_or_depth_stencil').params([{
-  arrayLayerCount: 5,
-  baseArrayLayer: 0,
-  _success: false
-}, // using 2D array texture view with arrayLayerCount > 1 is not allowed
-{
-  arrayLayerCount: 1,
-  baseArrayLayer: 0,
-  _success: true
-}, // using 2D array texture view that covers the first layer of the texture is OK
-{
-  arrayLayerCount: 1,
-  baseArrayLayer: 9,
-  _success: true
-} // using 2D array texture view that covers the last layer is OK for depth stencil
-]).fn(async t => {
-  const {
-    arrayLayerCount,
-    baseArrayLayer,
-    _success
-  } = t.params;
-  const ARRAY_LAYER_COUNT = 10;
-  const MIP_LEVEL_COUNT = 1;
-  const COLOR_FORMAT = 'rgba8unorm';
-  const DEPTH_STENCIL_FORMAT = 'depth24plus-stencil8';
-  const colorTexture = t.createTexture({
-    format: COLOR_FORMAT,
-    width: 32,
-    height: 32,
-    mipLevelCount: MIP_LEVEL_COUNT,
-    arrayLayerCount: ARRAY_LAYER_COUNT
-  });
-  const depthStencilTexture = t.createTexture({
-    format: DEPTH_STENCIL_FORMAT,
-    width: 32,
-    height: 32,
-    mipLevelCount: MIP_LEVEL_COUNT,
-    arrayLayerCount: ARRAY_LAYER_COUNT
-  });
-  const baseTextureViewDescriptor = {
-    dimension: '2d-array',
-    baseArrayLayer,
-    arrayLayerCount,
-    baseMipLevel: 0,
-    mipLevelCount: MIP_LEVEL_COUNT
-  };
-  {
-    // Check 2D array texture view for color
-    const textureViewDescriptor = { ...baseTextureViewDescriptor,
-      format: COLOR_FORMAT
-    };
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(colorTexture, textureViewDescriptor)]
-    };
-    await t.tryRenderPass(_success, descriptor);
-  }
-  {
-    // Check 2D array texture view for depth stencil
-    const textureViewDescriptor = { ...baseTextureViewDescriptor,
-      format: DEPTH_STENCIL_FORMAT
-    };
-    const descriptor = {
-      colorAttachments: [],
-      depthStencilAttachment: t.getDepthStencilAttachment(depthStencilTexture, textureViewDescriptor)
-    };
-    await t.tryRenderPass(_success, descriptor);
-  }
-});
-g.test('check_mip_level_count_for_color_or_depth_stencil').params([{
-  mipLevelCount: 2,
-  baseMipLevel: 0,
-  _success: false
-}, // using 2D texture view with mipLevelCount > 1 is not allowed
-{
-  mipLevelCount: 1,
-  baseMipLevel: 0,
-  _success: true
-}, // using 2D texture view that covers the first level of the texture is OK
-{
-  mipLevelCount: 1,
-  baseMipLevel: 3,
-  _success: true
-} // using 2D texture view that covers the last level of the texture is OK
-]).fn(async t => {
-  const {
-    mipLevelCount,
-    baseMipLevel,
-    _success
-  } = t.params;
-  const ARRAY_LAYER_COUNT = 1;
-  const MIP_LEVEL_COUNT = 4;
-  const COLOR_FORMAT = 'rgba8unorm';
-  const DEPTH_STENCIL_FORMAT = 'depth24plus-stencil8';
-  const colorTexture = t.createTexture({
-    format: COLOR_FORMAT,
-    width: 32,
-    height: 32,
-    mipLevelCount: MIP_LEVEL_COUNT,
-    arrayLayerCount: ARRAY_LAYER_COUNT
-  });
-  const depthStencilTexture = t.createTexture({
-    format: DEPTH_STENCIL_FORMAT,
-    width: 32,
-    height: 32,
-    mipLevelCount: MIP_LEVEL_COUNT,
-    arrayLayerCount: ARRAY_LAYER_COUNT
-  });
-  const baseTextureViewDescriptor = {
-    dimension: '2d',
-    baseArrayLayer: 0,
-    arrayLayerCount: ARRAY_LAYER_COUNT,
-    baseMipLevel,
-    mipLevelCount
-  };
-  {
-    // Check 2D texture view for color
-    const textureViewDescriptor = { ...baseTextureViewDescriptor,
-      format: COLOR_FORMAT
-    };
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(colorTexture, textureViewDescriptor)]
-    };
-    await t.tryRenderPass(_success, descriptor);
-  }
-  {
-    // Check 2D texture view for depth stencil
-    const textureViewDescriptor = { ...baseTextureViewDescriptor,
-      format: DEPTH_STENCIL_FORMAT
-    };
-    const descriptor = {
-      colorAttachments: [],
-      depthStencilAttachment: t.getDepthStencilAttachment(depthStencilTexture, textureViewDescriptor)
-    };
-    await t.tryRenderPass(_success, descriptor);
-  }
-});
-g.test('it_is_invalid_to_set_resolve_target_if_color_attachment_is_non_multisampled').fn(async t => {
-  const colorTexture = t.createTexture({
-    sampleCount: 1
-  });
-  const resolveTargetTexture = t.createTexture({
-    sampleCount: 1
-  });
-  const descriptor = {
-    colorAttachments: [{
-      attachment: colorTexture.createView(),
-      resolveTarget: resolveTargetTexture.createView(),
-      loadValue: {
-        r: 1.0,
-        g: 0.0,
-        b: 0.0,
-        a: 1.0
-      }
-    }]
-  };
-  await t.tryRenderPass(false, descriptor);
-});
-g.test('check_the_use_of_multisampled_textures_as_color_attachments').fn(async t => {
-  const colorTexture = t.createTexture({
-    sampleCount: 1
-  });
-  const multisampledColorTexture = t.createTexture({
-    sampleCount: 4
-  });
-  {
-    // It is allowed to use a multisampled color attachment without setting resolve target
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(multisampledColorTexture)]
-    };
-    t.tryRenderPass(true, descriptor);
-  }
-  {
-    // It is not allowed to use multiple color attachments with different sample counts
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(colorTexture), t.getColorAttachment(multisampledColorTexture)]
-    };
-    await t.tryRenderPass(false, descriptor);
-  }
-});
-g.test('it_is_invalid_to_use_a_multisampled_resolve_target').fn(async t => {
-  const multisampledColorTexture = t.createTexture({
-    sampleCount: 4
-  });
-  const multisampledResolveTargetTexture = t.createTexture({
-    sampleCount: 4
-  });
-  const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-  colorAttachment.resolveTarget = multisampledResolveTargetTexture.createView();
-  const descriptor = {
-    colorAttachments: [colorAttachment]
-  };
-  await t.tryRenderPass(false, descriptor);
-});
-g.test('it_is_invalid_to_use_a_resolve_target_with_array_layer_count_greater_than_1').fn(async t => {
-  const multisampledColorTexture = t.createTexture({
-    sampleCount: 4
-  });
-  const resolveTargetTexture = t.createTexture({
-    arrayLayerCount: 2
-  });
-  const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-  colorAttachment.resolveTarget = resolveTargetTexture.createView();
-  const descriptor = {
-    colorAttachments: [colorAttachment]
-  };
-  await t.tryRenderPass(false, descriptor);
-});
-g.test('it_is_invalid_to_use_a_resolve_target_with_mipmap_level_count_greater_than_1').fn(async t => {
-  const multisampledColorTexture = t.createTexture({
-    sampleCount: 4
-  });
-  const resolveTargetTexture = t.createTexture({
-    mipLevelCount: 2
-  });
-  const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-  colorAttachment.resolveTarget = resolveTargetTexture.createView();
-  const descriptor = {
-    colorAttachments: [colorAttachment]
-  };
-  await t.tryRenderPass(false, descriptor);
-});
-g.test('it_is_invalid_to_use_a_resolve_target_whose_usage_is_not_output_attachment').fn(async t => {
-  const multisampledColorTexture = t.createTexture({
-    sampleCount: 4
-  });
-  const resolveTargetTexture = t.createTexture({
-    usage: GPUTextureUsage.COPY_SRC | GPUTextureUsage.COPY_DST
-  });
-  const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-  colorAttachment.resolveTarget = resolveTargetTexture.createView();
-  const descriptor = {
-    colorAttachments: [colorAttachment]
-  };
-  await t.tryRenderPass(false, descriptor);
-});
-g.test('it_is_invalid_to_use_a_resolve_target_in_error_state').fn(async t => {
-  const ARRAY_LAYER_COUNT = 1;
-  const multisampledColorTexture = t.createTexture({
-    sampleCount: 4
-  });
-  const resolveTargetTexture = t.createTexture({
-    arrayLayerCount: ARRAY_LAYER_COUNT
-  });
-  const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-  t.expectValidationError(() => {
-    colorAttachment.resolveTarget = resolveTargetTexture.createView({
-      dimension: '2d',
-      format: 'rgba8unorm',
-      baseArrayLayer: ARRAY_LAYER_COUNT + 1
-    });
-  });
-  const descriptor = {
-    colorAttachments: [colorAttachment]
-  };
-  await t.tryRenderPass(false, descriptor);
-});
-g.test('use_of_multisampled_attachment_and_non_multisampled_resolve_target_is_allowed').fn(async t => {
-  const multisampledColorTexture = t.createTexture({
-    sampleCount: 4
-  });
-  const resolveTargetTexture = t.createTexture({
-    sampleCount: 1
-  });
-  const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-  colorAttachment.resolveTarget = resolveTargetTexture.createView();
-  const descriptor = {
-    colorAttachments: [colorAttachment]
-  };
-  t.tryRenderPass(true, descriptor);
-});
-g.test('use_a_resolve_target_in_a_format_different_than_the_attachment_is_not_allowed').fn(async t => {
-  const multisampledColorTexture = t.createTexture({
-    sampleCount: 4
-  });
-  const resolveTargetTexture = t.createTexture({
-    format: 'bgra8unorm'
-  });
-  const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-  colorAttachment.resolveTarget = resolveTargetTexture.createView();
-  const descriptor = {
-    colorAttachments: [colorAttachment]
-  };
-  await t.tryRenderPass(false, descriptor);
-});
-g.test('size_of_the_resolve_target_must_be_the_same_as_the_color_attachment').fn(async t => {
-  const size = 16;
-  const multisampledColorTexture = t.createTexture({
-    width: size,
-    height: size,
-    sampleCount: 4
-  });
-  const resolveTargetTexture = t.createTexture({
-    width: size * 2,
-    height: size * 2,
-    mipLevelCount: 2
-  });
-  {
-    const resolveTargetTextureView = resolveTargetTexture.createView({
-      baseMipLevel: 0,
-      mipLevelCount: 1
-    });
-    const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-    colorAttachment.resolveTarget = resolveTargetTextureView;
-    const descriptor = {
-      colorAttachments: [colorAttachment]
-    };
-    await t.tryRenderPass(false, descriptor);
-  }
-  {
-    const resolveTargetTextureView = resolveTargetTexture.createView({
-      baseMipLevel: 1
-    });
-    const colorAttachment = t.getColorAttachment(multisampledColorTexture);
-    colorAttachment.resolveTarget = resolveTargetTextureView;
-    const descriptor = {
-      colorAttachments: [colorAttachment]
-    };
-    t.tryRenderPass(true, descriptor);
-  }
-});
-g.test('check_depth_stencil_attachment_sample_counts_mismatch').fn(async t => {
-  const multisampledDepthStencilTexture = t.createTexture({
-    sampleCount: 4,
-    format: 'depth24plus-stencil8'
-  });
-  {
-    // It is not allowed to use a depth stencil attachment whose sample count is different from the
-    // one of the color attachment
-    const depthStencilTexture = t.createTexture({
-      sampleCount: 1,
-      format: 'depth24plus-stencil8'
-    });
-    const multisampledColorTexture = t.createTexture({
-      sampleCount: 4
-    });
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(multisampledColorTexture)],
-      depthStencilAttachment: t.getDepthStencilAttachment(depthStencilTexture)
-    };
-    await t.tryRenderPass(false, descriptor);
-  }
-  {
-    const colorTexture = t.createTexture({
-      sampleCount: 1
-    });
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(colorTexture)],
-      depthStencilAttachment: t.getDepthStencilAttachment(multisampledDepthStencilTexture)
-    };
-    await t.tryRenderPass(false, descriptor);
-  }
-  {
-    // It is allowed to use a multisampled depth stencil attachment whose sample count is equal to
-    // the one of the color attachment.
-    const multisampledColorTexture = t.createTexture({
-      sampleCount: 4
-    });
-    const descriptor = {
-      colorAttachments: [t.getColorAttachment(multisampledColorTexture)],
-      depthStencilAttachment: t.getDepthStencilAttachment(multisampledDepthStencilTexture)
-    };
-    t.tryRenderPass(true, descriptor);
-  }
-  {
-    // It is allowed to use a multisampled depth stencil attachment with no color attachment
-    const descriptor = {
-      colorAttachments: [],
-      depthStencilAttachment: t.getDepthStencilAttachment(multisampledDepthStencilTexture)
-    };
-    t.tryRenderPass(true, descriptor);
-  }
-});
-//# sourceMappingURL=render_pass_descriptor.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBindGroup.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBindGroup.spec.js
deleted file mode 100644
index 95786a8f78d..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBindGroup.spec.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-setBindGroup validation tests.
-`;
-import { poptions, params } from '../../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js';
-
-class F extends ValidationTest {
-  makeAttachmentTexture() {
-    return this.device.createTexture({
-      format: 'rgba8unorm',
-      size: {
-        width: 16,
-        height: 16,
-        depth: 1
-      },
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT
-    });
-  }
-
-  testComputePass(bindGroup, dynamicOffsets) {
-    const encoder = this.device.createCommandEncoder();
-    const computePass = encoder.beginComputePass();
-    computePass.setBindGroup(0, bindGroup, dynamicOffsets);
-    computePass.endPass();
-    encoder.finish();
-  }
-
-  testRenderPass(bindGroup, dynamicOffsets) {
-    const encoder = this.device.createCommandEncoder();
-    const renderPass = encoder.beginRenderPass({
-      colorAttachments: [{
-        attachment: this.makeAttachmentTexture().createView(),
-        loadValue: {
-          r: 1.0,
-          g: 0.0,
-          b: 0.0,
-          a: 1.0
-        }
-      }]
-    });
-    renderPass.setBindGroup(0, bindGroup, dynamicOffsets);
-    renderPass.endPass();
-    encoder.finish();
-  }
-
-  testRenderBundle(bindGroup, dynamicOffsets) {
-    const encoder = this.device.createRenderBundleEncoder({
-      colorFormats: ['rgba8unorm']
-    });
-    encoder.setBindGroup(0, bindGroup, dynamicOffsets);
-    encoder.finish();
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('dynamic_offsets_passed_but_not_expected,compute_pass').params(poptions('type', ['compute', 'renderpass', 'renderbundle'])).fn(async t => {
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    entries: []
-  });
-  const bindGroup = t.device.createBindGroup({
-    layout: bindGroupLayout,
-    entries: []
-  });
-  const {
-    type
-  } = t.params;
-  const dynamicOffsets = [0];
-  t.expectValidationError(() => {
-    if (type === 'compute') {
-      const encoder = t.device.createCommandEncoder();
-      const computePass = encoder.beginComputePass();
-      computePass.setBindGroup(0, bindGroup, dynamicOffsets);
-      computePass.endPass();
-      encoder.finish();
-    } else if (type === 'renderpass') {
-      const encoder = t.device.createCommandEncoder();
-      const renderPass = encoder.beginRenderPass({
-        colorAttachments: [{
-          attachment: t.makeAttachmentTexture().createView(),
-          loadValue: {
-            r: 1.0,
-            g: 0.0,
-            b: 0.0,
-            a: 1.0
-          }
-        }]
-      });
-      renderPass.setBindGroup(0, bindGroup, dynamicOffsets);
-      renderPass.endPass();
-      encoder.finish();
-    } else if (type === 'renderbundle') {
-      const encoder = t.device.createRenderBundleEncoder({
-        colorFormats: ['rgba8unorm']
-      });
-      encoder.setBindGroup(0, bindGroup, dynamicOffsets);
-      encoder.finish();
-    } else {
-      t.fail();
-    }
-  });
-});
-g.test('dynamic_offsets_match_expectations_in_pass_encoder').params(params().combine(poptions('type', ['compute', 'renderpass', 'renderbundle'])).combine([{
-  dynamicOffsets: [256, 0],
-  _success: true
-}, // Dynamic offsets aligned
-{
-  dynamicOffsets: [1, 2],
-  _success: false
-}, // Dynamic offsets not aligned
-// Wrong number of dynamic offsets
-{
-  dynamicOffsets: [256, 0, 0],
-  _success: false
-}, {
-  dynamicOffsets: [256],
-  _success: false
-}, {
-  dynamicOffsets: [],
-  _success: false
-}, // Dynamic uniform buffer out of bounds because of binding size
-{
-  dynamicOffsets: [512, 0],
-  _success: false
-}, {
-  dynamicOffsets: [1024, 0],
-  _success: false
-}, {
-  dynamicOffsets: [0xffffffff, 0],
-  _success: false
-}, // Dynamic storage buffer out of bounds because of binding size
-{
-  dynamicOffsets: [0, 512],
-  _success: false
-}, {
-  dynamicOffsets: [0, 1024],
-  _success: false
-}, {
-  dynamicOffsets: [0, 0xffffffff],
-  _success: false
-}])).fn(async t => {
-  // Dynamic buffer offsets require offset to be divisible by 256
-  const MIN_DYNAMIC_BUFFER_OFFSET_ALIGNMENT = 256;
-  const BINDING_SIZE = 9;
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    entries: [{
-      binding: 0,
-      visibility: GPUShaderStage.COMPUTE | GPUShaderStage.FRAGMENT,
-      type: 'uniform-buffer',
-      hasDynamicOffset: true
-    }, {
-      binding: 1,
-      visibility: GPUShaderStage.COMPUTE | GPUShaderStage.FRAGMENT,
-      type: 'storage-buffer',
-      hasDynamicOffset: true
-    }]
-  });
-  const uniformBuffer = t.device.createBuffer({
-    size: 2 * MIN_DYNAMIC_BUFFER_OFFSET_ALIGNMENT + 8,
-    usage: GPUBufferUsage.UNIFORM
-  });
-  const storageBuffer = t.device.createBuffer({
-    size: 2 * MIN_DYNAMIC_BUFFER_OFFSET_ALIGNMENT + 8,
-    usage: GPUBufferUsage.STORAGE
-  });
-  const bindGroup = t.device.createBindGroup({
-    layout: bindGroupLayout,
-    entries: [{
-      binding: 0,
-      resource: {
-        buffer: uniformBuffer,
-        size: BINDING_SIZE
-      }
-    }, {
-      binding: 1,
-      resource: {
-        buffer: storageBuffer,
-        size: BINDING_SIZE
-      }
-    }]
-  });
-  const {
-    type,
-    dynamicOffsets,
-    _success
-  } = t.params;
-  t.expectValidationError(() => {
-    if (type === 'compute') {
-      t.testComputePass(bindGroup, dynamicOffsets);
-    } else if (type === 'renderpass') {
-      t.testRenderPass(bindGroup, dynamicOffsets);
-    } else if (type === 'renderbundle') {
-      t.testRenderBundle(bindGroup, dynamicOffsets);
-    } else {
-      t.fail();
-    }
-
-    t.testComputePass(bindGroup, dynamicOffsets);
-  }, !_success);
-}); // TODO: test error bind group
-//# sourceMappingURL=setBindGroup.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBlendColor.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBlendColor.spec.js
deleted file mode 100644
index 469641df043..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBlendColor.spec.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-setBlendColor validation tests.
-`;
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js'; // TODO: Move beginRenderPass to a Fixture class.
-
-class F extends ValidationTest {
-  beginRenderPass(commandEncoder) {
-    const attachmentTexture = this.device.createTexture({
-      format: 'rgba8unorm',
-      size: {
-        width: 16,
-        height: 16,
-        depth: 1
-      },
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT
-    });
-    return commandEncoder.beginRenderPass({
-      colorAttachments: [{
-        attachment: attachmentTexture.createView(),
-        loadValue: {
-          r: 1.0,
-          g: 0.0,
-          b: 0.0,
-          a: 1.0
-        }
-      }]
-    });
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('basic_use_of_setBlendColor').fn(t => {
-  const commandEncoder = t.device.createCommandEncoder();
-  const renderPass = t.beginRenderPass(commandEncoder);
-  renderPass.setBlendColor({
-    r: 0,
-    g: 0,
-    b: 0,
-    a: 0
-  });
-  renderPass.endPass();
-  commandEncoder.finish();
-});
-g.test('setBlendColor_allows_any_number_value').fn(t => {
-  const values = [Number.MIN_SAFE_INTEGER, Number.MAX_SAFE_INTEGER];
-
-  for (const value of values) {
-    const commandEncoder = t.device.createCommandEncoder();
-    const renderPass = t.beginRenderPass(commandEncoder);
-    renderPass.setBlendColor({
-      r: value,
-      g: value,
-      b: value,
-      a: value
-    });
-    renderPass.endPass();
-    commandEncoder.finish();
-  }
-});
-//# sourceMappingURL=setBlendColor.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setScissorRect.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setScissorRect.spec.js
deleted file mode 100644
index 8381865a693..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setScissorRect.spec.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-setScissorRect validation tests.
-`;
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js';
-const TEXTURE_WIDTH = 16;
-const TEXTURE_HEIGHT = 16; // TODO: Move this fixture class to a common file.
-
-class F extends ValidationTest {
-  beginRenderPass(commandEncoder) {
-    const attachmentTexture = this.device.createTexture({
-      format: 'rgba8unorm',
-      size: {
-        width: TEXTURE_WIDTH,
-        height: TEXTURE_HEIGHT,
-        depth: 1
-      },
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT
-    });
-    return commandEncoder.beginRenderPass({
-      colorAttachments: [{
-        attachment: attachmentTexture.createView(),
-        loadValue: {
-          r: 1.0,
-          g: 0.0,
-          b: 0.0,
-          a: 1.0
-        }
-      }]
-    });
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('use_of_setScissorRect').params([{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 1,
-  _success: true
-}, // Basic use
-{
-  x: 0,
-  y: 0,
-  width: 0,
-  height: 1,
-  _success: false
-}, // Width of zero is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 0,
-  _success: false
-}, // Height of zero is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 0,
-  height: 0,
-  _success: false
-}, // Both width and height of zero are not allowed
-{
-  x: 0,
-  y: 0,
-  width: TEXTURE_WIDTH + 1,
-  height: TEXTURE_HEIGHT + 1,
-  _success: true
-} // Scissor larger than the framebuffer is allowed
-]).fn(async t => {
-  const {
-    x,
-    y,
-    width,
-    height,
-    _success
-  } = t.params;
-  const commandEncoder = t.device.createCommandEncoder();
-  const renderPass = t.beginRenderPass(commandEncoder);
-  renderPass.setScissorRect(x, y, width, height);
-  renderPass.endPass();
-  t.expectValidationError(() => {
-    commandEncoder.finish();
-  }, !_success);
-});
-//# sourceMappingURL=setScissorRect.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setStencilReference.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setStencilReference.spec.js
deleted file mode 100644
index f205239d861..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setStencilReference.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-setStencilReference validation tests.
-`;
-import { poptions } from '../../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js'; // TODO: Move this fixture class to a common file.
-
-class F extends ValidationTest {
-  beginRenderPass(commandEncoder) {
-    const attachmentTexture = this.device.createTexture({
-      format: 'rgba8unorm',
-      size: {
-        width: 16,
-        height: 16,
-        depth: 1
-      },
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT
-    });
-    return commandEncoder.beginRenderPass({
-      colorAttachments: [{
-        attachment: attachmentTexture.createView(),
-        loadValue: {
-          r: 1.0,
-          g: 0.0,
-          b: 0.0,
-          a: 1.0
-        }
-      }]
-    });
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('use_of_setStencilReference').params(poptions('reference', [0, 0xffffffff])).fn(t => {
-  const {
-    reference
-  } = t.params;
-  const commandEncoder = t.device.createCommandEncoder();
-  const renderPass = t.beginRenderPass(commandEncoder);
-  renderPass.setStencilReference(reference);
-  renderPass.endPass();
-  commandEncoder.finish();
-});
-//# sourceMappingURL=setStencilReference.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setViewport.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setViewport.spec.js
deleted file mode 100644
index f1168c11086..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setViewport.spec.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-setViewport validation tests.
-`;
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { ValidationTest } from './validation_test.js';
-const TEXTURE_WIDTH = 16;
-const TEXTURE_HEIGHT = 16; // TODO: Move this fixture class to a common file.
-
-class F extends ValidationTest {
-  beginRenderPass(commandEncoder) {
-    const attachmentTexture = this.device.createTexture({
-      format: 'rgba8unorm',
-      size: {
-        width: TEXTURE_WIDTH,
-        height: TEXTURE_HEIGHT,
-        depth: 1
-      },
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT
-    });
-    return commandEncoder.beginRenderPass({
-      colorAttachments: [{
-        attachment: attachmentTexture.createView(),
-        loadValue: {
-          r: 1.0,
-          g: 0.0,
-          b: 0.0,
-          a: 1.0
-        }
-      }]
-    });
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('use_of_setViewport').params([{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 1,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: true
-}, // Basic use
-{
-  x: 0,
-  y: 0,
-  width: 0,
-  height: 1,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: false
-}, // Width of zero is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 0,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: false
-}, // Height of zero is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 0,
-  height: 0,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: false
-}, // Both width and height of zero are not allowed
-{
-  x: -1,
-  y: 0,
-  width: 1,
-  height: 1,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: true
-}, // Negative x is allowed
-{
-  x: 0,
-  y: -1,
-  width: 1,
-  height: 1,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: true
-}, // Negative y is allowed
-{
-  x: 0,
-  y: 0,
-  width: -1,
-  height: 1,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: false
-}, // Negative width is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: -1,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: false
-}, // Negative height is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 1,
-  minDepth: -1,
-  maxDepth: 1,
-  _success: false
-}, // Negative minDepth is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 1,
-  minDepth: 0,
-  maxDepth: -1,
-  _success: false
-}, // Negative maxDepth is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 1,
-  minDepth: 10,
-  maxDepth: 1,
-  _success: false
-}, // minDepth greater than 1 is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 1,
-  minDepth: 0,
-  maxDepth: 10,
-  _success: false
-}, // maxDepth greater than 1 is not allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 1,
-  minDepth: 0.5,
-  maxDepth: 0.5,
-  _success: true
-}, // minDepth equal to maxDepth is allowed
-{
-  x: 0,
-  y: 0,
-  width: 1,
-  height: 1,
-  minDepth: 0.8,
-  maxDepth: 0.5,
-  _success: true
-}, // minDepth greater than maxDepth is allowed
-{
-  x: 0,
-  y: 0,
-  width: TEXTURE_WIDTH + 1,
-  height: TEXTURE_HEIGHT + 1,
-  minDepth: 0,
-  maxDepth: 1,
-  _success: true
-} // Viewport larger than the framebuffer is allowed
-]).fn(async t => {
-  const {
-    x,
-    y,
-    width,
-    height,
-    minDepth,
-    maxDepth,
-    _success
-  } = t.params;
-  const commandEncoder = t.device.createCommandEncoder();
-  const renderPass = t.beginRenderPass(commandEncoder);
-  renderPass.setViewport(x, y, width, height, minDepth, maxDepth);
-  renderPass.endPass();
-  t.expectValidationError(() => {
-    commandEncoder.finish();
-  }, !_success);
-});
-//# sourceMappingURL=setViewport.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/validation_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/validation_test.js
deleted file mode 100644
index 17eb97bcc63..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/validation_test.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { unreachable } from '../../../common/framework/util/util.js';
-import { GPUTest } from '../../gpu_test.js';
-export class ValidationTest extends GPUTest {
-  getStorageBuffer() {
-    return this.device.createBuffer({
-      size: 1024,
-      usage: GPUBufferUsage.STORAGE
-    });
-  }
-
-  getUniformBuffer() {
-    return this.device.createBuffer({
-      size: 1024,
-      usage: GPUBufferUsage.UNIFORM
-    });
-  }
-
-  getErrorBuffer() {
-    this.device.pushErrorScope('validation');
-    const errorBuffer = this.device.createBuffer({
-      size: 1024,
-      usage: 0xffff // Invalid GPUBufferUsage
-
-    });
-    this.device.popErrorScope();
-    return errorBuffer;
-  }
-
-  getSampler() {
-    return this.device.createSampler();
-  }
-
-  getComparisonSampler() {
-    return this.device.createSampler({
-      compare: 'never'
-    });
-  }
-
-  getErrorSampler() {
-    this.device.pushErrorScope('validation');
-    const sampler = this.device.createSampler({
-      lodMinClamp: -1
-    });
-    this.device.popErrorScope();
-    return sampler;
-  }
-
-  getSampledTexture() {
-    return this.device.createTexture({
-      size: {
-        width: 16,
-        height: 16,
-        depth: 1
-      },
-      format: 'rgba8unorm',
-      usage: GPUTextureUsage.SAMPLED
-    });
-  }
-
-  getStorageTexture() {
-    return this.device.createTexture({
-      size: {
-        width: 16,
-        height: 16,
-        depth: 1
-      },
-      format: 'rgba8unorm',
-      usage: GPUTextureUsage.STORAGE
-    });
-  }
-
-  getErrorTextureView() {
-    this.device.pushErrorScope('validation');
-    const view = this.device.createTexture({
-      size: {
-        width: 0,
-        height: 0,
-        depth: 0
-      },
-      format: 'rgba8unorm',
-      usage: GPUTextureUsage.SAMPLED
-    }).createView();
-    this.device.popErrorScope();
-    return view;
-  }
-
-  getBindingResource(bindingType) {
-    switch (bindingType) {
-      case 'errorBuf':
-        return {
-          buffer: this.getErrorBuffer()
-        };
-
-      case 'errorSamp':
-        return this.getErrorSampler();
-
-      case 'errorTex':
-        return this.getErrorTextureView();
-
-      case 'uniformBuf':
-        return {
-          buffer: this.getUniformBuffer()
-        };
-
-      case 'storageBuf':
-        return {
-          buffer: this.getStorageBuffer()
-        };
-
-      case 'plainSamp':
-        return this.getSampler();
-
-      case 'compareSamp':
-        return this.getComparisonSampler();
-
-      case 'sampledTex':
-        return this.getSampledTexture().createView();
-
-      case 'storageTex':
-        return this.getStorageTexture().createView();
-
-      default:
-        unreachable('unknown binding resource type');
-    }
-  }
-
-  expectValidationError(fn, shouldError = true) {
-    // If no error is expected, we let the scope surrounding the test catch it.
-    if (shouldError === false) {
-      fn();
-      return;
-    }
-
-    this.device.pushErrorScope('validation');
-    fn();
-    const promise = this.device.popErrorScope();
-    this.eventualAsyncExpectation(async niceStack => {
-      const gpuValidationError = await promise;
-
-      if (!gpuValidationError) {
-        niceStack.message = 'Validation error was expected.';
-        this.rec.validationFailed(niceStack);
-      } else if (gpuValidationError instanceof GPUValidationError) {
-        niceStack.message = `Captured validation error - ${gpuValidationError.message}`;
-        this.rec.debug(niceStack);
-      }
-    });
-  }
-
-}
-//# sourceMappingURL=validation_test.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/capability_info.js b/tests/wpt/web-platform-tests/webgpu/webgpu/capability_info.js
deleted file mode 100644
index 47d508ac3e3..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/capability_info.js
+++ /dev/null
@@ -1,629 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function keysOf(obj) {
-  return Object.keys(obj);
-}
-
-function numericKeysOf(obj) {
-  return Object.keys(obj).map(n => Number(n));
-} // Textures
-
-
-export const kTextureFormatInfo =
-/* prettier-ignore */
-{
-  // Try to keep these manually-formatted in a readable grid.
-  // (Note: this list should always match the one in the spec.)
-  // 8-bit formats
-  'r8unorm': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 1,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'r8snorm': {
-    renderable: false,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 1,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'r8uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 1,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'r8sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 1,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  // 16-bit formats
-  'r16uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 2,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'r16sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 2,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'r16float': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 2,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg8unorm': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 2,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg8snorm': {
-    renderable: false,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 2,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg8uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 2,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg8sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 2,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  // 32-bit formats
-  'r32uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'r32sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'r32float': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg16uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg16sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg16float': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba8unorm': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba8unorm-srgb': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba8snorm': {
-    renderable: false,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba8uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba8sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'bgra8unorm': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'bgra8unorm-srgb': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  // Packed 32-bit formats
-  'rgb10a2unorm': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg11b10float': {
-    renderable: false,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  // 64-bit formats
-  'rg32uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 8,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg32sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 8,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rg32float': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 8,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba16uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 8,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba16sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 8,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba16float': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 8,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  // 128-bit formats
-  'rgba32uint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 16,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba32sint': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 16,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'rgba32float': {
-    renderable: true,
-    color: true,
-    depth: false,
-    stencil: false,
-    storage: true,
-    copyable: true,
-    bytesPerBlock: 16,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  // Depth/stencil formats
-  'depth32float': {
-    renderable: true,
-    color: false,
-    depth: true,
-    stencil: false,
-    storage: false,
-    copyable: true,
-    bytesPerBlock: 4,
-    blockWidth: 1,
-    blockHeight: 1
-  },
-  'depth24plus': {
-    renderable: true,
-    color: false,
-    depth: true,
-    stencil: false,
-    storage: false,
-    copyable: false
-  },
-  'depth24plus-stencil8': {
-    renderable: true,
-    color: false,
-    depth: true,
-    stencil: true,
-    storage: false,
-    copyable: false
-  }
-};
-export const kTextureFormats = keysOf(kTextureFormatInfo);
-export const kTextureDimensionInfo =
-/* prettier-ignore */
-{
-  '1d': {},
-  '2d': {},
-  '3d': {}
-};
-export const kTextureDimensions = keysOf(kTextureDimensionInfo);
-export const kTextureAspectInfo =
-/* prettier-ignore */
-{
-  'all': {},
-  'depth-only': {},
-  'stencil-only': {}
-};
-export const kTextureAspects = keysOf(kTextureAspectInfo);
-export const kTextureUsageInfo = {
-  [GPUTextureUsage.COPY_SRC]: {},
-  [GPUTextureUsage.COPY_DST]: {},
-  [GPUTextureUsage.SAMPLED]: {},
-  [GPUTextureUsage.STORAGE]: {},
-  [GPUTextureUsage.OUTPUT_ATTACHMENT]: {}
-};
-export const kTextureUsages = numericKeysOf(kTextureUsageInfo); // Typedefs for bindings
-
-// Bindings
-export const kMaxBindingsPerBindGroup = 16;
-export const kPerStageBindingLimits =
-/* prettier-ignore */
-{
-  'uniformBuf': {
-    class: 'uniformBuf',
-    max: 12
-  },
-  'storageBuf': {
-    class: 'storageBuf',
-    max: 4
-  },
-  'sampler': {
-    class: 'sampler',
-    max: 16
-  },
-  'sampledTex': {
-    class: 'sampledTex',
-    max: 16
-  },
-  'storageTex': {
-    class: 'storageTex',
-    max: 4
-  }
-};
-export const kPerPipelineBindingLimits =
-/* prettier-ignore */
-{
-  'uniformBuf': {
-    class: 'uniformBuf',
-    maxDynamic: 8
-  },
-  'storageBuf': {
-    class: 'storageBuf',
-    maxDynamic: 4
-  },
-  'sampler': {
-    class: 'sampler',
-    maxDynamic: 0
-  },
-  'sampledTex': {
-    class: 'sampledTex',
-    maxDynamic: 0
-  },
-  'storageTex': {
-    class: 'storageTex',
-    maxDynamic: 0
-  }
-};
-const kBindableResource =
-/* prettier-ignore */
-{
-  uniformBuf: {},
-  storageBuf: {},
-  plainSamp: {},
-  compareSamp: {},
-  sampledTex: {},
-  storageTex: {},
-  errorBuf: {},
-  errorSamp: {},
-  errorTex: {}
-};
-export const kBindableResources = keysOf(kBindableResource);
-const kBindingKind =
-/* prettier-ignore */
-{
-  uniformBuf: {
-    resource: 'uniformBuf',
-    perStageLimitClass: kPerStageBindingLimits.uniformBuf,
-    perPipelineLimitClass: kPerPipelineBindingLimits.uniformBuf
-  },
-  storageBuf: {
-    resource: 'storageBuf',
-    perStageLimitClass: kPerStageBindingLimits.storageBuf,
-    perPipelineLimitClass: kPerPipelineBindingLimits.storageBuf
-  },
-  plainSamp: {
-    resource: 'plainSamp',
-    perStageLimitClass: kPerStageBindingLimits.sampler,
-    perPipelineLimitClass: kPerPipelineBindingLimits.sampler
-  },
-  compareSamp: {
-    resource: 'compareSamp',
-    perStageLimitClass: kPerStageBindingLimits.sampler,
-    perPipelineLimitClass: kPerPipelineBindingLimits.sampler
-  },
-  sampledTex: {
-    resource: 'sampledTex',
-    perStageLimitClass: kPerStageBindingLimits.sampledTex,
-    perPipelineLimitClass: kPerPipelineBindingLimits.sampledTex
-  },
-  storageTex: {
-    resource: 'storageTex',
-    perStageLimitClass: kPerStageBindingLimits.storageTex,
-    perPipelineLimitClass: kPerPipelineBindingLimits.storageTex
-  }
-}; // Binding type info
-
-const kValidStagesAll = {
-  validStages: GPUShaderStage.VERTEX | GPUShaderStage.FRAGMENT | GPUShaderStage.COMPUTE
-};
-const kValidStagesStorageWrite = {
-  validStages: GPUShaderStage.FRAGMENT | GPUShaderStage.COMPUTE
-};
-export const kBufferBindingTypeInfo =
-/* prettier-ignore */
-{
-  'uniform-buffer': {
-    usage: GPUBufferUsage.UNIFORM,
-    ...kBindingKind.uniformBuf,
-    ...kValidStagesAll
-  },
-  'storage-buffer': {
-    usage: GPUBufferUsage.STORAGE,
-    ...kBindingKind.storageBuf,
-    ...kValidStagesStorageWrite
-  },
-  'readonly-storage-buffer': {
-    usage: GPUBufferUsage.STORAGE,
-    ...kBindingKind.storageBuf,
-    ...kValidStagesAll
-  }
-};
-export const kBufferBindingTypes = keysOf(kBufferBindingTypeInfo);
-export const kSamplerBindingTypeInfo =
-/* prettier-ignore */
-{
-  'sampler': { ...kBindingKind.plainSamp,
-    ...kValidStagesAll
-  },
-  'comparison-sampler': { ...kBindingKind.compareSamp,
-    ...kValidStagesAll
-  }
-};
-export const kSamplerBindingTypes = keysOf(kSamplerBindingTypeInfo);
-export const kTextureBindingTypeInfo =
-/* prettier-ignore */
-{
-  'sampled-texture': {
-    usage: GPUTextureUsage.SAMPLED,
-    ...kBindingKind.sampledTex,
-    ...kValidStagesAll
-  },
-  'writeonly-storage-texture': {
-    usage: GPUTextureUsage.STORAGE,
-    ...kBindingKind.storageTex,
-    ...kValidStagesStorageWrite
-  },
-  'readonly-storage-texture': {
-    usage: GPUTextureUsage.STORAGE,
-    ...kBindingKind.storageTex,
-    ...kValidStagesAll
-  }
-};
-export const kTextureBindingTypes = keysOf(kTextureBindingTypeInfo); // All binding types (merged from above)
-
-export const kBindingTypeInfo = { ...kBufferBindingTypeInfo,
-  ...kSamplerBindingTypeInfo,
-  ...kTextureBindingTypeInfo
-};
-export const kBindingTypes = keysOf(kBindingTypeInfo);
-export const kShaderStages = [GPUShaderStage.VERTEX, GPUShaderStage.FRAGMENT, GPUShaderStage.COMPUTE];
-export const kShaderStageCombinations = [0, 1, 2, 3, 4, 5, 6, 7];
-//# sourceMappingURL=capability_info.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/examples.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/examples.spec.js
deleted file mode 100644
index 28b9ae47f2c..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/examples.spec.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-Examples of writing CTS tests with various features.
-
-Start here when looking for examples of basic framework usage.
-`;
-import { makeTestGroup } from '../common/framework/test_group.js';
-import { GPUTest } from './gpu_test.js'; // To run these tests in the standalone runner, run `grunt build` or `grunt pre` then open:
-// - http://localhost:8080/?runnow=1&q=webgpu:examples:
-// To run in WPT, copy/symlink the out-wpt/ directory as the webgpu/ directory in WPT, then open:
-// - (wpt server url)/webgpu/cts.html?q=webgpu:examples:
-//
-// Tests here can be run individually or in groups:
-// - ?q=webgpu:examples:basic/async=
-// - ?q=webgpu:examples:basic/
-// - ?q=webgpu:examples:
-
-export const g = makeTestGroup(GPUTest); // Note: spaces in test names are replaced with underscores: webgpu:examples:test_name=
-
-g.test('test_name').fn(t => {});
-g.test('basic').fn(t => {
-  t.expect(true);
-  t.expect(true, 'true should be true');
-  t.shouldThrow( // The expected '.name' of the thrown error.
-  'TypeError', // This function is run inline inside shouldThrow, and is expected to throw.
-  () => {
-    throw new TypeError();
-  }, // Log message.
-  'function should throw Error');
-});
-g.test('basic,async').fn(async t => {
-  // shouldReject must be awaited to ensure it can wait for the promise before the test ends.
-  t.shouldReject( // The expected '.name' of the thrown error.
-  'TypeError', // Promise expected to reject.
-  Promise.reject(new TypeError()), // Log message.
-  'Promise.reject should reject'); // Promise can also be an IIFE.
-
-  t.shouldReject('TypeError', (async () => {
-    throw new TypeError();
-  })(), 'Promise.reject should reject');
-}); // A test can be parameterized with a simple array of objects.
-//
-// Parameters can be public (x, y) which means they're part of the case name.
-// They can also be private by starting with an underscore (_result), which passes
-// them into the test but does not make them part of the case name:
-//
-// - webgpu:examples:basic/params={"x":2,"y":4}    runs with t.params = {x: 2, y: 5, _result: 6}.
-// - webgpu:examples:basic/params={"x":-10,"y":18} runs with t.params = {x: -10, y: 18, _result: 8}.
-
-g.test('basic,params').params([{
-  x: 2,
-  y: 4,
-  _result: 6
-}, //
-{
-  x: -10,
-  y: 18,
-  _result: 8
-}]).fn(t => {
-  t.expect(t.params.x + t.params.y === t.params._result);
-}); // (note the blank comment above to enforce newlines on autoformat)
-
-g.test('gpu,async').fn(async t => {
-  const fence = t.queue.createFence();
-  t.queue.signal(fence, 2);
-  await fence.onCompletion(1);
-  t.expect(fence.getCompletedValue() === 2);
-});
-g.test('gpu,buffers').fn(async t => {
-  const data = new Uint32Array([0, 1234, 0]);
-  const [src, map] = t.device.createBufferMapped({
-    size: 12,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  new Uint32Array(map).set(data);
-  src.unmap(); // Use the expectContents helper to check the actual contents of a GPUBuffer.
-  // Like shouldReject, it must be awaited.
-
-  t.expectContents(src, data);
-});
-//# sourceMappingURL=examples.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/gpu_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/gpu_test.js
deleted file mode 100644
index e740af1113b..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/gpu_test.js
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { Fixture } from '../common/framework/fixture.js';
-import { DevicePool, TestOOMedShouldAttemptGC } from '../common/framework/gpu/device_pool.js';
-import { attemptGarbageCollection } from '../common/framework/util/collect_garbage.js';
-import { assert } from '../common/framework/util/util.js';
-import { fillTextureDataWithTexelValue, getTextureCopyLayout } from './util/texture/layout.js';
-import { getTexelDataRepresentation } from './util/texture/texelData.js';
-const devicePool = new DevicePool();
-export class GPUTest extends Fixture {
-  constructor(...args) {
-    super(...args);
-
-    _defineProperty(this, "objects", undefined);
-
-    _defineProperty(this, "initialized", false);
-  }
-
-  get device() {
-    assert(this.objects !== undefined);
-    return this.objects.device;
-  }
-
-  get queue() {
-    assert(this.objects !== undefined);
-    return this.objects.queue;
-  }
-
-  async init() {
-    await super.init();
-    const device = await devicePool.acquire();
-    const queue = device.defaultQueue;
-    this.objects = {
-      device,
-      queue
-    };
-  } // Note: finalize is called even if init was unsuccessful.
-
-
-  async finalize() {
-    await super.finalize();
-
-    if (this.objects) {
-      let threw;
-      {
-        const objects = this.objects;
-        this.objects = undefined;
-
-        try {
-          await devicePool.release(objects.device);
-        } catch (ex) {
-          threw = ex;
-        }
-      } // The GPUDevice and GPUQueue should now have no outstanding references.
-
-      if (threw) {
-        if (threw instanceof TestOOMedShouldAttemptGC) {
-          // Try to clean up, in case there are stray GPU resources in need of collection.
-          await attemptGarbageCollection();
-        }
-
-        throw threw;
-      }
-    }
-  }
-
-  createCopyForMapRead(src, size) {
-    const dst = this.device.createBuffer({
-      size,
-      usage: GPUBufferUsage.MAP_READ | GPUBufferUsage.COPY_DST
-    });
-    const c = this.device.createCommandEncoder();
-    c.copyBufferToBuffer(src, 0, dst, 0, size);
-    this.queue.submit([c.finish()]);
-    return dst;
-  } // TODO: add an expectContents for textures, which logs data: uris on failure
-
-
-  expectContents(src, expected) {
-    const dst = this.createCopyForMapRead(src, expected.buffer.byteLength);
-    this.eventualAsyncExpectation(async niceStack => {
-      const constructor = expected.constructor;
-      const actual = new constructor(await dst.mapReadAsync());
-      const check = this.checkBuffer(actual, expected);
-
-      if (check !== undefined) {
-        niceStack.message = check;
-        this.rec.expectationFailed(niceStack);
-      }
-
-      dst.destroy();
-    });
-  }
-
-  expectBuffer(actual, exp) {
-    const check = this.checkBuffer(actual, exp);
-
-    if (check !== undefined) {
-      this.rec.expectationFailed(new Error(check));
-    }
-  }
-
-  checkBuffer(actual, exp, tolerance = 0) {
-    assert(actual.constructor === exp.constructor);
-    const size = exp.byteLength;
-
-    if (actual.byteLength !== size) {
-      return 'size mismatch';
-    }
-
-    const failedByteIndices = [];
-    const failedByteExpectedValues = [];
-    const failedByteActualValues = [];
-
-    for (let i = 0; i < size; ++i) {
-      const tol = typeof tolerance === 'function' ? tolerance(i) : tolerance;
-
-      if (Math.abs(actual[i] - exp[i]) > tol) {
-        if (failedByteIndices.length >= 4) {
-          failedByteIndices.push('...');
-          failedByteExpectedValues.push('...');
-          failedByteActualValues.push('...');
-          break;
-        }
-
-        failedByteIndices.push(i.toString());
-        failedByteExpectedValues.push(exp[i].toString());
-        failedByteActualValues.push(actual[i].toString());
-      }
-    }
-
-    const summary = `at [${failedByteIndices.join(', ')}], \
-expected [${failedByteExpectedValues.join(', ')}], \
-got [${failedByteActualValues.join(', ')}]`;
-    const lines = [summary]; // TODO: Could make a more convenient message, which could look like e.g.:
-    //
-    //   Starting at offset 48,
-    //              got 22222222 ABCDABCD 99999999
-    //     but expected 22222222 55555555 99999999
-    //
-    // or
-    //
-    //   Starting at offset 0,
-    //              got 00000000 00000000 00000000 00000000 (... more)
-    //     but expected 00FF00FF 00FF00FF 00FF00FF 00FF00FF (... more)
-    //
-    // Or, maybe these diffs aren't actually very useful (given we have the prints just above here),
-    // and we should remove them. More important will be logging of texture data in a visual format.
-
-    if (size <= 256 && failedByteIndices.length > 0) {
-      const expHex = Array.from(new Uint8Array(exp.buffer, exp.byteOffset, exp.byteLength)).map(x => x.toString(16).padStart(2, '0')).join('');
-      const actHex = Array.from(new Uint8Array(actual.buffer, actual.byteOffset, actual.byteLength)).map(x => x.toString(16).padStart(2, '0')).join('');
-      lines.push('EXPECT:\t  ' + exp.join(' '));
-      lines.push('\t0x' + expHex);
-      lines.push('ACTUAL:\t  ' + actual.join(' '));
-      lines.push('\t0x' + actHex);
-    }
-
-    if (failedByteIndices.length) {
-      return lines.join('\n');
-    }
-
-    return undefined;
-  }
-
-  expectSingleColor(src, format, {
-    size,
-    exp,
-    dimension = '2d',
-    slice = 0,
-    layout
-  }) {
-    const {
-      byteLength,
-      bytesPerRow,
-      rowsPerImage,
-      mipSize
-    } = getTextureCopyLayout(format, dimension, size, layout);
-    const expectedTexelData = getTexelDataRepresentation(format).getBytes(exp);
-    const buffer = this.device.createBuffer({
-      size: byteLength,
-      usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-    });
-    const commandEncoder = this.device.createCommandEncoder();
-    commandEncoder.copyTextureToBuffer({
-      texture: src,
-      mipLevel: layout?.mipLevel,
-      arrayLayer: slice
-    }, {
-      buffer,
-      bytesPerRow,
-      rowsPerImage
-    }, mipSize);
-    this.queue.submit([commandEncoder.finish()]);
-    const arrayBuffer = new ArrayBuffer(byteLength);
-    fillTextureDataWithTexelValue(expectedTexelData, format, dimension, arrayBuffer, size, layout);
-    this.expectContents(buffer, new Uint8Array(arrayBuffer));
-  }
-
-  expectGPUError(filter, fn) {
-    this.device.pushErrorScope(filter);
-    const returnValue = fn();
-    const promise = this.device.popErrorScope();
-    this.eventualAsyncExpectation(async niceStack => {
-      const error = await promise;
-      let failed = false;
-
-      switch (filter) {
-        case 'none':
-          failed = error !== null;
-          break;
-
-        case 'out-of-memory':
-          failed = !(error instanceof GPUOutOfMemoryError);
-          break;
-
-        case 'validation':
-          failed = !(error instanceof GPUValidationError);
-          break;
-      }
-
-      if (failed) {
-        niceStack.message = `Expected ${filter} error`;
-        this.rec.expectationFailed(niceStack);
-      } else {
-        niceStack.message = `Captured ${filter} error`;
-
-        if (error instanceof GPUValidationError) {
-          niceStack.message += ` - ${error.message}`;
-        }
-
-        this.rec.debug(niceStack);
-      }
-    });
-    return returnValue;
-  }
-
-}
-//# sourceMappingURL=gpu_test.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/idl/constants/flags.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/idl/constants/flags.spec.js
deleted file mode 100644
index 5a6d7868aa5..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/idl/constants/flags.spec.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-Test the values of flags interfaces (e.g. GPUTextureUsage).
-`;
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-import { IDLTest } from '../idl_test.js';
-export const g = makeTestGroup(IDLTest);
-g.test('BufferUsage').fn(t => {
-  const expected = {
-    MAP_READ: 0x0001,
-    MAP_WRITE: 0x0002,
-    COPY_SRC: 0x0004,
-    COPY_DST: 0x0008,
-    INDEX: 0x0010,
-    VERTEX: 0x0020,
-    UNIFORM: 0x0040,
-    STORAGE: 0x0080,
-    INDIRECT: 0x0100
-  };
-  t.assertMembers(GPUBufferUsage, expected);
-});
-g.test('TextureUsage').fn(t => {
-  const expected = {
-    COPY_SRC: 0x01,
-    COPY_DST: 0x02,
-    SAMPLED: 0x04,
-    STORAGE: 0x08,
-    OUTPUT_ATTACHMENT: 0x10
-  };
-  t.assertMembers(GPUTextureUsage, expected);
-});
-g.test('ColorWrite').fn(t => {
-  const expected = {
-    RED: 0x1,
-    GREEN: 0x2,
-    BLUE: 0x4,
-    ALPHA: 0x8,
-    ALL: 0xf
-  };
-  t.assertMembers(GPUColorWrite, expected);
-});
-g.test('ShaderStage').fn(t => {
-  const expected = {
-    VERTEX: 0x1,
-    FRAGMENT: 0x2,
-    COMPUTE: 0x4
-  };
-  t.assertMembers(GPUShaderStage, expected);
-});
-//# sourceMappingURL=flags.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/idl/idl_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/idl/idl_test.js
deleted file mode 100644
index 0665ad208cd..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/idl/idl_test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { Fixture } from '../../common/framework/fixture.js';
-import { assert } from '../../common/framework/util/util.js';
-export class IDLTest extends Fixture {
-  /**
-   * Asserts that an IDL interface has the expected members.
-   */
-  // TODO: exp should allow sentinel markers for unnameable values, such as methods and attributes
-  // TODO: handle extensions
-  // TODO: check prototype chains (maybe as separate method)
-  assertMembers(act, exp) {
-    const expKeys = Object.keys(exp);
-
-    for (const k of expKeys) {
-      assert(k in act, () => `Expected key ${k} missing`);
-      assert(act[k] === exp[k], () => `Value of [${k}] was ${act[k]}, expected ${exp[k]}`);
-    }
-
-    const actKeys = Object.keys(act);
-    assert(actKeys.length === expKeys.length, () => `Had ${actKeys.length} keys, expected ${expKeys.length}`);
-  }
-
-}
-//# sourceMappingURL=idl_test.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/listing.js b/tests/wpt/web-platform-tests/webgpu/webgpu/listing.js
deleted file mode 100644
index a8b67e72547..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/listing.js
+++ /dev/null
@@ -1,304 +0,0 @@
-// AUTO-GENERATED - DO NOT EDIT. See src/common/tools/gen_listings.ts.
-
-export const listing = [
-  {
-    "file": [],
-    "readme": "WebGPU conformance test suite."
-  },
-  {
-    "file": [
-      "api"
-    ],
-    "readme": "Tests for full coverage of the Javascript API surface of WebGPU."
-  },
-  {
-    "file": [
-      "api",
-      "operation"
-    ],
-    "readme": "Tests that check the result of performing valid WebGPU operations, taking advantage of\nparameterization to exercise interactions between features."
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "buffers"
-    ],
-    "readme": "GPUBuffer tests."
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "buffers",
-      "create_mapped"
-    ],
-    "description": ""
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "buffers",
-      "map"
-    ],
-    "description": ""
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "buffers",
-      "map_detach"
-    ],
-    "description": ""
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "buffers",
-      "map_oom"
-    ],
-    "description": ""
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "command_buffer",
-      "basic"
-    ],
-    "description": "Basic tests."
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "command_buffer",
-      "copies"
-    ],
-    "description": "copy{Buffer,Texture}To{Buffer,Texture} tests."
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "command_buffer",
-      "render",
-      "basic"
-    ],
-    "description": "Basic command buffer rendering tests."
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "fences"
-    ],
-    "description": ""
-  },
-  {
-    "file": [
-      "api",
-      "operation",
-      "resource_init",
-      "copied_texture_clear"
-    ],
-    "description": "Test uninitialized textures are initialized to zero when copied."
-  },
-  {
-    "file": [
-      "api",
-      "regression"
-    ],
-    "readme": "One-off tests that reproduce API bugs found in implementations to prevent the bugs from\nappearing again."
-  },
-  {
-    "file": [
-      "api",
-      "validation"
-    ],
-    "readme": "Positive and negative tests for all the validation rules of the API."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "createBindGroup"
-    ],
-    "description": "createBindGroup validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "createBindGroupLayout"
-    ],
-    "description": "createBindGroupLayout validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "createPipelineLayout"
-    ],
-    "description": "createPipelineLayout validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "createTexture"
-    ],
-    "description": "createTexture validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "createView"
-    ],
-    "description": "createView validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "error_scope"
-    ],
-    "description": "error scope validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "fences"
-    ],
-    "description": "fences validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "queue_submit"
-    ],
-    "description": "queue submit validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "render_pass_descriptor"
-    ],
-    "description": "render pass descriptor validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "setBindGroup"
-    ],
-    "description": "setBindGroup validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "setBlendColor"
-    ],
-    "description": "setBlendColor validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "setScissorRect"
-    ],
-    "description": "setScissorRect validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "setStencilReference"
-    ],
-    "description": "setStencilReference validation tests."
-  },
-  {
-    "file": [
-      "api",
-      "validation",
-      "setViewport"
-    ],
-    "description": "setViewport validation tests."
-  },
-  {
-    "file": [
-      "examples"
-    ],
-    "description": "Examples of writing CTS tests with various features.\n\nStart here when looking for examples of basic framework usage."
-  },
-  {
-    "file": [
-      "idl"
-    ],
-    "readme": "Tests to check that the WebGPU IDL is correctly implemented, for examples that objects exposed\nexactly the correct members, and that methods throw when passed incomplete dictionaries."
-  },
-  {
-    "file": [
-      "idl",
-      "constants",
-      "flags"
-    ],
-    "description": "Test the values of flags interfaces (e.g. GPUTextureUsage)."
-  },
-  {
-    "file": [
-      "shader"
-    ],
-    "readme": "Tests for full coverage of the shaders that can be passed to WebGPU."
-  },
-  {
-    "file": [
-      "shader",
-      "execution"
-    ],
-    "readme": "Tests that check the result of valid shader execution."
-  },
-  {
-    "file": [
-      "shader",
-      "regression"
-    ],
-    "readme": "One-off tests that reproduce shader bugs found in implementations to prevent the bugs from\nappearing again."
-  },
-  {
-    "file": [
-      "shader",
-      "validation"
-    ],
-    "readme": "Positive and negative tests for all the validation rules of the shading language."
-  },
-  {
-    "file": [
-      "web-platform"
-    ],
-    "readme": "Tests for Web platform-specific interactions like GPUSwapChain and canvas, WebXR,\nImageBitmaps, and video APIs."
-  },
-  {
-    "file": [
-      "web-platform",
-      "canvas",
-      "context_creation"
-    ],
-    "description": ""
-  },
-  {
-    "file": [
-      "web-platform",
-      "copyImageBitmapToTexture"
-    ],
-    "description": "copy imageBitmap To texture tests."
-  }
-];
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/util/conversion.js b/tests/wpt/web-platform-tests/webgpu/webgpu/util/conversion.js
deleted file mode 100644
index 73c04fe56ba..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/util/conversion.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { assert } from '../../common/framework/util/util.js';
-export function floatAsNormalizedInteger(float, bits, signed) {
-  if (signed) {
-    assert(float >= -1 && float <= 1);
-    const max = Math.pow(2, bits - 1) - 1;
-    return Math.round(float * max);
-  } else {
-    assert(float >= 0 && float <= 1);
-    const max = Math.pow(2, bits) - 1;
-    return Math.round(float * max);
-  }
-} // Does not handle clamping, underflow, overflow, denormalized numbers
-
-export function float32ToFloatBits(n, signBits, exponentBits, fractionBits, bias) {
-  assert(exponentBits <= 8);
-  assert(fractionBits <= 23);
-  assert(Number.isFinite(n));
-
-  if (n === 0) {
-    return 0;
-  }
-
-  if (signBits === 0) {
-    assert(n >= 0);
-  }
-
-  const buf = new DataView(new ArrayBuffer(Float32Array.BYTES_PER_ELEMENT));
-  buf.setFloat32(0, n, true);
-  const bits = buf.getUint32(0, true); // bits (32): seeeeeeeefffffffffffffffffffffff
-
-  const fractionBitsToDiscard = 23 - fractionBits; // 0 or 1
-
-  const sign = bits >> 31 & signBits; // >> to remove fraction, & to remove sign, - 127 to remove bias.
-
-  const exp = (bits >> 23 & 0xff) - 127; // Convert to the new biased exponent.
-
-  const newBiasedExp = bias + exp;
-  assert(newBiasedExp >= 0 && newBiasedExp < 1 << exponentBits); // Mask only the fraction, and discard the lower bits.
-
-  const newFraction = (bits & 0x7fffff) >> fractionBitsToDiscard;
-  return sign << exponentBits + fractionBits | newBiasedExp << fractionBits | newFraction;
-}
-export function assertInIntegerRange(n, bits, signed) {
-  if (signed) {
-    const min = -Math.pow(2, bits - 1);
-    const max = Math.pow(2, bits - 1) - 1;
-    assert(n >= min && n <= max);
-  } else {
-    const max = Math.pow(2, bits) - 1;
-    assert(n >= 0 && n <= max);
-  }
-}
-export function gammaCompress(n) {
-  n = n <= 0.0031308 ? 12.92 * n : 1.055 * Math.pow(n, 1 / 2.4) - 0.055;
-  return n < 0 ? 0 : n > 1 ? 1 : n;
-}
-//# sourceMappingURL=conversion.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/util/math.js b/tests/wpt/web-platform-tests/webgpu/webgpu/util/math.js
deleted file mode 100644
index 19720d631c5..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/util/math.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export function align(n, alignment) {
-  return Math.ceil(n / alignment) * alignment;
-}
-export function isAligned(n, alignment) {
-  return n === align(n, alignment);
-}
-//# sourceMappingURL=math.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/layout.js b/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/layout.js
deleted file mode 100644
index 425aa2020d7..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/layout.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { assert, unreachable } from '../../../common/framework/util/util.js';
-import { kTextureFormatInfo } from '../../capability_info.js';
-import { align, isAligned } from '../math.js';
-export const kBytesPerRowAlignment = 256;
-export const kBufferCopyAlignment = 4;
-const kDefaultLayoutOptions = {
-  mipLevel: 0,
-  bytesPerRow: undefined,
-  rowsPerImage: undefined
-};
-export function getMipSizePassthroughLayers(dimension, size, mipLevel) {
-  const shiftMinOne = n => Math.max(1, n >> mipLevel);
-
-  switch (dimension) {
-    case '1d':
-      assert(size[2] === 1);
-      return [shiftMinOne(size[0]), size[1], size[2]];
-
-    case '2d':
-      return [shiftMinOne(size[0]), shiftMinOne(size[1]), size[2]];
-
-    case '3d':
-      return [shiftMinOne(size[0]), shiftMinOne(size[1]), shiftMinOne(size[2])];
-
-    default:
-      unreachable();
-  }
-}
-export function getTextureCopyLayout(format, dimension, size, options = kDefaultLayoutOptions) {
-  const {
-    mipLevel
-  } = options;
-  let {
-    bytesPerRow,
-    rowsPerImage
-  } = options;
-  const mipSize = getMipSizePassthroughLayers(dimension, size, mipLevel);
-  const {
-    blockWidth,
-    blockHeight,
-    bytesPerBlock
-  } = kTextureFormatInfo[format];
-  assert(!!bytesPerBlock && !!blockWidth && !!blockHeight);
-  assert(isAligned(mipSize[0], blockWidth));
-  const minBytesPerRow = mipSize[0] / blockWidth * bytesPerBlock;
-  const alignedMinBytesPerRow = align(minBytesPerRow, kBytesPerRowAlignment);
-
-  if (bytesPerRow !== undefined) {
-    assert(bytesPerRow >= alignedMinBytesPerRow);
-    assert(isAligned(bytesPerRow, kBytesPerRowAlignment));
-  } else {
-    bytesPerRow = alignedMinBytesPerRow;
-  }
-
-  if (rowsPerImage !== undefined) {
-    assert(rowsPerImage >= mipSize[1]);
-  } else {
-    rowsPerImage = mipSize[1];
-  }
-
-  assert(isAligned(rowsPerImage, blockHeight));
-  const bytesPerSlice = bytesPerRow * (rowsPerImage / blockHeight);
-  const sliceSize = bytesPerRow * (mipSize[1] / blockHeight - 1) + bytesPerBlock * (mipSize[0] / blockWidth);
-  const byteLength = bytesPerSlice * (mipSize[2] - 1) + sliceSize;
-  return {
-    bytesPerBlock,
-    byteLength: align(byteLength, kBufferCopyAlignment),
-    minBytesPerRow,
-    bytesPerRow,
-    rowsPerImage,
-    mipSize
-  };
-}
-export function fillTextureDataWithTexelValue(texelValue, format, dimension, outputBuffer, size, options = kDefaultLayoutOptions) {
-  const {
-    blockWidth,
-    blockHeight,
-    bytesPerBlock
-  } = kTextureFormatInfo[format];
-  assert(!!bytesPerBlock && !!blockWidth && !!blockHeight);
-  assert(bytesPerBlock === texelValue.byteLength);
-  const {
-    byteLength,
-    rowsPerImage,
-    bytesPerRow
-  } = getTextureCopyLayout(format, dimension, size, options);
-  assert(byteLength <= outputBuffer.byteLength);
-  const mipSize = getMipSizePassthroughLayers(dimension, size, options.mipLevel);
-  const texelValueBytes = new Uint8Array(texelValue);
-  const outputTexelValueBytes = new Uint8Array(outputBuffer);
-
-  for (let slice = 0; slice < mipSize[2]; ++slice) {
-    for (let row = 0; row < mipSize[1]; row += blockHeight) {
-      for (let col = 0; col < mipSize[0]; col += blockWidth) {
-        const byteOffset = slice * rowsPerImage * bytesPerRow + row * bytesPerRow + col * texelValue.byteLength;
-        outputTexelValueBytes.set(texelValueBytes, byteOffset);
-      }
-    }
-  }
-}
-export function createTextureUploadBuffer(texelValue, device, format, dimension, size, options = kDefaultLayoutOptions) {
-  const {
-    byteLength,
-    bytesPerRow,
-    rowsPerImage,
-    bytesPerBlock
-  } = getTextureCopyLayout(format, dimension, size, options);
-  const [buffer, mapping] = device.createBufferMapped({
-    size: byteLength,
-    usage: GPUBufferUsage.COPY_SRC
-  });
-  assert(texelValue.byteLength === bytesPerBlock);
-  fillTextureDataWithTexelValue(texelValue, format, dimension, mapping, size, options);
-  buffer.unmap();
-  return {
-    buffer,
-    bytesPerRow,
-    rowsPerImage
-  };
-}
-//# sourceMappingURL=layout.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/subresource.js b/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/subresource.js
deleted file mode 100644
index 04a8e7221a8..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/subresource.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function endOfRange(r) {
-  return 'count' in r ? r.begin + r.count : r.end;
-}
-
-function* rangeAsIterator(r) {
-  for (let i = r.begin; i < endOfRange(r); ++i) {
-    yield i;
-  }
-}
-
-export class SubresourceRange {
-  constructor(subresources) {
-    _defineProperty(this, "mipRange", void 0);
-
-    _defineProperty(this, "sliceRange", void 0);
-
-    this.mipRange = {
-      begin: subresources.mipRange.begin,
-      end: endOfRange(subresources.mipRange)
-    };
-    this.sliceRange = {
-      begin: subresources.sliceRange.begin,
-      end: endOfRange(subresources.sliceRange)
-    };
-  }
-
-  *each() {
-    for (let level = this.mipRange.begin; level < this.mipRange.end; ++level) {
-      for (let slice = this.sliceRange.begin; slice < this.sliceRange.end; ++slice) {
-        yield {
-          level,
-          slice
-        };
-      }
-    }
-  }
-
-  *mipLevels() {
-    for (let level = this.mipRange.begin; level < this.mipRange.end; ++level) {
-      yield {
-        level,
-        slices: rangeAsIterator(this.sliceRange)
-      };
-    }
-  }
-
-}
-//# sourceMappingURL=subresource.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/texelData.js b/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/texelData.js
deleted file mode 100644
index 2ea7275e710..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/util/texture/texelData.js
+++ /dev/null
@@ -1,455 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { assert, unreachable } from '../../../common/framework/util/util.js';
-import { kTextureFormatInfo } from '../../capability_info.js';
-import { assertInIntegerRange, float32ToFloatBits, floatAsNormalizedInteger, gammaCompress } from '../conversion.js';
-export let TexelComponent;
-
-(function (TexelComponent) {
-  TexelComponent["R"] = "R";
-  TexelComponent["G"] = "G";
-  TexelComponent["B"] = "B";
-  TexelComponent["A"] = "A";
-  TexelComponent["Depth"] = "Depth";
-  TexelComponent["Stencil"] = "Stencil";
-})(TexelComponent || (TexelComponent = {}));
-
-var TexelWriteType; // Function to convert a value into a texel value. It returns the converted value
-// and the type of the converted value. For example, conversion may convert:
-//  - floats to unsigned normalized integers
-//  - floats to half floats, interpreted as uint16 bits
-
-(function (TexelWriteType) {
-  TexelWriteType[TexelWriteType["Sint"] = 0] = "Sint";
-  TexelWriteType[TexelWriteType["Uint"] = 1] = "Uint";
-  TexelWriteType[TexelWriteType["Float"] = 2] = "Float";
-})(TexelWriteType || (TexelWriteType = {}));
-
-const kR = [TexelComponent.R];
-const kRG = [TexelComponent.R, TexelComponent.G];
-const kRGB = [TexelComponent.R, TexelComponent.G, TexelComponent.B];
-const kRGBA = [TexelComponent.R, TexelComponent.G, TexelComponent.B, TexelComponent.A];
-const kBGRA = [TexelComponent.B, TexelComponent.G, TexelComponent.R, TexelComponent.A];
-
-const unorm = bitLength => n => ({
-  value: floatAsNormalizedInteger(n, bitLength, false),
-  type: TexelWriteType.Uint
-});
-
-const snorm = bitLength => n => ({
-  value: floatAsNormalizedInteger(n, bitLength, true),
-  type: TexelWriteType.Sint
-});
-
-const uint = bitLength => n => ({
-  value: (assertInIntegerRange(n, bitLength, false), n),
-  type: TexelWriteType.Uint
-});
-
-const sint = bitLength => n => ({
-  value: (assertInIntegerRange(n, bitLength, true), n),
-  type: TexelWriteType.Sint
-});
-
-const unorm2 = {
-  write: unorm(2),
-  bitLength: 2
-};
-const unorm8 = {
-  write: unorm(8),
-  bitLength: 8
-};
-const unorm10 = {
-  write: unorm(10),
-  bitLength: 10
-};
-const snorm8 = {
-  write: snorm(8),
-  bitLength: 8
-};
-const uint8 = {
-  write: uint(8),
-  bitLength: 8
-};
-const uint16 = {
-  write: uint(16),
-  bitLength: 16
-};
-const uint32 = {
-  write: uint(32),
-  bitLength: 32
-};
-const sint8 = {
-  write: sint(8),
-  bitLength: 8
-};
-const sint16 = {
-  write: sint(16),
-  bitLength: 16
-};
-const sint32 = {
-  write: sint(32),
-  bitLength: 32
-};
-const float10 = {
-  write: n => ({
-    value: float32ToFloatBits(n, 0, 5, 5, 15),
-    type: TexelWriteType.Uint
-  }),
-  bitLength: 10
-};
-const float11 = {
-  write: n => ({
-    value: float32ToFloatBits(n, 0, 5, 6, 15),
-    type: TexelWriteType.Uint
-  }),
-  bitLength: 11
-};
-const float16 = {
-  write: n => ({
-    value: float32ToFloatBits(n, 1, 5, 10, 15),
-    type: TexelWriteType.Uint
-  }),
-  bitLength: 16
-};
-const float32 = {
-  write: n => ({
-    value: Math.fround(n),
-    type: TexelWriteType.Float
-  }),
-  bitLength: 32
-};
-
-const repeatComponents = (componentOrder, perComponentInfo) => {
-  const componentInfo = componentOrder.reduce((acc, curr) => {
-    return Object.assign(acc, {
-      [curr]: perComponentInfo
-    });
-  }, {});
-  return {
-    componentOrder,
-    componentInfo
-  };
-};
-
-const kRepresentationInfo =
-/* prettier-ignore */
-{
-  'r8unorm': { ...repeatComponents(kR, unorm8),
-    sRGB: false
-  },
-  'r8snorm': { ...repeatComponents(kR, snorm8),
-    sRGB: false
-  },
-  'r8uint': { ...repeatComponents(kR, uint8),
-    sRGB: false
-  },
-  'r8sint': { ...repeatComponents(kR, sint8),
-    sRGB: false
-  },
-  'r16uint': { ...repeatComponents(kR, uint16),
-    sRGB: false
-  },
-  'r16sint': { ...repeatComponents(kR, sint16),
-    sRGB: false
-  },
-  'r16float': { ...repeatComponents(kR, float16),
-    sRGB: false
-  },
-  'rg8unorm': { ...repeatComponents(kRG, unorm8),
-    sRGB: false
-  },
-  'rg8snorm': { ...repeatComponents(kRG, snorm8),
-    sRGB: false
-  },
-  'rg8uint': { ...repeatComponents(kRG, uint8),
-    sRGB: false
-  },
-  'rg8sint': { ...repeatComponents(kRG, sint8),
-    sRGB: false
-  },
-  'r32uint': { ...repeatComponents(kR, uint32),
-    sRGB: false
-  },
-  'r32sint': { ...repeatComponents(kR, sint32),
-    sRGB: false
-  },
-  'r32float': { ...repeatComponents(kR, float32),
-    sRGB: false
-  },
-  'rg16uint': { ...repeatComponents(kRG, uint16),
-    sRGB: false
-  },
-  'rg16sint': { ...repeatComponents(kRG, sint16),
-    sRGB: false
-  },
-  'rg16float': { ...repeatComponents(kRG, float16),
-    sRGB: false
-  },
-  'rgba8unorm': { ...repeatComponents(kRGBA, unorm8),
-    sRGB: false
-  },
-  'rgba8unorm-srgb': { ...repeatComponents(kRGBA, unorm8),
-    sRGB: true
-  },
-  'rgba8snorm': { ...repeatComponents(kRGBA, snorm8),
-    sRGB: false
-  },
-  'rgba8uint': { ...repeatComponents(kRGBA, uint8),
-    sRGB: false
-  },
-  'rgba8sint': { ...repeatComponents(kRGBA, sint8),
-    sRGB: false
-  },
-  'bgra8unorm': { ...repeatComponents(kBGRA, unorm8),
-    sRGB: false
-  },
-  'bgra8unorm-srgb': { ...repeatComponents(kBGRA, unorm8),
-    sRGB: true
-  },
-  'rg32uint': { ...repeatComponents(kRG, uint32),
-    sRGB: false
-  },
-  'rg32sint': { ...repeatComponents(kRG, sint32),
-    sRGB: false
-  },
-  'rg32float': { ...repeatComponents(kRG, float32),
-    sRGB: false
-  },
-  'rgba16uint': { ...repeatComponents(kRGBA, uint16),
-    sRGB: false
-  },
-  'rgba16sint': { ...repeatComponents(kRGBA, sint16),
-    sRGB: false
-  },
-  'rgba16float': { ...repeatComponents(kRGBA, float16),
-    sRGB: false
-  },
-  'rgba32uint': { ...repeatComponents(kRGBA, uint32),
-    sRGB: false
-  },
-  'rgba32sint': { ...repeatComponents(kRGBA, sint32),
-    sRGB: false
-  },
-  'rgba32float': { ...repeatComponents(kRGBA, float32),
-    sRGB: false
-  },
-  'rgb10a2unorm': {
-    componentOrder: kRGBA,
-    componentInfo: {
-      R: unorm10,
-      G: unorm10,
-      B: unorm10,
-      A: unorm2
-    },
-    sRGB: false
-  },
-  'rg11b10float': {
-    componentOrder: kRGB,
-    componentInfo: {
-      R: float11,
-      G: float11,
-      B: float10
-    },
-    sRGB: false
-  },
-  'depth32float': {
-    componentOrder: [TexelComponent.Depth],
-    componentInfo: {
-      Depth: float32
-    },
-    sRGB: false
-  },
-  'depth24plus': {
-    componentOrder: [TexelComponent.Depth],
-    componentInfo: {
-      Depth: null
-    },
-    sRGB: false
-  },
-  'depth24plus-stencil8': {
-    componentOrder: [TexelComponent.Depth, TexelComponent.Stencil],
-    componentInfo: {
-      Depth: null,
-      Stencil: null
-    },
-    sRGB: false
-  }
-};
-
-class TexelDataRepresentationImpl {
-  // TODO: Determine endianness of the GPU data?
-  constructor(format, componentOrder, componentInfo, sRGB) {
-    this.format = format;
-    this.componentOrder = componentOrder;
-    this.componentInfo = componentInfo;
-    this.sRGB = sRGB;
-
-    _defineProperty(this, "isGPULittleEndian", true);
-  }
-
-  totalBitLength() {
-    return this.componentOrder.reduce((acc, curr) => {
-      return acc + this.componentInfo[curr].bitLength;
-    }, 0);
-  }
-
-  setComponent(data, component, n) {
-    const componentIndex = this.componentOrder.indexOf(component);
-    assert(componentIndex !== -1);
-    const bitOffset = this.componentOrder.slice(0, componentIndex).reduce((acc, curr) => {
-      const componentInfo = this.componentInfo[curr];
-      assert(!!componentInfo);
-      return acc + componentInfo.bitLength;
-    }, 0);
-    const componentInfo = this.componentInfo[component];
-    assert(!!componentInfo);
-    const {
-      write,
-      bitLength
-    } = componentInfo;
-    const {
-      value,
-      type
-    } = write(n);
-
-    switch (type) {
-      case TexelWriteType.Float:
-        {
-          const byteOffset = Math.floor(bitOffset / 8);
-          const byteLength = Math.ceil(bitLength / 8);
-          assert(byteOffset === bitOffset / 8 && byteLength === bitLength / 8);
-
-          switch (byteLength) {
-            case 4:
-              new DataView(data, byteOffset, byteLength).setFloat32(0, value, this.isGPULittleEndian);
-              break;
-
-            default:
-              unreachable();
-          }
-
-          break;
-        }
-
-      case TexelWriteType.Sint:
-        {
-          const byteOffset = Math.floor(bitOffset / 8);
-          const byteLength = Math.ceil(bitLength / 8);
-          assert(byteOffset === bitOffset / 8 && byteLength === bitLength / 8);
-
-          switch (byteLength) {
-            case 1:
-              new DataView(data, byteOffset, byteLength).setInt8(0, value);
-              break;
-
-            case 2:
-              new DataView(data, byteOffset, byteLength).setInt16(0, value, this.isGPULittleEndian);
-              break;
-
-            case 4:
-              new DataView(data, byteOffset, byteLength).setInt32(0, value, this.isGPULittleEndian);
-              break;
-
-            default:
-              unreachable();
-          }
-
-          break;
-        }
-
-      case TexelWriteType.Uint:
-        {
-          const byteOffset = Math.floor(bitOffset / 8);
-          const byteLength = Math.ceil(bitLength / 8);
-
-          if (byteOffset === bitOffset / 8 && byteLength === bitLength / 8) {
-            switch (byteLength) {
-              case 1:
-                new DataView(data, byteOffset, byteLength).setUint8(0, value);
-                break;
-
-              case 2:
-                new DataView(data, byteOffset, byteLength).setUint16(0, value, this.isGPULittleEndian);
-                break;
-
-              case 4:
-                new DataView(data, byteOffset, byteLength).setUint32(0, value, this.isGPULittleEndian);
-                break;
-
-              default:
-                unreachable();
-            }
-          } else {
-            // Packed representations are all 32-bit and use Uint as the data type.
-            // ex.) rg10b11float, rgb10a2unorm
-            switch (this.totalBitLength()) {
-              case 32:
-                {
-                  const view = new DataView(data);
-                  const currentValue = view.getUint32(0, this.isGPULittleEndian);
-                  let mask = 0xffffffff;
-                  const bitsToClearRight = bitOffset;
-                  const bitsToClearLeft = 32 - (bitLength + bitOffset);
-                  mask = mask >>> bitsToClearRight << bitsToClearRight;
-                  mask = mask << bitsToClearLeft >>> bitsToClearLeft;
-                  const newValue = currentValue & ~mask | value << bitOffset;
-                  view.setUint32(0, newValue, this.isGPULittleEndian);
-                  break;
-                }
-
-              default:
-                unreachable();
-            }
-          }
-
-          break;
-        }
-
-      default:
-        unreachable();
-    }
-  }
-
-  getBytes(components) {
-    if (this.sRGB) {
-      components = Object.assign({}, components);
-      assert(components.R !== undefined);
-      assert(components.G !== undefined);
-      assert(components.B !== undefined);
-      [components.R, components.G, components.B] = [gammaCompress(components.R), gammaCompress(components.G), gammaCompress(components.B)];
-    }
-
-    const bytesPerBlock = kTextureFormatInfo[this.format].bytesPerBlock;
-    assert(!!bytesPerBlock);
-    const data = new ArrayBuffer(bytesPerBlock);
-
-    for (const c of this.componentOrder) {
-      const componentValue = components[c];
-      assert(componentValue !== undefined);
-      this.setComponent(data, c, componentValue);
-    }
-
-    return data;
-  }
-
-}
-
-const kRepresentationCache = new Map();
-export function getTexelDataRepresentation(format) {
-  if (!kRepresentationCache.has(format)) {
-    const {
-      componentOrder,
-      componentInfo,
-      sRGB
-    } = kRepresentationInfo[format];
-    kRepresentationCache.set(format, new TexelDataRepresentationImpl(format, componentOrder, componentInfo, sRGB));
-  }
-
-  return kRepresentationCache.get(format);
-}
-//# sourceMappingURL=texelData.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/canvas/context_creation.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/canvas/context_creation.spec.js
deleted file mode 100644
index 427b15fced4..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/canvas/context_creation.spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = '';
-import { Fixture } from '../../../common/framework/fixture.js';
-import { makeTestGroup } from '../../../common/framework/test_group.js';
-export const g = makeTestGroup(Fixture);
-g.test('canvas_element_getContext_returns_GPUCanvasContext').fn(async t => {
-  if (typeof document === 'undefined') {
-    // Skip if there is no document (Workers, Node)
-    t.skip('DOM is not available to create canvas element');
-  }
-
-  const canvas = document.createElement('canvas');
-  canvas.width = 10;
-  canvas.height = 10; // TODO: fix types so these aren't necessary
-
-  const ctx = canvas.getContext('gpupresent');
-  t.expect(ctx instanceof window.GPUCanvasContext);
-});
-//# sourceMappingURL=context_creation.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/copyImageBitmapToTexture.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/copyImageBitmapToTexture.spec.js
deleted file mode 100644
index efdc21ded93..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/copyImageBitmapToTexture.spec.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-copy imageBitmap To texture tests.
-`;
-import { poptions, params } from '../../common/framework/params_builder.js';
-import { makeTestGroup } from '../../common/framework/test_group.js';
-import { GPUTest } from '../gpu_test.js';
-
-function calculateRowPitch(width, bytesPerPixel) {
-  const bytesPerRow = width * bytesPerPixel; // Rounds up to a multiple of 256 according to WebGPU requirements.
-
-  return (bytesPerRow - 1 >> 8) + 1 << 8;
-}
-
-class F extends GPUTest {
-  checkCopyImageBitmapResult(src, expected, width, height, bytesPerPixel) {
-    const exp = new Uint8Array(expected.buffer, expected.byteOffset, expected.byteLength);
-    const rowPitch = calculateRowPitch(width, bytesPerPixel);
-    const dst = this.createCopyForMapRead(src, rowPitch * height);
-    this.eventualAsyncExpectation(async niceStack => {
-      const actual = new Uint8Array(await dst.mapReadAsync());
-      const check = this.checkBufferWithRowPitch(actual, exp, width, height, rowPitch, bytesPerPixel);
-
-      if (check !== undefined) {
-        niceStack.message = check;
-        this.rec.expectationFailed(niceStack);
-      }
-
-      dst.destroy();
-    });
-  }
-
-  checkBufferWithRowPitch(actual, exp, width, height, rowPitch, bytesPerPixel) {
-    const failedByteIndices = [];
-    const failedByteExpectedValues = [];
-    const failedByteActualValues = [];
-
-    iLoop: for (let i = 0; i < height; ++i) {
-      const bytesPerRow = width * bytesPerPixel;
-
-      for (let j = 0; j < bytesPerRow; ++j) {
-        const indexExp = j + i * bytesPerRow;
-        const indexActual = j + rowPitch * i;
-
-        if (actual[indexActual] !== exp[indexExp]) {
-          if (failedByteIndices.length >= 4) {
-            failedByteIndices.push('...');
-            failedByteExpectedValues.push('...');
-            failedByteActualValues.push('...');
-            break iLoop;
-          }
-
-          failedByteIndices.push(`(${i},${j})`);
-          failedByteExpectedValues.push(exp[indexExp].toString());
-          failedByteActualValues.push(actual[indexActual].toString());
-        }
-      }
-    }
-
-    if (failedByteIndices.length > 0) {
-      return `at [${failedByteIndices.join(', ')}], \
-expected [${failedByteExpectedValues.join(', ')}], \
-got [${failedByteActualValues.join(', ')}]`;
-    }
-
-    return undefined;
-  }
-
-  doTestAndCheckResult(imageBitmapCopyView, dstTextureCopyView, copySize, bytesPerPixel, expectedData) {
-    this.device.defaultQueue.copyImageBitmapToTexture(imageBitmapCopyView, dstTextureCopyView, copySize);
-    const imageBitmap = imageBitmapCopyView.imageBitmap;
-    const dstTexture = dstTextureCopyView.texture;
-    const bytesPerRow = calculateRowPitch(imageBitmap.width, bytesPerPixel);
-    const testBuffer = this.device.createBuffer({
-      size: bytesPerRow * imageBitmap.height,
-      usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-    });
-    const encoder = this.device.createCommandEncoder();
-    encoder.copyTextureToBuffer({
-      texture: dstTexture,
-      mipLevel: 0,
-      origin: {
-        x: 0,
-        y: 0,
-        z: 0
-      }
-    }, {
-      buffer: testBuffer,
-      bytesPerRow
-    }, {
-      width: imageBitmap.width,
-      height: imageBitmap.height,
-      depth: 1
-    });
-    this.device.defaultQueue.submit([encoder.finish()]);
-    this.checkCopyImageBitmapResult(testBuffer, expectedData, imageBitmap.width, imageBitmap.height, bytesPerPixel);
-  }
-
-}
-
-export const g = makeTestGroup(F);
-g.test('from_ImageData').params(params().combine(poptions('width', [1, 2, 4, 15, 255, 256])).combine(poptions('height', [1, 2, 4, 15, 255, 256])).combine(poptions('alpha', ['none', 'premultiply'])).combine(poptions('orientation', ['none', 'flipY']))).fn(async t => {
-  const {
-    width,
-    height,
-    alpha,
-    orientation
-  } = t.params; // The texture format is rgba8unorm, so the bytes per pixel is 4.
-
-  const bytesPerPixel = 4;
-  const imagePixels = new Uint8ClampedArray(bytesPerPixel * width * height);
-
-  if (alpha === 'premultiply') {
-    // Make expected value simple to construct:
-    // Input is (255, 255, 255, a), which will be stored into the ImageBitmap
-    // as (a, a, a, a).
-    for (let i = 0; i < width * height * bytesPerPixel; ++i) {
-      imagePixels[i] = i % 4 !== 3 ? 255 : i % 256;
-    }
-  } else {
-    for (let i = 0; i < width * height * bytesPerPixel; ++i) {
-      imagePixels[i] = i % 4 === 3 ? 255 : i % 256;
-    }
-  }
-
-  const imageData = new ImageData(imagePixels, width, height);
-  const imageBitmap = await createImageBitmap(imageData, {
-    premultiplyAlpha: alpha,
-    imageOrientation: orientation
-  });
-  const dst = t.device.createTexture({
-    size: {
-      width: imageBitmap.width,
-      height: imageBitmap.height,
-      depth: 1
-    },
-    format: 'rgba8unorm',
-    usage: GPUTextureUsage.COPY_DST | GPUTextureUsage.COPY_SRC
-  }); // Construct expected value
-
-  const expectedPixels = new Uint8ClampedArray(bytesPerPixel * width * height);
-
-  for (let i = 0; i < width * height * bytesPerPixel; ++i) {
-    expectedPixels[i] = imagePixels[i];
-  }
-
-  if (orientation === 'flipY') {
-    for (let i = 0; i < height; ++i) {
-      for (let j = 0; j < width * bytesPerPixel; ++j) {
-        const pos_image_pixel = (height - i - 1) * width * bytesPerPixel + j;
-        const pos_expected_value = i * width * bytesPerPixel + j;
-        expectedPixels[pos_expected_value] = imagePixels[pos_image_pixel];
-      }
-    }
-  }
-
-  if (alpha === 'premultiply') {
-    for (let i = 0; i < width * height * bytesPerPixel; ++i) {
-      const alpha_value_position = 3 - i % 4 + i;
-
-      if (i % 4 !== 3) {
-        // Expected value is (a, a, a, a)
-        expectedPixels[i] = expectedPixels[alpha_value_position];
-      }
-    }
-  }
-
-  t.doTestAndCheckResult({
-    imageBitmap,
-    origin: {
-      x: 0,
-      y: 0
-    }
-  }, {
-    texture: dst
-  }, {
-    width: imageBitmap.width,
-    height: imageBitmap.height,
-    depth: 1
-  }, bytesPerPixel, expectedPixels);
-});
-g.test('from_canvas').params(params().combine(poptions('width', [1, 2, 4, 15, 255, 256])).combine(poptions('height', [1, 2, 4, 15, 255, 256]))).fn(async t => {
-  const {
-    width,
-    height
-  } = t.params; // CTS sometimes runs on worker threads, where document is not available.
-  // In this case, OffscreenCanvas can be used instead of <canvas>.
-  // But some browsers don't support OffscreenCanvas, and some don't
-  // support '2d' contexts on OffscreenCanvas.
-  // In this situation, the case will be skipped.
-
-  let imageCanvas;
-
-  if (typeof document !== 'undefined') {
-    imageCanvas = document.createElement('canvas');
-    imageCanvas.width = width;
-    imageCanvas.height = height;
-  } else if (typeof OffscreenCanvas === 'undefined') {
-    t.skip('OffscreenCanvas is not supported');
-    return;
-  } else {
-    imageCanvas = new OffscreenCanvas(width, height);
-  }
-
-  const imageCanvasContext = imageCanvas.getContext('2d');
-
-  if (imageCanvasContext === null) {
-    t.skip('OffscreenCanvas "2d" context not available');
-    return;
-  } // The texture format is rgba8unorm, so the bytes per pixel is 4.
-
-
-  const bytesPerPixel = 4; // Generate original data.
-
-  const imagePixels = new Uint8ClampedArray(bytesPerPixel * width * height);
-
-  for (let i = 0; i < width * height * bytesPerPixel; ++i) {
-    imagePixels[i] = i % 4 === 3 ? 255 : i % 256;
-  }
-
-  const imageData = new ImageData(imagePixels, width, height);
-  imageCanvasContext.putImageData(imageData, 0, 0);
-  const imageBitmap = await createImageBitmap(imageCanvas);
-  const dst = t.device.createTexture({
-    size: {
-      width: imageBitmap.width,
-      height: imageBitmap.height,
-      depth: 1
-    },
-    format: 'rgba8unorm',
-    usage: GPUTextureUsage.COPY_DST | GPUTextureUsage.COPY_SRC
-  }); // This will get origin data and even it has premultiplied-alpha
-
-  const expectedData = imageCanvasContext.getImageData(0, 0, imageBitmap.width, imageBitmap.height).data;
-  t.doTestAndCheckResult({
-    imageBitmap,
-    origin: {
-      x: 0,
-      y: 0
-    }
-  }, {
-    texture: dst
-  }, {
-    width: imageBitmap.width,
-    height: imageBitmap.height,
-    depth: 1
-  }, bytesPerPixel, expectedData);
-});
-//# sourceMappingURL=copyImageBitmapToTexture.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_clear.html b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_clear.html
deleted file mode 100644
index 86a3da939db..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_clear.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html class="reftest-wait">
-  <title>WebGPU canvas_clear</title>
-  <meta charset="utf-8" />
-  <link rel="help" href="https://gpuweb.github.io/gpuweb/" />
-  <meta name="assert" content="WebGPU cleared canvas should be presented correctly" />
-  <link rel="match" href="./ref/canvas_clear-ref.html" />
-  <canvas id="gpucanvas" width="10" height="10"></canvas>
-  <script src="/common/reftest-wait.js"></script>
-  <script type="module" src="canvas_clear.js"></script>
-</html>
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_clear.js b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_clear.js
deleted file mode 100644
index 52ffaedad84..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_clear.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { runRefTest } from './gpu_ref_test.js';
-runRefTest(async t => {
-  const canvas = document.getElementById('gpucanvas');
-  const ctx = canvas.getContext('gpupresent');
-  const swapChain = ctx.configureSwapChain({
-    device: t.device,
-    format: 'bgra8unorm'
-  });
-  const colorAttachment = swapChain.getCurrentTexture();
-  const colorAttachmentView = colorAttachment.createView();
-  const encoder = t.device.createCommandEncoder();
-  const pass = encoder.beginRenderPass({
-    colorAttachments: [{
-      attachment: colorAttachmentView,
-      loadValue: {
-        r: 0.0,
-        g: 1.0,
-        b: 0.0,
-        a: 1.0
-      },
-      storeOp: 'store'
-    }]
-  });
-  pass.endPass();
-  t.device.defaultQueue.submit([encoder.finish()]);
-});
-//# sourceMappingURL=canvas_clear.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_complex.js b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_complex.js
deleted file mode 100644
index 1e63a0ab202..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_complex.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { unreachable } from '../../../common/framework/util/util.js';
-import { runRefTest } from './gpu_ref_test.js'; // <canvas> element from html page
-
-export function run(format) {
-  runRefTest(async t => {
-    const ctx = cvs.getContext('gpupresent');
-
-    switch (format) {
-      case 'bgra8unorm':
-      case 'rgba16float':
-        break;
-
-      default:
-        unreachable();
-    }
-
-    const swapChain = ctx.configureSwapChain({
-      device: t.device,
-      format,
-      usage: GPUTextureUsage.COPY_DST
-    });
-    const rows = 2;
-    const bytesPerRow = 256;
-    const [buffer, mapping] = t.device.createBufferMapped({
-      size: rows * bytesPerRow,
-      usage: GPUBufferUsage.COPY_SRC
-    });
-
-    switch (format) {
-      case 'bgra8unorm':
-        {
-          const data = new Uint8Array(mapping);
-          data.set(new Uint8Array([0x00, 0x00, 0x7f, 0xff]), 0); // red
-
-          data.set(new Uint8Array([0x00, 0x7f, 0x00, 0xff]), 4); // green
-
-          data.set(new Uint8Array([0x7f, 0x00, 0x00, 0xff]), 256 + 0); // blue
-
-          data.set(new Uint8Array([0x00, 0x7f, 0x7f, 0xff]), 256 + 4); // yellow
-        }
-        break;
-
-      case 'rgba16float':
-        {
-          // Untested!
-          const zero = 0x0000;
-          const half = 0x3800;
-          const one = 0x3c00;
-          const data = new DataView(mapping);
-          data.setUint16(0x000, half, false); // red
-
-          data.setUint16(0x002, zero, false);
-          data.setUint16(0x004, zero, false);
-          data.setUint16(0x008, one, false);
-          data.setUint16(0x010, zero, false); // green
-
-          data.setUint16(0x020, half, false);
-          data.setUint16(0x040, zero, false);
-          data.setUint16(0x080, one, false);
-          data.setUint16(0x100, zero, false); // blue
-
-          data.setUint16(0x102, zero, false);
-          data.setUint16(0x104, half, false);
-          data.setUint16(0x108, one, false);
-          data.setUint16(0x110, half, false); // yellow
-
-          data.setUint16(0x120, half, false);
-          data.setUint16(0x140, zero, false);
-          data.setUint16(0x180, one, false);
-        }
-        break;
-    }
-
-    buffer.unmap();
-    const texture = swapChain.getCurrentTexture();
-    const encoder = t.device.createCommandEncoder();
-    encoder.copyBufferToTexture({
-      buffer,
-      bytesPerRow
-    }, {
-      texture
-    }, [2, 2, 1]);
-    t.device.defaultQueue.submit([encoder.finish()]);
-  });
-}
-//# sourceMappingURL=canvas_complex.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_complex_bgra8unorm.html b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_complex_bgra8unorm.html
deleted file mode 100644
index 1310543648e..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/canvas_complex_bgra8unorm.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html class="reftest-wait">
-  <title>WebGPU canvas_complex_bgra8unorm</title>
-  <meta charset="utf-8" />
-  <link rel="help" href="https://gpuweb.github.io/gpuweb/" />
-  <meta
-    name="assert"
-    content="WebGPU canvas should have correct orientation, components, scaling, filtering, color space"
-  />
-  <link rel="match" href="./ref/canvas_complex-ref.html" />
-
-  <canvas id="cvs" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
-  <script src="/common/reftest-wait.js"></script>
-  <script type="module">
-    import { run } from './canvas_complex.js';
-    run('bgra8unorm');
-    // TODO: make a copy of this test for rgba16float
-  </script>
-</html>
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/gpu_ref_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/gpu_ref_test.js
deleted file mode 100644
index f45f232557c..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/gpu_ref_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-import { assert } from '../../../common/framework/util/util.js';
-export async function runRefTest(fn) {
-  assert(typeof navigator !== 'undefined' && navigator.gpu !== undefined, 'No WebGPU implementation found');
-  const adapter = await navigator.gpu.requestAdapter();
-  const device = await adapter.requestDevice();
-  const queue = device.defaultQueue;
-  await fn({
-    device,
-    queue
-  });
-  takeScreenshotDelayed(50);
-}
-//# sourceMappingURL=gpu_ref_test.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/ref/canvas_clear-ref.html b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/ref/canvas_clear-ref.html
deleted file mode 100644
index 2e078118627..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/ref/canvas_clear-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-  <title>WebGPU canvas_clear (ref)</title>
-  <meta charset="utf-8" />
-  <link rel="help" href="https://gpuweb.github.io/gpuweb/" />
-  <canvas id="myCanvas" width="10" height="10"></canvas>
-  <script>
-    var c = document.getElementById('myCanvas');
-    var ctx = c.getContext('2d');
-    ctx.fillStyle = '#00FF00';
-    ctx.fillRect(0, 0, c.width, c.height);
-  </script>
-</html>
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/ref/canvas_complex-ref.html b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/ref/canvas_complex-ref.html
deleted file mode 100644
index 3d5b3b3376d..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/reftests/ref/canvas_complex-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-  <title>WebGPU canvas_complex (ref)</title>
-  <meta charset="utf-8" />
-  <link rel="help" href="https://gpuweb.github.io/gpuweb/" />
-  <canvas id="cvs" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
-  <script>
-    const ctx = cvs.getContext('2d');
-    ctx.fillStyle = '#7F0000';
-    ctx.fillRect(0, 0, 1, 1);
-    ctx.fillStyle = '#007F00';
-    ctx.fillRect(1, 0, 1, 1);
-    ctx.fillStyle = '#00007F';
-    ctx.fillRect(0, 1, 1, 1);
-    ctx.fillStyle = '#7F7F00';
-    ctx.fillRect(1, 1, 1, 1);
-  </script>
-</html>
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html
new file mode 100644
index 00000000000..2ab6cb7fbb5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestSessionDuringEnd.https.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src="resources/webxr_util.js"></script>
+  <script src="resources/webxr_test_constants.js"></script>
+  <canvas></canvas>
+
+  <script>
+    function testFunctionGenerator(createSessionFromEventCallback) {
+        return function(session, testDeviceController, t) {
+            let done = false;
+
+            function createSession() {
+              return new Promise((resolve) => {
+                  navigator.xr.requestSession("immersive-vr")
+                  .then((new_session) => {
+                    // The test framework ensures that the created session ends,
+                    // but will not do cleanup for this session, so if it gets
+                    // created, we need to ensure that it gets cleaned up.
+                    return new_session.end();
+                  }).then(() => {
+                    done = true;
+                    resolve();
+                  }).catch((err) => {
+                    // Only one catch is needed for the whole promise chain.
+                    // If ending the new session throws, it's fine to fail as
+                    // we'd otherwise end up in a bad state.
+                    t.step(() => {
+                      assert_unreached("Session creation should not throw: " + err);
+                    });
+                  });
+              });
+            }
+
+            function onSessionEnd() {
+                if (createSessionFromEventCallback) {
+                  createSession();
+                }
+            }
+
+            session.addEventListener("end", onSessionEnd, false);
+
+            // We need to simulate the user activation before we call end as
+            // otherwise (depending on the implementation) it can interfere with
+            // the scheduling of the dispatched event/promise, and make session
+            // creation succeed even when there may be bugs preventing it from
+            // doing so in real scenarios.
+            navigator.xr.test.simulateUserActivation(() => {
+              session.end().then(() => {
+                if (!createSessionFromEventCallback) {
+                  createSession();
+                }
+              });
+            });
+
+            return t.step_wait(() => done);
+        };
+    }
+
+    xr_session_promise_test("Create new session in OnSessionEnded event",
+      testFunctionGenerator(/*createSessionFromEventCallback=*/true),
+      TRACKED_IMMERSIVE_DEVICE, 'immersive-vr');
+
+    xr_session_promise_test("Create mew session in end promise",
+      testFunctionGenerator(/*createSessionFromEventCallback=*/false),
+      TRACKED_IMMERSIVE_DEVICE, 'immersive-vr');
+  </script>
+</body>
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index fd7fbe111ff..5ecabcd8f86 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -218,3 +218,6 @@
   [WebGL test #52: attachment 7 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
+  [WebGL test #52: attachment 7 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,255,0,255]
+    expected: FAIL
+