Add gn_v2 ClusterFuzz corpora generator

Adds dawn-linux-x64-sws-clusterfuzz, which is the gn_v2 equivalent of
cron-linux-clang-rel-x64. No trybot mirror is added since this is
intended to only ever run on CI. As such, tests are also enabled as
part of this CL.

Tests still use the no-op merge script for now since the merge script
for uploading ClusterFuzz corpora will need to be updated to support
both gtests and isolated scripts. This should still allow us to confirm
that tests run correctly and that they output the expected trace data.

Bug: 441327468
Change-Id: I5bdaff53aefc30121c4c2f0dd5b1d19a6f5624de
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/265294
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
diff --git a/infra/config/global/generated/builders/ci/dawn-linux-x64-sws-clusterfuzz/gn-args.json b/infra/config/global/generated/builders/ci/dawn-linux-x64-sws-clusterfuzz/gn-args.json
new file mode 100644
index 0000000..39e511f
--- /dev/null
+++ b/infra/config/global/generated/builders/ci/dawn-linux-x64-sws-clusterfuzz/gn-args.json
@@ -0,0 +1,22 @@
+{
+  "gn_args": {
+    "dawn_enable_d3d12": false,
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": false,
+    "target_cpu": "x64",
+    "target_os": "linux",
+    "tint_build_hlsl_writer": true,
+    "tint_build_ir_binary": true,
+    "tint_build_msl_writer": true,
+    "tint_build_spv_reader": true,
+    "tint_build_spv_writer": true,
+    "tint_build_wgsl_reader": true,
+    "tint_build_wgsl_writer": true,
+    "tint_has_fuzzers": true,
+    "use_reclient": false,
+    "use_remoteexec": true,
+    "use_siso": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/gn_args_locations.json b/infra/config/global/generated/builders/gn_args_locations.json
index d7a0ff2..d76f53e 100644
--- a/infra/config/global/generated/builders/gn_args_locations.json
+++ b/infra/config/global/generated/builders/gn_args_locations.json
@@ -4,6 +4,7 @@
     "dawn-linux-x64-builder-rel": "ci/dawn-linux-x64-builder-rel/gn-args.json",
     "dawn-linux-x64-fuzz-dbg": "ci/dawn-linux-x64-fuzz-dbg/gn-args.json",
     "dawn-linux-x64-fuzz-rel": "ci/dawn-linux-x64-fuzz-rel/gn-args.json",
+    "dawn-linux-x64-sws-clusterfuzz": "ci/dawn-linux-x64-sws-clusterfuzz/gn-args.json",
     "dawn-linux-x86-builder-dbg": "ci/dawn-linux-x86-builder-dbg/gn-args.json",
     "dawn-linux-x86-builder-rel": "ci/dawn-linux-x86-builder-rel/gn-args.json",
     "dawn-linux-x86-fuzz-dbg": "ci/dawn-linux-x86-fuzz-dbg/gn-args.json",
diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/luci/cr-buildbucket.cfg
index 27777db..6f38b41 100644
--- a/infra/config/global/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -1529,6 +1529,152 @@
       }
     }
     builders {
+      name: "dawn-linux-x64-sws-clusterfuzz"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "os:Ubuntu-22.04"
+      dimensions: "pool:luci.chromium.gpu.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/ci/dawn-linux-x64-sws-clusterfuzz/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-linux-x64-sws-clusterfuzz",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Release",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 64,'
+        '                "target_platform": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-linux-x64-sws-clusterfuzz",'
+        '          "project": "dawn"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$build/siso": {'
+        '    "configs": ['
+        '      "builder"'
+        '    ],'
+        '    "enable_cloud_monitoring": true,'
+        '    "enable_cloud_profiler": true,'
+        '    "enable_cloud_trace": true,'
+        '    "experiments": [],'
+        '    "metrics_project": "chromium-reclient-metrics",'
+        '    "project": "rbe-chromium-trusted",'
+        '    "remote_jobs": 250'
+        '  },'
+        '  "builder_group": "ci",'
+        '  "recipe": "dawn/gn_v2"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Generates ClusterFuzz corpora using Linux/x64 binaries and data from running with SwiftShader<br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      shadow_builder_adjustments {
+        service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+        properties:
+          '{'
+          '  "$build/siso": {'
+          '    "configs": ['
+          '      "builder"'
+          '    ],'
+          '    "enable_cloud_monitoring": true,'
+          '    "enable_cloud_profiler": true,'
+          '    "enable_cloud_trace": true,'
+          '    "experiments": [],'
+          '    "metrics_project": "chromium-reclient-metrics",'
+          '    "project": "rbe-chromium-untrusted",'
+          '    "remote_jobs": 250'
+          '  }'
+          '}'
+      }
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+    }
+    builders {
       name: "dawn-linux-x64-sws-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
diff --git a/infra/config/global/generated/luci/luci-milo.cfg b/infra/config/global/generated/luci/luci-milo.cfg
index 76af346..87a0d2f 100644
--- a/infra/config/global/generated/luci/luci-milo.cfg
+++ b/infra/config/global/generated/luci/luci-milo.cfg
@@ -51,6 +51,11 @@
     short_name: "x86"
   }
   builders {
+    name: "buildbucket/luci.dawn.ci/dawn-linux-x64-sws-clusterfuzz"
+    category: "linux|build|clang|rel|cf"
+    short_name: "x64"
+  }
+  builders {
     name: "buildbucket/luci.dawn.ci/dawn-linux-x64-fuzz-rel"
     category: "linux|build|clang|rel|fuzz"
     short_name: "x64"
diff --git a/infra/config/global/generated/luci/luci-scheduler.cfg b/infra/config/global/generated/luci/luci-scheduler.cfg
index 1e46402..956e77c 100644
--- a/infra/config/global/generated/luci/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci/luci-scheduler.cfg
@@ -155,6 +155,16 @@
   }
 }
 job {
+  id: "dawn-linux-x64-sws-clusterfuzz"
+  realm: "ci"
+  schedule: "0 0 * * *"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-linux-x64-sws-clusterfuzz"
+  }
+}
+job {
   id: "dawn-linux-x64-sws-dbg"
   realm: "ci"
   buildbucket {
@@ -398,6 +408,7 @@
   triggers: "dawn-linux-x64-builder-rel"
   triggers: "dawn-linux-x64-fuzz-dbg"
   triggers: "dawn-linux-x64-fuzz-rel"
+  triggers: "dawn-linux-x64-sws-clusterfuzz"
   triggers: "dawn-linux-x86-builder-dbg"
   triggers: "dawn-linux-x86-builder-rel"
   triggers: "dawn-linux-x86-fuzz-dbg"
diff --git a/infra/config/global/gn_args.star b/infra/config/global/gn_args.star
index 5ff92a1..a57e539 100644
--- a/infra/config/global/gn_args.star
+++ b/infra/config/global/gn_args.star
@@ -165,6 +165,20 @@
 )
 
 gn_args.config(
+    name = "tint_build_ir_binary",
+    args = {
+        "tint_build_ir_binary": True,
+    },
+)
+
+gn_args.config(
+    name = "tint_has_fuzzers",
+    args = {
+        "tint_has_fuzzers": True,
+    },
+)
+
+gn_args.config(
     name = "tint_hlsl_writer",
     args = {
         "tint_build_hlsl_writer": True,
diff --git a/infra/config/global/gn_standalone_ci.star b/infra/config/global/gn_standalone_ci.star
index 4c9f72c..6b4f4fb 100644
--- a/infra/config/global/gn_standalone_ci.star
+++ b/infra/config/global/gn_standalone_ci.star
@@ -601,6 +601,42 @@
     ),
 )
 
+ci.builder(
+    name = "dawn-linux-x64-sws-clusterfuzz",
+    description_html = "Generates ClusterFuzz corpora using Linux/x64 binaries and data from running with SwiftShader",
+    # Run daily at 5PM Pacific.
+    schedule = "0 0 * * *",
+    builder_spec = builder_config.builder_spec(
+        gclient_config = builder_config.gclient_config(
+            config = "dawn",
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "dawn_base",
+            build_config = builder_config.build_config.RELEASE,
+            target_arch = builder_config.target_arch.INTEL,
+            target_bits = 64,
+            target_platform = builder_config.target_platform.LINUX,
+        ),
+    ),
+    gn_args = gn_args.config(
+        configs = [
+            "component",
+            "dawn_swiftshader",
+            "linux_clang",
+            "release",
+            "tint_build_ir_binary",
+            "tint_has_fuzzers",
+            "x64",
+        ],
+    ),
+    cores = 8,
+    os = os.LINUX_DEFAULT,
+    console_view_entry = consoles.console_view_entry(
+        category = "linux|build|clang|rel|cf",
+        short_name = "x64",
+    ),
+)
+
 ################################################################################
 # Child Testers                                                                #
 ################################################################################
diff --git a/infra/specs/ci.json b/infra/specs/ci.json
index 88e799b..d774336 100644
--- a/infra/specs/ci.json
+++ b/infra/specs/ci.json
@@ -22,7 +22,7 @@
         "merge": {
           "script": "//scripts/merge_scripts/true_noop_merge.py"
         },
-        "name": "tint_ir_fuzzer_corpus_tests",
+        "name": "tint_ir_fuzzer_corpus_check_tests",
         "resultdb": {
           "result_format": "single"
         },
@@ -47,7 +47,7 @@
         "merge": {
           "script": "//scripts/merge_scripts/true_noop_merge.py"
         },
-        "name": "tint_wgsl_fuzzer_corpus_tests",
+        "name": "tint_wgsl_fuzzer_corpus_check_tests",
         "resultdb": {
           "result_format": "single"
         },
@@ -77,7 +77,7 @@
         "merge": {
           "script": "//scripts/merge_scripts/true_noop_merge.py"
         },
-        "name": "tint_ir_fuzzer_corpus_tests",
+        "name": "tint_ir_fuzzer_corpus_check_tests",
         "resultdb": {
           "result_format": "single"
         },
@@ -102,7 +102,119 @@
         "merge": {
           "script": "//scripts/merge_scripts/true_noop_merge.py"
         },
-        "name": "tint_wgsl_fuzzer_corpus_tests",
+        "name": "tint_wgsl_fuzzer_corpus_check_tests",
+        "resultdb": {
+          "result_format": "single"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "gpu": "none",
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.gpu"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "fuzzer_corpus_tests",
+        "test_id_prefix": "ninja://src/tint:fuzzer_corpus_tests/"
+      }
+    ]
+  },
+  "dawn-linux-x64-sws-clusterfuzz": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--adapter-vendor-id=0x1AE0",
+          "--use-wire",
+          "--wire-trace-dir=${ISOLATED_OUTDIR}"
+        ],
+        "merge": {
+          "script": "//scripts/merge_scripts/true_noop_merge.py"
+        },
+        "name": "dawn_wire_trace_end2end_sws_tests",
+        "resultdb": {
+          "result_format": "gtest_json"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "gpu": "none",
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.gpu"
+          },
+          "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": [
+          "--use-wire",
+          "--wire-trace-dir=${ISOLATED_OUTDIR}"
+        ],
+        "merge": {
+          "script": "//scripts/merge_scripts/true_noop_merge.py"
+        },
+        "name": "dawn_wire_trace_unittests",
+        "resultdb": {
+          "result_format": "gtest_json"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "gpu": "none",
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.gpu"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "dawn_unittests",
+        "test_id_prefix": "ninja://src/dawn/tests:dawn_unittests/"
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "args": [
+          "-generate",
+          "-out",
+          "${ISOLATED_OUTDIR}",
+          "-ir",
+          "--append-cwd-as-build"
+        ],
+        "merge": {
+          "script": "//scripts/merge_scripts/true_noop_merge.py"
+        },
+        "name": "tint_ir_fuzzer_corpus_generate_tests",
+        "resultdb": {
+          "result_format": "single"
+        },
+        "swarming": {
+          "containment_type": "AUTO",
+          "dimensions": {
+            "cpu": "x86-64",
+            "gpu": "none",
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.gpu"
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "fuzzer_corpus_tests",
+        "test_id_prefix": "ninja://src/tint:fuzzer_corpus_tests/"
+      },
+      {
+        "args": [
+          "-generate",
+          "-out",
+          "${ISOLATED_OUTDIR}",
+          "--append-cwd-as-build"
+        ],
+        "merge": {
+          "script": "//scripts/merge_scripts/true_noop_merge.py"
+        },
+        "name": "tint_wgsl_fuzzer_corpus_generate_tests",
         "resultdb": {
           "result_format": "single"
         },
@@ -446,7 +558,7 @@
         "merge": {
           "script": "//scripts/merge_scripts/true_noop_merge.py"
         },
-        "name": "tint_ir_fuzzer_corpus_tests",
+        "name": "tint_ir_fuzzer_corpus_check_tests",
         "resultdb": {
           "result_format": "single"
         },
@@ -471,7 +583,7 @@
         "merge": {
           "script": "//scripts/merge_scripts/true_noop_merge.py"
         },
-        "name": "tint_wgsl_fuzzer_corpus_tests",
+        "name": "tint_wgsl_fuzzer_corpus_check_tests",
         "resultdb": {
           "result_format": "single"
         },
@@ -501,7 +613,7 @@
         "merge": {
           "script": "//scripts/merge_scripts/true_noop_merge.py"
         },
-        "name": "tint_ir_fuzzer_corpus_tests",
+        "name": "tint_ir_fuzzer_corpus_check_tests",
         "resultdb": {
           "result_format": "single"
         },
@@ -526,7 +638,7 @@
         "merge": {
           "script": "//scripts/merge_scripts/true_noop_merge.py"
         },
-        "name": "tint_wgsl_fuzzer_corpus_tests",
+        "name": "tint_wgsl_fuzzer_corpus_check_tests",
         "resultdb": {
           "result_format": "single"
         },
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index 52f9e81..7a95e1b 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -17,6 +17,20 @@
         'test': 'dawn_end2end_tests',
       },
     },
+    'dawn_wire_trace_end2end_sws_gtests': {
+      'dawn_wire_trace_end2end_sws_tests': {
+        'args': [
+          '--adapter-vendor-id=0x1AE0',
+          '--use-wire',
+          '--wire-trace-dir=${ISOLATED_OUTDIR}',
+        ],
+        'mixins': [
+          'result_adapter_gtest_json',
+          'true_noop_merge',
+        ],
+        'test': 'dawn_end2end_tests',
+      },
+    },
     'dawn_end2end_sws_gtests': {
       'dawn_end2end_sws_tests': {
         'args': [
@@ -84,6 +98,19 @@
         ],
       },
     },
+    'dawn_wire_trace_unit_gtests': {
+      'dawn_wire_trace_unittests': {
+        'args': [
+          '--use-wire',
+          '--wire-trace-dir=${ISOLATED_OUTDIR}',
+        ],
+        'mixins': [
+          'result_adapter_gtest_json',
+          'true_noop_merge',
+        ],
+        'test': 'dawn_unittests',
+      },
+    },
     'dawn_wire_unit_gtests': {
       'dawn_wire_unittests': {
         'args': [
@@ -96,8 +123,8 @@
         'test': 'dawn_unittests',
       },
     },
-    'tint_fuzzer_corpus_tests': {
-      'tint_wgsl_fuzzer_corpus_tests': {
+    'tint_fuzzer_corpus_check_tests': {
+      'tint_wgsl_fuzzer_corpus_check_tests': {
         'args': [
           '-check',
           '--append-cwd-as-build',
@@ -108,7 +135,7 @@
         ],
         'test': 'fuzzer_corpus_tests',
       },
-      'tint_ir_fuzzer_corpus_tests': {
+      'tint_ir_fuzzer_corpus_check_tests': {
         'args': [
           '-check',
           '-ir',
@@ -121,6 +148,35 @@
         'test': 'fuzzer_corpus_tests',
       },
     },
+    'tint_fuzzer_corpus_generate_tests': {
+      'tint_wgsl_fuzzer_corpus_generate_tests': {
+        'args': [
+          '-generate',
+          '-out',
+          '${ISOLATED_OUTDIR}',
+          '--append-cwd-as-build',
+        ],
+        'mixins': [
+          'result_adapter_single',
+          'true_noop_merge',
+        ],
+        'test': 'fuzzer_corpus_tests',
+      },
+      'tint_ir_fuzzer_corpus_generate_tests': {
+        'args': [
+          '-generate',
+          '-out',
+          '${ISOLATED_OUTDIR}',
+          '-ir',
+          '--append-cwd-as-build',
+        ],
+        'mixins': [
+          'result_adapter_single',
+          'true_noop_merge',
+        ],
+        'test': 'fuzzer_corpus_tests',
+      },
+    },
     'tint_unit_gtests': {
       'tint_unittests': {
         'mixins': [
@@ -147,5 +203,9 @@
       'dawn_wire_unit_gtests',
       'tint_unit_gtests',
     ],
+    'wire_trace_gtests': [
+      'dawn_wire_trace_end2end_sws_gtests',
+      'dawn_wire_trace_unit_gtests',
+    ],
   },
 }
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 96b311f..759626b 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -25,7 +25,7 @@
           'x86-64',
         ],
         'test_suites': {
-          'isolated_scripts': 'tint_fuzzer_corpus_tests',
+          'isolated_scripts': 'tint_fuzzer_corpus_check_tests',
         },
       },
       'dawn-linux-x64-fuzz-rel': {
@@ -37,7 +37,20 @@
           'x86-64',
         ],
         'test_suites': {
-          'isolated_scripts': 'tint_fuzzer_corpus_tests',
+          'isolated_scripts': 'tint_fuzzer_corpus_check_tests',
+        },
+      },
+      'dawn-linux-x64-sws-clusterfuzz': {
+        'os_type': 'linux',
+        'mixins': [
+          'gpu-swarming-pool',
+          'no_gpu',
+          'linux-jammy',
+          'x86-64',
+        ],
+        'test_suites': {
+          'gtest_tests': 'wire_trace_gtests',
+          'isolated_scripts': 'tint_fuzzer_corpus_generate_tests',
         },
       },
       'dawn-linux-x64-sws-dbg': {
@@ -85,7 +98,7 @@
           'x86-64',
         ],
         'test_suites': {
-          'isolated_scripts': 'tint_fuzzer_corpus_tests',
+          'isolated_scripts': 'tint_fuzzer_corpus_check_tests',
         },
       },
       'dawn-linux-x86-fuzz-rel': {
@@ -97,7 +110,7 @@
           'x86-64',
         ],
         'test_suites': {
-          'isolated_scripts': 'tint_fuzzer_corpus_tests',
+          'isolated_scripts': 'tint_fuzzer_corpus_check_tests',
         },
       },
       'dawn-linux-x86-sws-dbg': {