Commit ec20ac13 authored by Jao-ke Chin-Lee's avatar Jao-ke Chin-Lee Committed by Commit Bot

Copy WebKit Linux Trust ASAN/MSAN/Leak to chromium.memory.

Bug: 790309,790294,790286
Change-Id: I9e6a5ff635b6edda8bbe4fb87826f8cf7a5dcd5f
Reviewed-on: https://chromium-review.googlesource.com/c/1354137Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Jao-ke Chin-Lee <jchinlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611918}
parent 744c08f1
...@@ -9461,6 +9461,105 @@ ...@@ -9461,6 +9461,105 @@
} }
] ]
}, },
"WebKit Linux Trusty ASAN": {
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"--additional-expectations",
"../../third_party/blink/web_tests/ASANExpectations",
"--time-out-ms",
"48000",
"--enable-sanitizer"
],
"isolate_name": "webkit_layout_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
],
"shards": 20
}
}
]
},
"WebKit Linux Trusty Leak": {
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"--additional-expectations",
"../../third_party/blink/web_tests/LeakExpectations",
"--time-out-ms",
"48000",
"--enable-leak-detection"
],
"isolate_name": "webkit_layout_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
],
"shards": 10
}
}
]
},
"WebKit Linux Trusty MSAN": {
"isolated_scripts": [
{
"args": [
"--num-retries=3",
"--additional-expectations",
"../../third_party/blink/web_tests/MSANExpectations",
"--time-out-ms",
"66000",
"--enable-sanitizer"
],
"isolate_name": "webkit_layout_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webkit_layout_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
],
"expiration": 36000,
"hard_timeout": 10800,
"io_timeout": 3600,
"shards": 20
}
}
]
},
"win-asan": { "win-asan": {
"gtest_tests": [ "gtest_tests": [
{ {
......
...@@ -3180,6 +3180,21 @@ ...@@ -3180,6 +3180,21 @@
'--test-launcher-print-test-stdio=always', '--test-launcher-print-test-stdio=always',
], ],
}, },
'WebKit Linux Trusty ASAN': {
'test_suites': {
'isolated_scripts': 'chromium_webkit_isolated_scripts',
},
},
'WebKit Linux Trusty Leak': {
'test_suites': {
'isolated_scripts': 'chromium_webkit_isolated_scripts',
},
},
'WebKit Linux Trusty MSAN': {
'test_suites': {
'isolated_scripts': 'chromium_webkit_isolated_scripts',
},
},
'win-asan': { 'win-asan': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win_gtests', 'gtest_tests': 'chromium_win_gtests',
...@@ -3265,6 +3280,8 @@ ...@@ -3265,6 +3280,8 @@
{ {
'name': 'chromium.webkit', 'name': 'chromium.webkit',
'machines': { 'machines': {
# TODO(jchinlee): The below three builders are in chromium.memory on LUCI,
# see crbug.com/790309, crbug.com/790294, crbug.com/790286.
'WebKit Linux Trusty ASAN': { 'WebKit Linux Trusty ASAN': {
'test_suites': { 'test_suites': {
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
......
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