diff options
author | dtu <dtu@chromium.org> | 2014-11-20 14:52:40 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-20 22:53:01 +0000 |
commit | 10e58e6dfbe4d9dae5841ceb9eb0180cce1aac14 (patch) | |
tree | 4cff90bc8b406655be738a8eab6616e6fc31987c /testing | |
parent | da4f987fa8be92ab3f355d37971df299fa8b837d (diff) | |
download | chromium_src-10e58e6dfbe4d9dae5841ceb9eb0180cce1aac14.zip chromium_src-10e58e6dfbe4d9dae5841ceb9eb0180cce1aac14.tar.gz chromium_src-10e58e6dfbe4d9dae5841ceb9eb0180cce1aac14.tar.bz2 |
Revert of Disable telemetry tests for Mac 10.9. (patchset #2 id:20001 of https://codereview.chromium.org/706703003/)
Reason for revert:
Second attempt to re-enable tests. I think there may still be one test failure, but we can disable that one test. If there's more than one, revert this.
Original issue's description:
> Disable telemetry tests for Mac 10.9.
>
> The telemetry tests are failing consistently on OSX 10.9.
>
> BUG=420615
> R=tonyg@chromium.org
>
> Committed: https://crrev.com/5503de1eeae0437c1f8160d69b04d6241bc5e974
> Cr-Commit-Position: refs/heads/master@{#303114}
TBR=phajdan.jr@chromium.org,tonyg@chromium.org,garykac@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=420615
Review URL: https://codereview.chromium.org/744283002
Cr-Commit-Position: refs/heads/master@{#305096}
Diffstat (limited to 'testing')
-rw-r--r-- | testing/buildbot/chromium.mac.json | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index cff26cd..0ea46e9 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -280,6 +280,14 @@ ], "scripts": [ { + "name": "telemetry_unittests", + "script": "telemetry_unittests.py" + }, + { + "name": "telemetry_perf_unittests", + "script": "telemetry_perf_unittests.py" + }, + { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -371,6 +379,14 @@ ], "scripts": [ { + "name": "telemetry_unittests", + "script": "telemetry_unittests.py" + }, + { + "name": "telemetry_perf_unittests", + "script": "telemetry_perf_unittests.py" + }, + { "name": "nacl_integration", "script": "nacl_integration.py" } |