Commit 066708c1 authored by Ryan Harrison's avatar Ryan Harrison Committed by Commit Bot

Add spvc_parser configs, and make spvc flags explicit

BUG=dawn:345,dawn:354

Change-Id: I0ef71cc18397aa4854e8dc3e310e4031ab7be731
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2075044
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarAustin Eng <enga@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744832}
parent 1a2a1b30
......@@ -27,6 +27,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "linux-intel-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -55,7 +80,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "linux-intel-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -250,6 +301,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "linux-nvidia-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -278,7 +354,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "linux-nvidia-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -473,6 +575,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "linux-intel-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -501,7 +628,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "linux-intel-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -623,6 +776,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "linux-nvidia-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -651,7 +829,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "linux-nvidia-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -776,6 +980,32 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "mac-amd-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -805,7 +1035,34 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "mac-amd-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -1008,13 +1265,14 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--skip-validation"
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_skip_validation_tests",
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -1031,13 +1289,13 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--skip-validation"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_tests",
"name": "dawn_end2end_skip_validation_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -1054,13 +1312,14 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--enable-backend-validation"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_validation_layers_tests",
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -1077,13 +1336,14 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-wire"
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_wire_tests",
"name": "dawn_end2end_use_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -1098,12 +1358,15 @@
},
{
"args": [
"--use-gpu-in-tests"
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--enable-backend-validation"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_validation_layers_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -1113,17 +1376,20 @@
}
]
},
"test": "gl_tests",
"test_target": "//gpu:gl_tests"
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests"
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-wire"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_wire_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
......@@ -1133,15 +1399,55 @@
}
]
},
"test": "gl_unittests",
"test_target": "//ui/gl:gl_unittests"
}
],
"isolated_scripts": [
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--override-steps=1",
"--gtest-benchmark-name=dawn_perf_tests",
"--use-gpu-in-tests"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "mac-intel-stable"
}
]
},
"test": "gl_tests",
"test_target": "//gpu:gl_tests"
},
{
"args": [
"--use-gpu-in-tests"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "mac-intel-stable"
}
]
},
"test": "gl_unittests",
"test_target": "//ui/gl:gl_unittests"
}
],
"isolated_scripts": [
{
"args": [
"--override-steps=1",
"--gtest-benchmark-name=dawn_perf_tests",
"-v"
],
"isolate_name": "dawn_perf_tests",
......@@ -1218,6 +1524,32 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "mac-amd-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -1247,7 +1579,34 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "mac-amd-stable",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -1372,6 +1731,30 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "mac-intel-stable"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -1399,7 +1782,32 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "mac-intel-stable"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -1519,6 +1927,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -1547,7 +1980,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -1741,6 +2200,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -1769,7 +2253,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -1963,6 +2473,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -1991,7 +2526,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -2113,6 +2674,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -2141,7 +2727,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -2265,6 +2877,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -2293,7 +2930,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -2486,6 +3149,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -2514,7 +3202,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -2707,6 +3421,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -2735,7 +3474,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......@@ -2857,6 +3622,31 @@
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--no-use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_no_spvc_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
......@@ -2885,7 +3675,33 @@
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc"
"--use-spvc",
"--use-spvc-parser"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "dawn_end2end_use_spvc_parser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "chromium.tests.gpu"
}
]
},
"test": "dawn_end2end_tests",
"test_target": "//third_party/dawn:dawn_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0",
"--use-spvc",
"--no-use-spvc-parser"
],
"merge": {
"args": [],
......
......@@ -1853,6 +1853,16 @@
# GPU gtests that test only Dawn
'gpu_dawn_gtests': {
'dawn_end2end_no_spvc_tests': {
'desktop_args': [
'--use-gpu-in-tests',
# Dawn test retries deliberately disabled to prevent flakiness.
'--test-launcher-retry-limit=0',
'--no-use-spvc',
'--no-use-spvc-parser',
],
'test': 'dawn_end2end_tests',
},
'dawn_end2end_skip_validation_tests': {
'desktop_args': [
'--use-gpu-in-tests',
......@@ -1866,15 +1876,26 @@
'desktop_args': [
'--use-gpu-in-tests',
# Dawn test retries deliberately disabled to prevent flakiness.
'--test-launcher-retry-limit=0'
'--test-launcher-retry-limit=0',
],
},
'dawn_end2end_use_spvc_parser_tests': {
'desktop_args': [
'--use-gpu-in-tests',
# Dawn test retries deliberately disabled to prevent flakiness.
'--test-launcher-retry-limit=0',
'--use-spvc',
'--use-spvc-parser',
],
'test': 'dawn_end2end_tests',
},
'dawn_end2end_use_spvc_tests': {
'desktop_args': [
'--use-gpu-in-tests',
# Dawn test retries deliberately disabled to prevent flakiness.
'--test-launcher-retry-limit=0',
'--use-spvc',
'--no-use-spvc-parser',
],
'test': 'dawn_end2end_tests',
},
......@@ -1901,6 +1922,16 @@
# GPU gtests that test Dawn and integration with Chromium
# These tests are run both on the CI and trybots which test DEPS Dawn.
'gpu_dawn_integration_gtests': {
'dawn_end2end_no_spvc_tests': {
'desktop_args': [
'--use-gpu-in-tests',
# Dawn test retries deliberately disabled to prevent flakiness.
'--test-launcher-retry-limit=0',
'--no-use-spvc',
'--no-use-spvc-parser',
],
'test': 'dawn_end2end_tests',
},
'dawn_end2end_skip_validation_tests': {
'desktop_args': [
'--use-gpu-in-tests',
......@@ -1914,15 +1945,26 @@
'desktop_args': [
'--use-gpu-in-tests',
# Dawn test retries deliberately disabled to prevent flakiness.
'--test-launcher-retry-limit=0'
'--test-launcher-retry-limit=0',
],
},
'dawn_end2end_use_spvc_parser_tests': {
'desktop_args': [
'--use-gpu-in-tests',
# Dawn test retries deliberately disabled to prevent flakiness.
'--test-launcher-retry-limit=0',
'--use-spvc',
'--use-spvc-parser',
],
'test': 'dawn_end2end_tests',
},
'dawn_end2end_use_spvc_tests': {
'desktop_args': [
'--use-gpu-in-tests',
# Dawn test retries deliberately disabled to prevent flakiness.
'--test-launcher-retry-limit=0',
'--use-spvc',
'--no-use-spvc-parser',
],
'test': 'dawn_end2end_tests',
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment