Commit 87e17b24 authored by Sajjad Mirza's avatar Sajjad Mirza Committed by Commit Bot

[code coverage] Make Win coverage tryjob run standard test targets.

The win10_chromium_x64_coverage_rel_ng tryjob needs to run the same
test targets as win10_chromium_x64_rel_ng to make sure that coverage
mode will not break the latter when it is enabled.

Bug: 1041689
Change-Id: Ib1edad65f58770930475bdb354d8dee7e8ae6ccd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006265Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Sajjad Mirza <sajjadm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734097}
parent 53ccf3e0
...@@ -5485,6 +5485,9 @@ ...@@ -5485,6 +5485,9 @@
"test_target": "//chrome/browser/browser_switcher/bho:browser_switcher_bho_unittests" "test_target": "//chrome/browser/browser_switcher/bho:browser_switcher_bho_unittests"
}, },
{ {
"args": [
"--disable-features=WebRTC-H264WithOpenH264FFmpeg"
],
"isolate_coverage_data": true, "isolate_coverage_data": true,
"merge": { "merge": {
"args": [], "args": [],
...@@ -5498,7 +5501,7 @@ ...@@ -5498,7 +5501,7 @@
"os": "Windows-10-15063" "os": "Windows-10-15063"
} }
], ],
"shards": 10 "shards": 15
}, },
"test": "browser_tests", "test": "browser_tests",
"test_target": "//chrome/test:browser_tests" "test_target": "//chrome/test:browser_tests"
...@@ -5705,6 +5708,9 @@ ...@@ -5705,6 +5708,9 @@
"test_target": "//ui/compositor:compositor_unittests" "test_target": "//ui/compositor:compositor_unittests"
}, },
{ {
"args": [
"--disable-features=WebRTC-H264WithOpenH264FFmpeg"
],
"isolate_coverage_data": true, "isolate_coverage_data": true,
"merge": { "merge": {
"args": [], "args": [],
...@@ -7245,52 +7251,6 @@ ...@@ -7245,52 +7251,6 @@
}, },
"test_target": "//chrome/test:telemetry_gpu_unittests" "test_target": "//chrome/test:telemetry_gpu_unittests"
}, },
{
"isolate_coverage_data": true,
"isolate_name": "telemetry_perf_unittests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "telemetry_perf_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"idempotent": false,
"shards": 12
},
"test_target": "//chrome/test:telemetry_perf_unittests"
},
{
"args": [
"--jobs=1",
"--extra-browser-args=--disable-gpu"
],
"isolate_coverage_data": true,
"isolate_name": "telemetry_unittests",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "telemetry_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"os": "Windows-10-15063"
}
],
"idempotent": false,
"shards": 4
},
"test_target": "//chrome/test:telemetry_unittests"
},
{ {
"args": [ "args": [
"--gtest-benchmark-name=views_perftests" "--gtest-benchmark-name=views_perftests"
...@@ -7317,7 +7277,9 @@ ...@@ -7317,7 +7277,9 @@
}, },
{ {
"args": [ "args": [
"--num-retries=3" "--num-retries=3",
"--target",
"Release_x64"
], ],
"isolate_coverage_data": true, "isolate_coverage_data": true,
"isolate_name": "blink_web_tests", "isolate_name": "blink_web_tests",
...@@ -7337,7 +7299,7 @@ ...@@ -7337,7 +7299,7 @@
"os": "Windows-10-15063" "os": "Windows-10-15063"
} }
], ],
"shards": 12 "shards": 28
}, },
"test_target": "//:blink_web_tests" "test_target": "//:blink_web_tests"
} }
......
...@@ -149,6 +149,17 @@ ...@@ -149,6 +149,17 @@
'shards': 15, 'shards': 15,
} }
}, },
'Win10 Tests x64 Code Coverage': {
# crbug.com/868082
'args': [
'--disable-features=WebRTC-H264WithOpenH264FFmpeg',
],
'swarming': {
# This is for slow test execution that often becomes a critical path of
# swarming jobs. crbug.com/868114
'shards': 15,
}
},
'Win7 Tests (1)': { 'Win7 Tests (1)': {
# This is for slow test execution that often becomes a critical path of # This is for slow test execution that often becomes a critical path of
# swarming jobs. crbug.com/868114 # swarming jobs. crbug.com/868114
...@@ -436,6 +447,12 @@ ...@@ -436,6 +447,12 @@
'--no-sandbox', '--no-sandbox',
], ],
}, },
'Win10 Tests x64 Code Coverage': {
# crbug.com/868082
'args': [
'--disable-features=WebRTC-H264WithOpenH264FFmpeg',
],
},
'android-arm64-proguard-rel': { 'android-arm64-proguard-rel': {
'swarming': { 'swarming': {
'shards': 16, 'shards': 16,
...@@ -1065,6 +1082,17 @@ ...@@ -1065,6 +1082,17 @@
'shards': 20, 'shards': 20,
}, },
}, },
'Win10 Tests x64 Code Coverage': {
# crbug.com/868082
'args': [
'--disable-features=WebRTC-H264WithOpenH264FFmpeg',
],
# This is for slow test execution that often becomes a critical path of
# swarming jobs. crbug.com/868114
'swarming': {
'shards': 20,
},
},
}, },
}, },
'network_service_components_browsertests': { 'network_service_components_browsertests': {
...@@ -1575,6 +1603,7 @@ ...@@ -1575,6 +1603,7 @@
'Linux - Future (dbg)', # client.v8.chromium 'Linux - Future (dbg)', # client.v8.chromium
'Win10 Tests x64', 'Win10 Tests x64',
'Win10 Tests x64 (dbg)', 'Win10 Tests x64 (dbg)',
'Win10 Tests x64 Code Coverage',
], ],
}, },
'telemetry_unittests': { 'telemetry_unittests': {
...@@ -1589,6 +1618,7 @@ ...@@ -1589,6 +1618,7 @@
'Mac10.11 Tests', 'Mac10.11 Tests',
'Win10 Tests x64', 'Win10 Tests x64',
'Win10 Tests x64 Code Coverage',
], ],
}, },
'unit_tests': { 'unit_tests': {
...@@ -1950,6 +1980,15 @@ ...@@ -1950,6 +1980,15 @@
'Debug_x64', 'Debug_x64',
], ],
}, },
'Win10 Tests x64 Code Coverage': {
'args': [
'--target',
'Release_x64',
],
'swarming': {
"shards": 28
},
},
'Win7 Tests (dbg)(1)': { 'Win7 Tests (dbg)(1)': {
'args': [ 'args': [
'--debug', '--debug',
......
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