diff options
| author | nednguyen <nednguyen@google.com> | 2015-11-09 16:40:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-10 00:41:45 +0000 |
| commit | 7824fdeb349810e8df7f1954636fc57a01540c05 (patch) | |
| tree | a5aa61622162b33a407f7546393c761a873c7ff2 /testing | |
| parent | c88f2abbae3284b81abd7e26b1e0274846a4c1c1 (diff) | |
| download | chromium_src-7824fdeb349810e8df7f1954636fc57a01540c05.zip chromium_src-7824fdeb349810e8df7f1954636fc57a01540c05.tar.gz chromium_src-7824fdeb349810e8df7f1954636fc57a01540c05.tar.bz2 | |
Run telemetry_perf_unittest via isolate on Windows tests with swarming
*BUILD SHERRIF: if the windows bots fail
telemetry_perf_unittest, it's probably safe to revert this
patch.
The change to tools/telemetry/telemetry/internal/platform/power_monitor/msr_power_monitor.py
is addressed in https://codereview.chromium.org/1411843011/
and will be rebased before submitting.
BUG=507796
NOTRY=true
Review URL: https://codereview.chromium.org/1419813012
Cr-Commit-Position: refs/heads/master@{#358717}
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/buildbot/chromium.win.json | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 4d8c735..74e3d4a 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -693,6 +693,13 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_perf_unittests", + "name": "telemetry_perf_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ @@ -701,10 +708,6 @@ "script": "telemetry_unittests.py" }, { - "name": "telemetry_perf_unittests", - "script": "telemetry_perf_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -1137,6 +1140,13 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_perf_unittests", + "name": "telemetry_perf_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ @@ -1145,10 +1155,6 @@ "script": "telemetry_unittests.py" }, { - "name": "telemetry_perf_unittests", - "script": "telemetry_perf_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -1486,6 +1492,13 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_perf_unittests", + "name": "telemetry_perf_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ @@ -2022,6 +2035,13 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_perf_unittests", + "name": "telemetry_perf_unittests", + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ @@ -2030,10 +2050,6 @@ "script": "telemetry_unittests.py" }, { - "name": "telemetry_perf_unittests", - "script": "telemetry_perf_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } |