commit f653beb667734196a8d784e93f55c1ba7c2c8210
author Brian Sheedy <bsheedy@google.com> Thu Sep 25 05:02:33 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 25 05:02:33 2025 -0700
tree 97daf40abe99796159672f5a3f32b35719986606
parent d01c6b762fabfe7eec82d121ab9835af4e0f2bab

Enable gn_v2 Mac/rel tests

Enables tests on dawn-mac-x64-sws-rel that are equivalent to the
ones on the existing mac-rel tester.

Bug: 385317083
Change-Id: I41861fd66249febb298528516cdbb0095ff8c936
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/263337
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

infra/specs/ci.json

diff --git a/infra/specs/ci.json b/infra/specs/ci.json
index ee73c27..6bb9a18 100644
--- a/infra/specs/ci.json
+++ b/infra/specs/ci.json
@@ -609,7 +609,140 @@
       }
     ]
   },
-  "dawn-mac-x64-sws-rel": {},
+  "dawn-mac-x64-sws-rel": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--backend=opengles",
+          "--use-angle=swiftshader",
+          "--enable-toggles=gl_force_es_31_and_no_extensions"
+        ],
+        "merge": {
+          "script": "//testing/merge_scripts/noop_merge.py"
+        },
+        "name": "dawn_end2end_swangle_tests",
+        "resultdb": {
+          "result_format": "gtest_json"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "display_attached": "1",
+            "gpu": "8086:3e9b",
+            "os": "Mac-14.5"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "dawn_end2end_tests",
+        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
+      },
+      {
+        "args": [
+          "--adapter-vendor-id=0x1AE0"
+        ],
+        "merge": {
+          "script": "//testing/merge_scripts/noop_merge.py"
+        },
+        "name": "dawn_end2end_sws_tests",
+        "resultdb": {
+          "result_format": "gtest_json"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "display_attached": "1",
+            "gpu": "8086:3e9b",
+            "os": "Mac-14.5"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "dawn_end2end_tests",
+        "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/"
+      },
+      {
+        "merge": {
+          "script": "//testing/merge_scripts/noop_merge.py"
+        },
+        "name": "dawn_unittests",
+        "resultdb": {
+          "result_format": "gtest_json"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "display_attached": "1",
+            "gpu": "8086:3e9b",
+            "os": "Mac-14.5"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "dawn_unittests",
+        "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/"
+      },
+      {
+        "args": [
+          "--use-wire"
+        ],
+        "merge": {
+          "script": "//testing/merge_scripts/noop_merge.py"
+        },
+        "name": "dawn_wire_unittests",
+        "resultdb": {
+          "result_format": "gtest_json"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "display_attached": "1",
+            "gpu": "8086:3e9b",
+            "os": "Mac-14.5"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "dawn_unittests",
+        "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/"
+      },
+      {
+        "merge": {
+          "script": "//testing/merge_scripts/noop_merge.py"
+        },
+        "name": "tint_unittests",
+        "resultdb": {
+          "result_format": "gtest_json"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "display_attached": "1",
+            "gpu": "8086:3e9b",
+            "os": "Mac-14.5"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "tint_unittests",
+        "test_id_prefix": "ninja://src/tint/cmd/test:tint_unittests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "args": [
+          "-backend",
+          "vulkan",
+          "-adapter",
+          "SwiftShader",
+          "webgpu:api,operation,adapter,requestDevice:default:*"
+        ],
+        "name": "dawn_node_sws_cts",
+        "test": "dawn_node_cts",
+        "test_id_prefix": "ninja://scripts/dawn_node_cts:dawn_node_cts/"
+      }
+    ]
+  },
   "dawn-win-x64-sws-dbg": {
     "gtest_tests": [
       {

infra/specs/waterfalls.pyl

diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index e54bead..ad06215 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -109,7 +109,10 @@
         'mixins': [
           'mac_mini_intel_gpu_stable',
         ],
-        'test_suites': {},
+        'test_suites': {
+          'gtest_tests': 'swiftshader_gtests',
+          'isolated_scripts': 'dawn_node_cts_sws_tests',
+        },
       },
       'dawn-win-x64-sws-dbg': {
         'os_type': 'win',