summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorsimonhatch <simonhatch@chromium.org>2015-05-15 06:39:20 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-15 13:39:25 +0000
commitc67128f7fb96c1e40bfb46a9ba7a1466a754f357 (patch)
tree9c53362292a75a513df72fc3736c477956567ab7 /tools
parent2e2d7141b8f141bfb194427afde9fb2bf1ed5486 (diff)
downloadchromium_src-c67128f7fb96c1e40bfb46a9ba7a1466a754f357.zip
chromium_src-c67128f7fb96c1e40bfb46a9ba7a1466a754f357.tar.gz
chromium_src-c67128f7fb96c1e40bfb46a9ba7a1466a754f357.tar.bz2
Revert of Disable blink_perf.canvas on linux. (patchset #1 id:1 of https://codereview.chromium.org/1129383007/)
Reason for revert: Possible fix has landed, reverting to see if bot goes green. Original issue's description: > Disable blink_perf.canvas on linux. > > This has been red going on a week now. > > BUG=488059 > CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:mac_perf_bisect;tryserver.chromium.perf:win_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect > > Committed: https://crrev.com/2e2d7141b8f141bfb194427afde9fb2bf1ed5486 > Cr-Commit-Position: refs/heads/master@{#330085} TBR=sullivan@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=488059 Review URL: https://codereview.chromium.org/1142643002 Cr-Commit-Position: refs/heads/master@{#330086}
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/benchmarks/blink_perf.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
index 6d4b48c..8720aa7 100644
--- a/tools/perf/benchmarks/blink_perf.py
+++ b/tools/perf/benchmarks/blink_perf.py
@@ -167,8 +167,7 @@ class BlinkPerfCSS(benchmark.Benchmark):
return CreatePageSetFromPath(path, SKIPPED_FILE)
-@benchmark.Disabled('win', # crbug.com/455796
- 'linux') # crbug.com/488059
+@benchmark.Disabled('win') # crbug.com/455796
class BlinkPerfCanvas(benchmark.Benchmark):
tag = 'canvas'
test = _BlinkPerfMeasurement