[infra][wptrunner] Standardize settings for running sanitized web tests
`blink_{web,wpt}_tests` on the "WebKit Linux {ASAN,Leak,MSAN}" builders have exceptions that add `run_web_tests.py` command line options to run tests in "sanitizer mode" (only surfaces crashes/timeouts) and with sanitizer-specific expectation files. Refactor the exceptions into mixins that automatically apply builder-wide to all web (platform) test suites, including [0] and [1] (recently added). [0]: https://crrev.com/c/5818347 [1]: https://crrev.com/c/5774449 Bug: 360008882 Fixed: 40887057 Change-Id: I855323978a6d3d617d7e4423386fa5cec3c2703a Cq-Include-Trybots: luci.chromium.try:linux-webkit-asan-rel Cq-Include-Trybots: luci.chromium.try:linux-webkit-msan-rel Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5801478 Commit-Queue: Jonathan Lee <jonathanjlee@google.com> Reviewed-by: Struan Shrimpton <sshrimp@google.com> Cr-Commit-Position: refs/heads/main@{#1348893}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
1340061178
commit
a967c01311
infra/config
testing/buildbot
@ -1262,6 +1262,27 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
'web-test-asan': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/ASANExpectations',
|
||||
'--enable-sanitizer',
|
||||
],
|
||||
},
|
||||
'web-test-leak': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/LeakExpectations',
|
||||
'--enable-leak-detection',
|
||||
],
|
||||
},
|
||||
'web-test-msan': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/MSANExpectations',
|
||||
'--enable-sanitizer',
|
||||
],
|
||||
},
|
||||
'webgpu_cts': {
|
||||
'args': [
|
||||
'--initialize-webgpu-adapter-at-startup-timeout-ms=60000',
|
||||
|
@ -1735,6 +1735,33 @@ targets.mixin(
|
||||
),
|
||||
)
|
||||
|
||||
targets.mixin(
|
||||
name = "web-test-asan",
|
||||
args = [
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/ASANExpectations",
|
||||
"--enable-sanitizer",
|
||||
],
|
||||
)
|
||||
|
||||
targets.mixin(
|
||||
name = "web-test-leak",
|
||||
args = [
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/LeakExpectations",
|
||||
"--enable-leak-detection",
|
||||
],
|
||||
)
|
||||
|
||||
targets.mixin(
|
||||
name = "web-test-msan",
|
||||
args = [
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/MSANExpectations",
|
||||
"--enable-sanitizer",
|
||||
],
|
||||
)
|
||||
|
||||
targets.mixin(
|
||||
name = "webgpu_cts",
|
||||
args = [
|
||||
|
@ -10649,9 +10649,9 @@
|
||||
"--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/ASANExpectations",
|
||||
"--enable-sanitizer",
|
||||
"--timeout-ms",
|
||||
"48000",
|
||||
"--enable-sanitizer"
|
||||
"48000"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10681,9 +10681,9 @@
|
||||
"--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/ASANExpectations",
|
||||
"--enable-sanitizer",
|
||||
"--timeout-ms",
|
||||
"48000",
|
||||
"--enable-sanitizer"
|
||||
"48000"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10711,7 +10711,8 @@
|
||||
"args": [
|
||||
"--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/ASANExpectations"
|
||||
"../../third_party/blink/web_tests/ASANExpectations",
|
||||
"--enable-sanitizer"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10742,7 +10743,10 @@
|
||||
"crashtest",
|
||||
"print-reftest",
|
||||
"--inverted-test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
|
||||
"--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/headless_shell.filter"
|
||||
"--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/headless_shell.filter",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/ASANExpectations",
|
||||
"--enable-sanitizer"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10778,9 +10782,9 @@
|
||||
"--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/LeakExpectations",
|
||||
"--enable-leak-detection",
|
||||
"--timeout-ms",
|
||||
"48000",
|
||||
"--enable-leak-detection"
|
||||
"48000"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10810,9 +10814,9 @@
|
||||
"--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/LeakExpectations",
|
||||
"--enable-leak-detection",
|
||||
"--timeout-ms",
|
||||
"48000",
|
||||
"--enable-leak-detection"
|
||||
"48000"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10838,7 +10842,10 @@
|
||||
},
|
||||
{
|
||||
"args": [
|
||||
"--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter"
|
||||
"--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/LeakExpectations",
|
||||
"--enable-leak-detection"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10869,7 +10876,10 @@
|
||||
"crashtest",
|
||||
"print-reftest",
|
||||
"--inverted-test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
|
||||
"--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/headless_shell.filter"
|
||||
"--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/headless_shell.filter",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/LeakExpectations",
|
||||
"--enable-leak-detection"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10902,9 +10912,9 @@
|
||||
"--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/MSANExpectations",
|
||||
"--enable-sanitizer",
|
||||
"--timeout-ms",
|
||||
"66000",
|
||||
"--enable-sanitizer"
|
||||
"66000"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10937,9 +10947,9 @@
|
||||
"--write-run-histories-to=${ISOLATED_OUTDIR}/run_histories.json",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/MSANExpectations",
|
||||
"--enable-sanitizer",
|
||||
"--timeout-ms",
|
||||
"66000",
|
||||
"--enable-sanitizer"
|
||||
"66000"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
@ -10970,7 +10980,8 @@
|
||||
"args": [
|
||||
"--test-launcher-filter-file=../../third_party/blink/web_tests/TestLists/chrome.filter",
|
||||
"--additional-expectations",
|
||||
"../../third_party/blink/web_tests/MSANExpectations"
|
||||
"../../third_party/blink/web_tests/MSANExpectations",
|
||||
"--enable-sanitizer"
|
||||
],
|
||||
"merge": {
|
||||
"args": [
|
||||
|
@ -1262,6 +1262,27 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
'web-test-asan': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/ASANExpectations',
|
||||
'--enable-sanitizer',
|
||||
],
|
||||
},
|
||||
'web-test-leak': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/LeakExpectations',
|
||||
'--enable-leak-detection',
|
||||
],
|
||||
},
|
||||
'web-test-msan': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/MSANExpectations',
|
||||
'--enable-sanitizer',
|
||||
],
|
||||
},
|
||||
'webgpu_cts': {
|
||||
'args': [
|
||||
'--initialize-webgpu-adapter-at-startup-timeout-ms=60000',
|
||||
|
@ -383,11 +383,8 @@
|
||||
},
|
||||
'WebKit Linux ASAN': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/ASANExpectations',
|
||||
'--timeout-ms',
|
||||
'48000',
|
||||
'--enable-sanitizer',
|
||||
],
|
||||
'swarming': {
|
||||
'shards': 8,
|
||||
@ -395,11 +392,8 @@
|
||||
},
|
||||
'WebKit Linux Leak': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/LeakExpectations',
|
||||
'--timeout-ms',
|
||||
'48000',
|
||||
'--enable-leak-detection',
|
||||
],
|
||||
'swarming': {
|
||||
'shards': 4,
|
||||
@ -407,11 +401,8 @@
|
||||
},
|
||||
'WebKit Linux MSAN': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/MSANExpectations',
|
||||
'--timeout-ms',
|
||||
'66000',
|
||||
'--enable-sanitizer',
|
||||
],
|
||||
'swarming': {
|
||||
'expiration': 36000,
|
||||
@ -651,11 +642,8 @@
|
||||
},
|
||||
'WebKit Linux ASAN': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/ASANExpectations',
|
||||
'--timeout-ms',
|
||||
'48000',
|
||||
'--enable-sanitizer',
|
||||
],
|
||||
'swarming': {
|
||||
'shards': 12,
|
||||
@ -663,11 +651,8 @@
|
||||
},
|
||||
'WebKit Linux Leak': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/LeakExpectations',
|
||||
'--timeout-ms',
|
||||
'48000',
|
||||
'--enable-leak-detection',
|
||||
],
|
||||
'swarming': {
|
||||
'shards': 6,
|
||||
@ -675,11 +660,8 @@
|
||||
},
|
||||
'WebKit Linux MSAN': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/MSANExpectations',
|
||||
'--timeout-ms',
|
||||
'66000',
|
||||
'--enable-sanitizer',
|
||||
],
|
||||
'swarming': {
|
||||
'expiration': 36000,
|
||||
@ -1457,22 +1439,6 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
'chrome_wpt_tests': {
|
||||
'modifications': {
|
||||
'WebKit Linux ASAN': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/ASANExpectations',
|
||||
],
|
||||
},
|
||||
'WebKit Linux MSAN': {
|
||||
'args': [
|
||||
'--additional-expectations',
|
||||
'../../third_party/blink/web_tests/MSANExpectations',
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
'chromedriver_py_tests': {
|
||||
'modifications': {
|
||||
'Win10 Tests x64': {
|
||||
|
@ -4531,6 +4531,7 @@
|
||||
'WebKit Linux ASAN': {
|
||||
'mixins': [
|
||||
'linux-jammy',
|
||||
'web-test-asan',
|
||||
],
|
||||
'test_suites': {
|
||||
'isolated_scripts': 'chromium_webkit_isolated_scripts',
|
||||
@ -4539,6 +4540,7 @@
|
||||
'WebKit Linux Leak': {
|
||||
'mixins': [
|
||||
'linux-jammy',
|
||||
'web-test-leak',
|
||||
],
|
||||
'test_suites': {
|
||||
'isolated_scripts': 'chromium_webkit_isolated_scripts',
|
||||
@ -4550,6 +4552,7 @@
|
||||
'WebKit Linux MSAN': {
|
||||
'mixins': [
|
||||
'linux-jammy',
|
||||
'web-test-msan',
|
||||
],
|
||||
'test_suites': {
|
||||
'isolated_scripts': 'chromium_webkit_isolated_scripts',
|
||||
|
Reference in New Issue
Block a user