diff options
| author | ulan <ulan@chromium.org> | 2015-05-27 03:53:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-27 10:54:05 +0000 |
| commit | fd38bff197b5cfc22118c8c58432d14f6c2b9e2d (patch) | |
| tree | 5c76d6e1aca66a312239e882a0248fa2fbc78bdf | |
| parent | e9ac1f30fcc32ba7334d089fdd4b9be0d745d2d5 (diff) | |
| download | chromium_src-fd38bff197b5cfc22118c8c58432d14f6c2b9e2d.zip chromium_src-fd38bff197b5cfc22118c8c58432d14f6c2b9e2d.tar.gz chromium_src-fd38bff197b5cfc22118c8c58432d14f6c2b9e2d.tar.bz2 | |
Reland "Re-enable memory.idle_multi_tab without the failing gmail page."
TBR=eakuefner@chromium.org
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
Review URL: https://codereview.chromium.org/1157233002
Cr-Commit-Position: refs/heads/master@{#331555}
| -rw-r--r-- | tools/perf/benchmarks/memory.py | 5 | ||||
| -rw-r--r-- | tools/perf/page_sets/idle_multi_tab_cases.py | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/benchmarks/memory.py b/tools/perf/benchmarks/memory.py index a7388af..c1897e1 100644 --- a/tools/perf/benchmarks/memory.py +++ b/tools/perf/benchmarks/memory.py @@ -44,9 +44,8 @@ class MemoryTop7StressWithSlimmingPaint(perf_benchmark.PerfBenchmark): return 'memory.top_7_stress_slimming_paint' -# @benchmark.Enabled('has tabs') -# @benchmark.Disabled('android') # Benchmark uses > 700MB of memory. -@benchmark.Disabled # crbug.com/490841 +@benchmark.Enabled('has tabs') +@benchmark.Disabled('android') # Benchmark uses > 700MB of memory. 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: |