Commit 569422b7 authored by Yuke Liao's avatar Yuke Liao Committed by Commit Bot

Fix win coverage config - part 3

The existing setup of enabling code coverage in try builder is
incorrect, and this CL fixes the issue with the following steps:
1. 'Win x64 Builder', 'Win10 x64 Release (NVIDIA)' and
   'Win10 Tests x64' have isolate_profile_data mixin.
2. 'win10_chromium_x64_rel_ng' is switched to mirror the builders
   mentioned in 1 instead of their code coverage counterparts.
3. Remove the code coverage counterparts of the builders in 1.

Bug: 1004523
Change-Id: I34348739e7ef9ea608593ba75f31781d1b84d486
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2197858
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789681}
parent d52cc216
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
......@@ -2945,21 +2945,6 @@
'isolated_scripts': 'rendering_desktop_representative_perf_tests_isolated_scripts',
},
},
# TODO(crbug.com/1004523) Delete 'Win10 x64 Release (NVIDIA) Code Coverage'
# when 'Win10 x64 Release (NVIDIA)' has code coverage enabled by default.
'Win10 x64 Release (NVIDIA) Code Coverage': {
'browser_config': 'release_x64',
'os_type': 'win',
'mixins': [
'isolate_profile_data',
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_win_gtests',
'gpu_telemetry_tests': 'gpu_common_win_telemetry_tests',
'isolated_scripts': 'rendering_desktop_representative_perf_tests_isolated_scripts',
},
},
},
},
{
......@@ -4943,19 +4928,6 @@
'scripts': 'check_network_annotations_script',
},
},
# TODO(crbug.com/1004523) Delete 'Win x64 Builder Code Coverage' when
# coverage is turned on in 'Win x64 Builder' by default.
'Win x64 Builder Code Coverage': {
'mixins': [
'isolate_profile_data',
],
'additional_compile_targets': [
'pdf_fuzzers'
],
'test_suites': {
'scripts': 'check_network_annotations_script',
},
},
# 'Win10 Tests x64' and 'Win7 Tests (1)' should have the same set of
# additional_compile_targets and test_suites.
# Added pixel tests on Win 10 only.
......@@ -4980,20 +4952,6 @@
'isolated_scripts': 'chromium_win_dbg_isolated_scripts',
},
},
# TODO(crbug.com/1004523) Delete 'Win10 Tests x64 Code Coverage' when
# coverage is turned on in 'Win10 Tests x64' by default.
'Win10 Tests x64 Code Coverage': {
'mixins': [
'isolate_profile_data',
'x86-64',
'win10',
],
'test_suites': {
'gtest_tests': 'chromium_win10_gtests',
'isolated_scripts': 'chromium_win_rel_isolated_scripts',
'scripts': 'chromium_scripts',
},
},
'Win7 (32) Tests': {
'mixins': [
'x86-32',
......
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