summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorUlan Degenbaev <ulan@chromium.org>2015-05-26 17:39:17 +0200
committerUlan Degenbaev <ulan@chromium.org>2015-05-26 15:40:50 +0000
commit7a5166fcbfe619b42630ed77df9f26229e67e6e9 (patch)
tree35bcf8f02478e00d8aa6a5e0cf1b916408e5f79c /tools/perf
parent02b510a52602399817087db14369dbcb2bf2fb05 (diff)
downloadchromium_src-7a5166fcbfe619b42630ed77df9f26229e67e6e9.zip
chromium_src-7a5166fcbfe619b42630ed77df9f26229e67e6e9.tar.gz
chromium_src-7a5166fcbfe619b42630ed77df9f26229e67e6e9.tar.bz2
Re-enable memory.idle_multi_tab without the failing gmail page.
All bots time out on gmail page, which seems to be exposing a bug in chrome or wpr. BUG=490841 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 R=eakuefner@chromium.org, sullivan@chromium.org Review URL: https://codereview.chromium.org/1158433002 Cr-Commit-Position: refs/heads/master@{#331364}
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/benchmarks/memory.py1
-rw-r--r--tools/perf/page_sets/idle_multi_tab_cases.py1
2 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/benchmarks/memory.py b/tools/perf/benchmarks/memory.py
index a7388af..2128282 100644
--- a/tools/perf/benchmarks/memory.py
+++ b/tools/perf/benchmarks/memory.py
@@ -46,7 +46,6 @@ class MemoryTop7StressWithSlimmingPaint(perf_benchmark.PerfBenchmark):
# @benchmark.Enabled('has tabs')
# @benchmark.Disabled('android') # Benchmark uses > 700MB of memory.
-@benchmark.Disabled # crbug.com/490841
class MemoryIdleMultiTab(perf_benchmark.PerfBenchmark):
"""Use (recorded) real world web sites and measure memory consumption
with many tabs and idle times. """
diff --git a/tools/perf/page_sets/idle_multi_tab_cases.py b/tools/perf/page_sets/idle_multi_tab_cases.py
index a8e8c90..b2704cd 100644
--- a/tools/perf/page_sets/idle_multi_tab_cases.py
+++ b/tools/perf/page_sets/idle_multi_tab_cases.py
@@ -60,7 +60,6 @@ class IdleMultiTabCasesPageSet(page_set_module.PageSet):
base_js = f.read()
pages = [
top_pages.GoogleDocPage,
- top_7_stress.GmailPage,
top_7_stress.GooglePlusPage,
]
for page in pages: