Enable gn_v2 Linux/x86/Release/SwS tests
Enables tests on dawn-linux-x86-fuzz-rel and dawn-linux-x86-sws-rel
that are equivalent to the tests on linux-clang-rel-x86.
Bug: 385317083
Change-Id: Ida0a1c36fcdd8a7c861c1cc10430220cc8e4e7c1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/262154
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Commit-Queue: Brian Sheedy <bsheedy@google.com>
diff --git a/infra/specs/ci.json b/infra/specs/ci.json
index 8c00e91..d54e906 100644
--- a/infra/specs/ci.json
+++ b/infra/specs/ci.json
@@ -344,7 +344,31 @@
}
]
},
- "dawn-linux-x86-fuzz-rel": {},
+ "dawn-linux-x86-fuzz-rel": {
+ "isolated_scripts": [
+ {
+ "args": [
+ "fuzz",
+ "-check",
+ "-ir",
+ "--append-cwd-as-build"
+ ],
+ "name": "tint_ir_fuzzer_corpus_tests",
+ "test": "fuzzer_corpus_tests",
+ "test_id_prefix": "ninja://src/tint:fuzzer_corpus_tests/"
+ },
+ {
+ "args": [
+ "fuzz",
+ "-check",
+ "--append-cwd-as-build"
+ ],
+ "name": "tint_wgsl_fuzzer_corpus_tests",
+ "test": "fuzzer_corpus_tests",
+ "test_id_prefix": "ninja://src/tint:fuzzer_corpus_tests/"
+ }
+ ]
+ },
"dawn-linux-x86-sws-dbg": {
"gtest_tests": [
{
@@ -465,6 +489,125 @@
}
]
},
- "dawn-linux-x86-sws-rel": {},
+ "dawn-linux-x86-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",
+ "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": [
+ "--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",
+ "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/"
+ },
+ {
+ "merge": {
+ "script": "//testing/merge_scripts/noop_merge.py"
+ },
+ "name": "dawn_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/"
+ },
+ {
+ "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",
+ "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/"
+ },
+ {
+ "merge": {
+ "script": "//testing/merge_scripts/noop_merge.py"
+ },
+ "name": "tint_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": "tint_unittests",
+ "test_id_prefix": "ninja://src/tint/cmd/test:tint_unittests/"
+ }
+ ]
+ },
"dawn-win-x64-sws-rel": {}
}
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 4c9469d..ccaa3db 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -76,7 +76,9 @@
'linux-jammy',
'x86-64',
],
- 'test_suites': {},
+ 'test_suites': {
+ 'isolated_scripts': 'tint_fuzzer_corpus_tests',
+ },
},
'dawn-linux-x86-sws-dbg': {
'os_type': 'linux',
@@ -98,7 +100,9 @@
'linux-jammy',
'x86-64',
],
- 'test_suites': {},
+ 'test_suites': {
+ 'gtest_tests': 'swiftshader_gtests',
+ },
},
'dawn-win-x64-sws-rel': {
'os_type': 'win',
