summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authornednguyen <nednguyen@google.com>2015-11-04 16:02:21 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-05 00:03:08 +0000
commit6e86a1acac5d494c6e2df6bbd044dfe4539428d1 (patch)
tree4d3376da6001ba3cd59027df5fdbd3379a68549e /testing
parent0f78ba540eb43fb2bb3b7726eeb41d22bfee09a3 (diff)
downloadchromium_src-6e86a1acac5d494c6e2df6bbd044dfe4539428d1.zip
chromium_src-6e86a1acac5d494c6e2df6bbd044dfe4539428d1.tar.gz
chromium_src-6e86a1acac5d494c6e2df6bbd044dfe4539428d1.tar.bz2
[Telemetry] Check whether powermetrics service has already terminated and fail gracefully
This also enable swarming for telemetry_perf_unittests on Mac10.9 BUG=551405 Review URL: https://codereview.chromium.org/1410553009 Cr-Commit-Position: refs/heads/master@{#357938}
Diffstat (limited to 'testing')
-rw-r--r--testing/buildbot/chromium.mac.json10
1 files changed, 8 insertions, 2 deletions
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 59b1edf..f62cc5f 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -1184,7 +1184,10 @@
},
{
"isolate_name": "telemetry_perf_unittests",
- "name": "telemetry_perf_unittests"
+ "name": "telemetry_perf_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ }
}
],
"scripts": [
@@ -1471,7 +1474,10 @@
},
{
"isolate_name": "telemetry_perf_unittests",
- "name": "telemetry_perf_unittests"
+ "name": "telemetry_perf_unittests",
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ }
}
],
"scripts": [