Reland "Bring parity between mac coverage and non-coverage build"
This reverts commit 2940de50668a9ea13f53c0e4a6a561f20404fee0.
Reason for revert: The reverted build failed: https://ci.chromium.org/p/chromium/builders/ci/Mac10.15%20Tests/2902
The original CL doesn't seem to be the reason behind https://crbug.com/1112710.
Original change's description:
> Revert "Bring parity between mac coverage and non-coverage build"
>
> This reverts commit 25c59fc5baeed76db897b0fbc9cd42ee89f44b2c.
>
> Reason for revert: Speculative revert for https://crbug.com/1112710
>
> Original change's description:
> > Bring parity between mac coverage and non-coverage build
> >
> > They have diverged since coverage build was first created.
> >
> >
> > Bug: 1024915
> > Change-Id: Iec853bce25916efe7aea644c1a6ddcef4339a849
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2335573
> > Commit-Queue: Prakhar Asthana <[email protected]>
> > Commit-Queue: Yuke Liao <[email protected]>
> > Reviewed-by: Yuke Liao <[email protected]>
> > Auto-Submit: Prakhar Asthana <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#794288}
>
> [email protected],[email protected]
>
> Change-Id: Ifd50ef6445af397abd08a953e9229d86809d25d7
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1024915, 1112710
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2333841
> Reviewed-by: Kush Sinha <[email protected]>
> Commit-Queue: Kush Sinha <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#794487}
[email protected],[email protected],[email protected]
# Not skipping CQ checks because this is a reland.
Bug: 1024915
Bug: 1112710
Change-Id: Ia75ff3b1ef2494274e38eebb3a0ded893a3a2ff3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2336340
Reviewed-by: Yuke Liao <[email protected]>
Commit-Queue: Prakhar Asthana <[email protected]>
Cr-Commit-Position: refs/heads/master@{#794883}
diff --git a/testing/buildbot/chromium.ci.json b/testing/buildbot/chromium.ci.json
index b8735f8..a0b9b35 100644
--- a/testing/buildbot/chromium.ci.json
+++ b/testing/buildbot/chromium.ci.json
@@ -76979,26 +76979,6 @@
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
- "isolate_profile_data": true,
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "gpu": "none",
- "os": "Mac-10.13.6"
- }
- ],
- "service_account": "[email protected]",
- "shards": 10
- },
- "test": "browser_tests",
- "test_id_prefix": "ninja://chrome/test:browser_tests/"
- },
- {
"args": [
"--gtest_filter=-*UsingRealWebcam*"
],
@@ -77741,25 +77721,6 @@
],
"service_account": "[email protected]"
},
- "test": "nacl_loader_unittests",
- "test_id_prefix": "ninja://components/nacl/loader:nacl_loader_unittests/"
- },
- {
- "isolate_profile_data": true,
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "gpu": "none",
- "os": "Mac-10.13.6"
- }
- ],
- "service_account": "[email protected]"
- },
"test": "native_theme_unittests",
"test_id_prefix": "ninja://ui/native_theme:native_theme_unittests/"
},
@@ -78480,31 +78441,6 @@
},
{
"args": [
- "--extra-browser-args=--enable-crashpad"
- ],
- "isolate_name": "telemetry_perf_unittests",
- "isolate_profile_data": true,
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "telemetry_perf_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "gpu": "none",
- "os": "Mac-10.13.6"
- }
- ],
- "idempotent": false,
- "service_account": "[email protected]",
- "shards": 12
- },
- "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
- },
- {
- "args": [
"--jobs=1",
"--extra-browser-args=--disable-gpu"
],
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 26e8488..f6d71a5 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -8625,26 +8625,6 @@
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
- "isolate_profile_data": true,
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "gpu": "none",
- "os": "Mac-10.13.6"
- }
- ],
- "service_account": "[email protected]",
- "shards": 10
- },
- "test": "browser_tests",
- "test_id_prefix": "ninja://chrome/test:browser_tests/"
- },
- {
"args": [
"--gtest_filter=-*UsingRealWebcam*"
],
@@ -9387,25 +9367,6 @@
],
"service_account": "[email protected]"
},
- "test": "nacl_loader_unittests",
- "test_id_prefix": "ninja://components/nacl/loader:nacl_loader_unittests/"
- },
- {
- "isolate_profile_data": true,
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_gtest_merge.py"
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "gpu": "none",
- "os": "Mac-10.13.6"
- }
- ],
- "service_account": "[email protected]"
- },
"test": "native_theme_unittests",
"test_id_prefix": "ninja://ui/native_theme:native_theme_unittests/"
},
@@ -10126,31 +10087,6 @@
},
{
"args": [
- "--extra-browser-args=--enable-crashpad"
- ],
- "isolate_name": "telemetry_perf_unittests",
- "isolate_profile_data": true,
- "merge": {
- "args": [],
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "telemetry_perf_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "gpu": "none",
- "os": "Mac-10.13.6"
- }
- ],
- "idempotent": false,
- "service_account": "[email protected]",
- "shards": 12
- },
- "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
- },
- {
- "args": [
"--jobs=1",
"--extra-browser-args=--disable-gpu"
],
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index d7599c4..c7761625 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -443,6 +443,7 @@
'ToTLinuxTSan', # https://crbug.com/368525
'Mac10.10 Tests', # https://crbug.com/828031
'Mac10.13 Tests', # https://crbug.com/1042757
+ 'Mac10.13 Tests Code Coverage',
'Linux TSan Tests', # https://crbug.com/368525
'Win10 Tests x64 (dbg)',
'linux-lacros-tester-rel', # https://crbug.com/1111979
@@ -1762,6 +1763,7 @@
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
+ 'Mac10.13 Tests Code Coverage',
'Mac ASan 64 Tests (1)',
'ToTMacASan',
],
@@ -1809,6 +1811,7 @@
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
+ 'Mac10.13 Tests Code Coverage',
'Mac ASan 64 Tests (1)',
'ToTMacASan',
],
@@ -1826,6 +1829,7 @@
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
+ 'Mac10.13 Tests Code Coverage',
'Mac ASan 64 Tests (1)',
'ToTMacASan',
],
@@ -1842,6 +1846,7 @@
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
+ 'Mac10.13 Tests Code Coverage',
'Mac ASan 64 Tests (1)',
'ToTMacASan',
],
@@ -1863,6 +1868,7 @@
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
+ 'Mac10.13 Tests Code Coverage',
'Mac ASan 64 Tests (1)',
'ToTMacASan',
],
@@ -2471,6 +2477,7 @@
'Mac10.11 Tests',
'Mac10.13 Tests',
'Mac10.13 Tests (dbg)',
+ 'Mac10.13 Tests Code Coverage',
'Linux - Future (dbg)', # client.v8.chromium
'Win10 Tests x64',
'Win10 Tests x64 (dbg)',
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 0f70fb42..b2de477 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -4340,7 +4340,7 @@
'no_gpu',
],
'test_suites': {
- 'gtest_tests': 'chromium_mac_gtests',
+ 'gtest_tests': 'chromium_mac_gtests_no_nacl',
'isolated_scripts': 'chromium_mac_rel_isolated_scripts',
},
},
