Use --ignore-default-expectations for WebGPU WPT tests; fix CQ triggers

This allows us to write expectations for tests, instead of having to
modify the tests themselves (e.g. by removing a line from cts.html).
I forgot I could do this in the original patch.

Also fixes commit-queue.cfg to trigger Dawn CQ bots on appropriate files.

Bug: 984818
Change-Id: I16e708c35209137266982da1107c1f34ff72026e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1759393Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688342}

docs/infra/cq_builders.md

@@ -143,7 +143,8 @@ builder.
     * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
     * [`//testing/buildbot/chromium.dawn.json`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:testing/buildbot/chromium.dawn.json)
     * [`//third_party/blink/renderer/modules/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgpu/)
-    * [`//third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu)
+    * [`//third_party/blink/web_tests/external/wpt/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webgpu/)
+    * [`//third_party/blink/web_tests/WebGPUExpectations`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/web_tests/WebGPUExpectations)
     * [`//third_party/dawn/.+`](https://cs.chromium.org/chromium/src/third_party/dawn/)
 
 * [dawn-mac-x64-deps-rel](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/dawn-mac-x64-deps-rel) ([`commit-queue.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:commit-queue.cfg+chromium/try/dawn-mac-x64-deps-rel)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+dawn-mac-x64-deps-rel))
@@ -152,7 +153,8 @@ builder.
     * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
     * [`//testing/buildbot/chromium.dawn.json`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:testing/buildbot/chromium.dawn.json)
     * [`//third_party/blink/renderer/modules/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgpu/)
-    * [`//third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu)
+    * [`//third_party/blink/web_tests/external/wpt/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webgpu/)
+    * [`//third_party/blink/web_tests/WebGPUExpectations`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/web_tests/WebGPUExpectations)
     * [`//third_party/dawn/.+`](https://cs.chromium.org/chromium/src/third_party/dawn/)
 
 * [dawn-win10-x64-deps-rel](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/dawn-win10-x64-deps-rel) ([`commit-queue.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:commit-queue.cfg+chromium/try/dawn-win10-x64-deps-rel)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+dawn-win10-x64-deps-rel))
@@ -161,7 +163,8 @@ builder.
     * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
     * [`//testing/buildbot/chromium.dawn.json`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:testing/buildbot/chromium.dawn.json)
     * [`//third_party/blink/renderer/modules/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgpu/)
-    * [`//third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu)
+    * [`//third_party/blink/web_tests/external/wpt/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webgpu/)
+    * [`//third_party/blink/web_tests/WebGPUExpectations`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/web_tests/WebGPUExpectations)
     * [`//third_party/dawn/.+`](https://cs.chromium.org/chromium/src/third_party/dawn/)
 
 * [dawn-win10-x86-deps-rel](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/dawn-win10-x86-deps-rel) ([`commit-queue.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:commit-queue.cfg+chromium/try/dawn-win10-x86-deps-rel)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+dawn-win10-x86-deps-rel))
@@ -170,7 +173,8 @@ builder.
     * [`//gpu/.+`](https://cs.chromium.org/chromium/src/gpu/)
     * [`//testing/buildbot/chromium.dawn.json`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:testing/buildbot/chromium.dawn.json)
     * [`//third_party/blink/renderer/modules/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgpu/)
-    * [`//third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu)
+    * [`//third_party/blink/web_tests/external/wpt/webgpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webgpu/)
+    * [`//third_party/blink/web_tests/WebGPUExpectations`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:third_party/blink/web_tests/WebGPUExpectations)
     * [`//third_party/dawn/.+`](https://cs.chromium.org/chromium/src/third_party/dawn/)
 
 * [fuchsia-arm64-cast](https://ci.chromium.org/p/chromium/builders/luci.chromium.try/fuchsia-arm64-cast) ([`commit-queue.cfg` entry](https://cs.chromium.org/search/?q=package:%5Echromium$+file:commit-queue.cfg+chromium/try/fuchsia-arm64-cast)) ([matching builders](https://cs.chromium.org/search/?q=file:trybots.py+fuchsia-arm64-cast))

infra/config/commit-queue.cfg

@@ -204,7 +204,8 @@ config_groups {
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
-        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
         location_regexp: ".+/[+]/third_party/dawn/.+"
       }
       builders {
@@ -212,7 +213,8 @@ config_groups {
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
-        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
         location_regexp: ".+/[+]/third_party/dawn/.+"
       }
       builders {
@@ -220,7 +222,8 @@ config_groups {
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
-        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
         location_regexp: ".+/[+]/third_party/dawn/.+"
       }
       builders {
@@ -228,7 +231,8 @@ config_groups {
         location_regexp: ".+/[+]/gpu/.+"
         location_regexp: ".+/[+]/testing/buildbot/chromium.dawn.json"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgpu/.+"
-        location_regexp: ".+/[+]/third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+"
+        location_regexp: ".+/[+]/third_party/blink/web_tests/WebGPUExpectations"
         location_regexp: ".+/[+]/third_party/dawn/.+"
       }
       builders {

testing/buildbot/chromium.dawn.json

@@ -123,8 +123,8 @@
           "--additional-driver-flag",
           "--disable-gpu-sandbox",
           "--driver-logging",
-          "--skipped",
-          "ignore",
+          "--ignore-default-expectations",
+          "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "external/wpt/webgpu/",
           "--no-xvfb"
         ],
@@ -269,8 +269,8 @@
           "--additional-driver-flag",
           "--disable-gpu-sandbox",
           "--driver-logging",
-          "--skipped",
-          "ignore",
+          "--ignore-default-expectations",
+          "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "external/wpt/webgpu/",
           "--no-xvfb"
         ],
@@ -563,8 +563,8 @@
           "--additional-driver-flag",
           "--disable-gpu-sandbox",
           "--driver-logging",
-          "--skipped",
-          "ignore",
+          "--ignore-default-expectations",
+          "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "external/wpt/webgpu/"
         ],
         "isolate_name": "blink_web_tests_exparchive",
@@ -703,8 +703,8 @@
           "--additional-driver-flag",
           "--disable-gpu-sandbox",
           "--driver-logging",
-          "--skipped",
-          "ignore",
+          "--ignore-default-expectations",
+          "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "external/wpt/webgpu/"
         ],
         "isolate_name": "blink_web_tests_exparchive",
@@ -990,8 +990,8 @@
           "--additional-driver-flag",
           "--disable-gpu-sandbox",
           "--driver-logging",
-          "--skipped",
-          "ignore",
+          "--ignore-default-expectations",
+          "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "-t",
           "Release_x64",
           "external/wpt/webgpu/"
@@ -1136,8 +1136,8 @@
           "--additional-driver-flag",
           "--disable-gpu-sandbox",
           "--driver-logging",
-          "--skipped",
-          "ignore",
+          "--ignore-default-expectations",
+          "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "-t",
           "Release_x64",
           "external/wpt/webgpu/"
@@ -1426,8 +1426,8 @@
           "--additional-driver-flag",
           "--disable-gpu-sandbox",
           "--driver-logging",
-          "--skipped",
-          "ignore",
+          "--ignore-default-expectations",
+          "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "external/wpt/webgpu/"
         ],
         "isolate_name": "blink_web_tests_exparchive",
@@ -1570,8 +1570,8 @@
           "--additional-driver-flag",
           "--disable-gpu-sandbox",
           "--driver-logging",
-          "--skipped",
-          "ignore",
+          "--ignore-default-expectations",
+          "--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations",
           "external/wpt/webgpu/"
         ],
         "isolate_name": "blink_web_tests_exparchive",

testing/buildbot/test_suites.pyl

@@ -3975,9 +3975,12 @@
           '--additional-driver-flag', '--enable-unsafe-webgpu',
           '--additional-driver-flag', '--disable-gpu-sandbox',
           '--driver-logging',
-          # These tests are skipped by default. Since we run with
-          # --enable-unsafe-webgpu, ignore the Skip expectation.
-          '--skipped', 'ignore',
+          '--ignore-default-expectations',
+          '--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations',
+          # TODO(crbug.com/984815): Use --isolated-script-test-filter to select
+          # webgpu tests, instead of just the file path, so retries (which just
+          # append the specific test path to the end of this command line) work
+          # correctly instead of also running the whole rest of the test suite.
           'external/wpt/webgpu/',
         ],
         'linux_args': [ '--no-xvfb' ],
@@ -3998,10 +4001,13 @@
           '--additional-driver-flag', '--enable-unsafe-webgpu',
           '--additional-driver-flag', '--disable-gpu-sandbox',
           '--driver-logging',
-          # These tests are skipped by default. Since we run with
-          # --enable-unsafe-webgpu, ignore the Skip expectation.
-          '--skipped', 'ignore',
+          '--ignore-default-expectations',
+          '--additional-expectations=../../third_party/blink/web_tests/WebGPUExpectations',
           '-t', 'Release_x64',
+          # TODO(crbug.com/984815): Use --isolated-script-test-filter to select
+          # webgpu tests, instead of just the file path, so retries (which just
+          # append the specific test path to the end of this command line) work
+          # correctly instead of also running the whole rest of the test suite.
           'external/wpt/webgpu/',
         ],
         'merge': {

third_party/blink/web_tests/FlagExpectations/enable-unsafe-webgpu → third_party/blink/web_tests/WebGPUExpectations

 # WebGPU tests are only run on GPU bots, so they are skipped by default and run
-# separately from other Web Tests.
-Bug(none) external/wpt/webgpu/ [ Pass ]
+# separately from other Web Tests, with this expectations file.