summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authornednguyen <nednguyen@chromium.org>2015-11-04 17:52:40 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-05 01:53:21 +0000
commita9ed17edd6831510d2d50680824740a485ae25d6 (patch)
treeba624747f29b1b7bc84d2daaa2cf9decb6c8cc86 /testing
parent30013b1a71c964f3fa26ffd8645b170f0eff2b93 (diff)
downloadchromium_src-a9ed17edd6831510d2d50680824740a485ae25d6.zip
chromium_src-a9ed17edd6831510d2d50680824740a485ae25d6.tar.gz
chromium_src-a9ed17edd6831510d2d50680824740a485ae25d6.tar.bz2
Revert of [Telemetry] Check whether powermetrics service has already terminated and fail gracefully (patchset #2 id:40001 of https://codereview.chromium.org/1410553009/ )
Reason for revert: Still fail on Mac10.9: https://chromium-swarm.appspot.com/user/task/2aee11a4bdc2d210 Original issue's description: > [Telemetry] Check whether powermetrics service has already terminated and fail gracefully > > This also enable swarming for telemetry_perf_unittests on Mac10.9 > > BUG=551405 > > Committed: https://crrev.com/6e86a1acac5d494c6e2df6bbd044dfe4539428d1 > Cr-Commit-Position: refs/heads/master@{#357938} TBR=maruel@chromium.org,nednguyen@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=551405 Review URL: https://codereview.chromium.org/1428273002 Cr-Commit-Position: refs/heads/master@{#357975}
Diffstat (limited to 'testing')
-rw-r--r--testing/buildbot/chromium.mac.json10
1 files changed, 2 insertions, 8 deletions
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index f62cc5f..59b1edf 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -1184,10 +1184,7 @@
},
{
"isolate_name": "telemetry_perf_unittests",
- "name": "telemetry_perf_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true
- }
+ "name": "telemetry_perf_unittests"
}
],
"scripts": [
@@ -1474,10 +1471,7 @@
},
{
"isolate_name": "telemetry_perf_unittests",
- "name": "telemetry_perf_unittests",
- "swarming": {
- "can_use_on_swarming_builders": true
- }
+ "name": "telemetry_perf_unittests"
}
],
"scripts": [