Add wpt_internal version of WebGPU CTS runner

This allows us to have our own variants list, so we can split test files into smaller parts for more fine-grained suppression. Bug: 984818 Change-Id: Id9a12491d592ddaf0899d40c89d01139396a92d0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1860508 Reviewed-by: Austin Eng <enga@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Kenneth Russell <kbr@chromium.org> Auto-Submit: Kai Ninomiya <kainino@chromium.org> Cr-Commit-Position: refs/heads/master@{#706038}
FairyWorld · Oct 15, 2019 · eb68b99 · eb68b99
1 parent c209bfb
commit eb68b99
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 10 deletions.
diff --git a/testing/buildbot/chromium.dawn.json b/testing/buildbot/chromium.dawn.json
@@ -150,7 +150,7 @@
           "--driver-logging",
           "--ignore-default-expectations",
           "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
-          "--isolated-script-test-filter=external/wpt/webgpu/*",
+          "--isolated-script-test-filter=wpt_internal/webgpu/*",
           "--no-xvfb"
         ],
         "isolate_name": "blink_web_tests_exparchive",
@@ -321,7 +321,7 @@
           "--driver-logging",
           "--ignore-default-expectations",
           "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
-          "--isolated-script-test-filter=external/wpt/webgpu/*",
+          "--isolated-script-test-filter=wpt_internal/webgpu/*",
           "--no-xvfb"
         ],
         "isolate_name": "blink_web_tests_exparchive",
@@ -695,7 +695,7 @@
           "--driver-logging",
           "--ignore-default-expectations",
           "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
-          "--isolated-script-test-filter=external/wpt/webgpu/*"
+          "--isolated-script-test-filter=wpt_internal/webgpu/*"
         ],
         "isolate_name": "blink_web_tests_exparchive",
         "merge": {
@@ -859,7 +859,7 @@
           "--driver-logging",
           "--ignore-default-expectations",
           "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
-          "--isolated-script-test-filter=external/wpt/webgpu/*"
+          "--isolated-script-test-filter=wpt_internal/webgpu/*"
         ],
         "isolate_name": "blink_web_tests_exparchive",
         "merge": {
@@ -1227,7 +1227,7 @@
           "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "-t",
           "Release_x64",
-          "--isolated-script-test-filter=external/wpt/webgpu/*"
+          "--isolated-script-test-filter=wpt_internal/webgpu/*"
         ],
         "isolate_name": "blink_web_tests_exparchive",
         "merge": {
@@ -1398,7 +1398,7 @@
           "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "-t",
           "Release_x64",
-          "--isolated-script-test-filter=external/wpt/webgpu/*"
+          "--isolated-script-test-filter=wpt_internal/webgpu/*"
         ],
         "isolate_name": "blink_web_tests_exparchive",
         "merge": {
@@ -1765,7 +1765,7 @@
           "--driver-logging",
           "--ignore-default-expectations",
           "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
-          "--isolated-script-test-filter=external/wpt/webgpu/*"
+          "--isolated-script-test-filter=wpt_internal/webgpu/*"
         ],
         "isolate_name": "blink_web_tests_exparchive",
         "merge": {
@@ -1934,7 +1934,7 @@
           "--driver-logging",
           "--ignore-default-expectations",
           "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
-          "--isolated-script-test-filter=external/wpt/webgpu/*"
+          "--isolated-script-test-filter=wpt_internal/webgpu/*"
         ],
         "isolate_name": "blink_web_tests_exparchive",
         "merge": {

diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
@@ -4121,7 +4121,7 @@
           '--driver-logging',
           '--ignore-default-expectations',
           '--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations',
-          '--isolated-script-test-filter=external/wpt/webgpu/*',
+          '--isolated-script-test-filter=wpt_internal/webgpu/*',
         ],
         'linux_args': [ '--no-xvfb' ],
         'merge': {
@@ -4144,7 +4144,7 @@
           '--ignore-default-expectations',
           '--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations',
           '-t', 'Release_x64',
-          '--isolated-script-test-filter=external/wpt/webgpu/*',
+          '--isolated-script-test-filter=wpt_internal/webgpu/*',
         ],
         'merge': {
           'args': [

diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
@@ -352,6 +352,7 @@ crbug.com/981719 [ Win ] external/wpt/css/css-ui/webkit-appearance-textfield-001
 # WebGPU tests are only run on GPU bots, so they are skipped by default and run
 # separately from other Web Tests.
 Bug(intentional) external/wpt/webgpu/ [ Skip ]
+Bug(intentional) wpt_internal/webgpu/ [ Skip ]
 
 # ====== Paint team owned tests to here ======
 

diff --git a/third_party/blink/web_tests/WebGPUExpectations b/third_party/blink/web_tests/WebGPUExpectations
@@ -1,2 +1,5 @@
 # WebGPU tests are only run on GPU bots, so they are skipped by default and run
 # separately from other Web Tests, with this expectations file.
+#
+# Expectations in this file must apply to wpt_internal/webgpu/cts.html, NOT
+# external/wpt/webgpu/cts.html, as the latter is not run.
diff --git a/third_party/blink/web_tests/wpt_internal/webgpu/cts.html b/third_party/blink/web_tests/wpt_internal/webgpu/cts.html
@@ -0,0 +1,38 @@
+<!--
+    This file is a modified copy of the cts.html from external/wpt/webgpu/.
+
+    It functions identically, except it has a custom variant list which breaks
+    down the test cases further so that test suppressions can be specific to
+    individual tests or test cases.
+-->
+
+<!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>
+<style>
+#results {
+    font-family: monospace;
+    width: 100%;
+    height: 15em;
+}
+</style>
+
+<textarea id=results></textarea>
+<script type=module src="/webgpu/runtime/wpt.js"></script>
+
+<meta name='variant' content='?q=cts:buffers/create_mapped:'>
+<meta name='variant' content='?q=cts:buffers/map:'>
+<meta name='variant' content='?q=cts:buffers/map_detach:'>
+<meta name='variant' content='?q=cts:buffers/map_oom:'>
+<meta name='variant' content='?q=cts:canvas/context_creation:'>
+<meta name='variant' content='?q=cts:command_buffer/basic:'>
+<meta name='variant' content='?q=cts:command_buffer/compute/basic:'>
+<meta name='variant' content='?q=cts:command_buffer/copies:'>
+<meta name='variant' content='?q=cts:command_buffer/render/basic:'>
+<meta name='variant' content='?q=cts:command_buffer/render/rendering:'>
+<meta name='variant' content='?q=cts:examples:'>
+<meta name='variant' content='?q=cts:fences:'>