summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authornednguyen <nednguyen@google.com>2016-03-25 22:39:21 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-26 05:40:30 +0000
commit4cd3a57d676a70d046b3d190a701ecb6db74a112 (patch)
tree64aec20332de1501dfb15eaeaf36b10a56c6966f /tools
parentae05a6440b23ccee0cda6888a20e98d2d9a488a2 (diff)
downloadchromium_src-4cd3a57d676a70d046b3d190a701ecb6db74a112.zip
chromium_src-4cd3a57d676a70d046b3d190a701ecb6db74a112.tar.gz
chromium_src-4cd3a57d676a70d046b3d190a701ecb6db74a112.tar.bz2
Revert of Disable 2 rasterize_and_record_micro benchmarks on Linux (patchset #1 id:1 of https://codereview.chromium.org/1831023002/ )
Reason for revert: See if the revert in https://codereview.chromium.org/1839533002/ fix the crash. Original issue's description: > Disable 2 rasterize_and_record_micro benchmarks on Linux > > BUG=597391 > CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:winx64_10_perf_cq;tryserver.chromium.perf:mac_retina_perf_cq;tryserver.chromium.perf:linux_perf_cq > TBR=nednguyen@google.com > > Committed: https://crrev.com/1b9ba3a73f704481805e775df401a5bfd21ee3a9 > Cr-Commit-Position: refs/heads/master@{#383130} TBR=zhenw@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=597391 Review URL: https://codereview.chromium.org/1834043003 Cr-Commit-Position: refs/heads/master@{#383447}
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/benchmarks/rasterize_and_record_micro.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/benchmarks/rasterize_and_record_micro.py b/tools/perf/benchmarks/rasterize_and_record_micro.py
index 6e33973..f2260d5 100644
--- a/tools/perf/benchmarks/rasterize_and_record_micro.py
+++ b/tools/perf/benchmarks/rasterize_and_record_micro.py
@@ -46,8 +46,7 @@ class _RasterizeAndRecordMicro(perf_benchmark.PerfBenchmark):
# RasterizeAndRecord disabled on mac because of crbug.com/350684.
# RasterizeAndRecord disabled on windows because of crbug.com/338057.
-@benchmark.Disabled('mac', 'win',
- 'linux') # http://crbug.com/597391
+@benchmark.Disabled('mac', 'win')
class RasterizeAndRecordMicroTop25(_RasterizeAndRecordMicro):
"""Measures rasterize and record performance on the top 25 web pages.
@@ -60,8 +59,7 @@ class RasterizeAndRecordMicroTop25(_RasterizeAndRecordMicro):
@benchmark.Disabled('mac', 'win',
- 'android', # http://crbug.com/531597
- 'linux') # http://crbug.com/597391
+ 'android') # http://crbug.com/531597
class RasterizeAndRecordMicroKeyMobileSites(_RasterizeAndRecordMicro):
"""Measures rasterize and record performance on the key mobile sites.