Chromium Code Reviews| Index: tools/perf/benchmarks/system_health.py |
| diff --git a/tools/perf/benchmarks/system_health.py b/tools/perf/benchmarks/system_health.py |
| index 598ff82909401a4a9cc4b2a624cb84567c069a48..6bcba746fa1cedfcd68c9ffb704df17d5019996f 100644 |
| --- a/tools/perf/benchmarks/system_health.py |
| +++ b/tools/perf/benchmarks/system_health.py |
| @@ -30,7 +30,6 @@ class _SystemHealthBenchmark(perf_benchmark.PerfBenchmark): |
| return browser.platform.GetDeviceTypeName() == galaxy_s5_type_name |
| -@benchmark.Disabled('all') # crbug.com/613050 |
| class SystemHealthTop25(_SystemHealthBenchmark): |
| page_set = page_sets.Top25PageSet |
| @@ -38,8 +37,8 @@ class SystemHealthTop25(_SystemHealthBenchmark): |
| def Name(cls): |
| return 'system_health.top25' |
| -@benchmark.Disabled('android') # crbug.com/601953 |
| -@benchmark.Disabled('all') # crbug.com/613050 |
| +# crbug.com/601953 |
| +@benchmark.Disabled('android') |
|
charliea (OOO until 10-5)
2016/05/27 23:27:26
Huh? Is this a diffbase problem? Seems like we def
alexandermont
2016/05/31 17:21:44
I think this is correct. I didn't intend to change
|
| class SystemHealthKeyMobileSites(_SystemHealthBenchmark): |
| page_set = page_sets.KeyMobileSitesPageSet |
| @@ -73,8 +72,25 @@ class _MemorySystemHealthBenchmark(perf_benchmark.PerfBenchmark): |
| def Name(cls): |
| return 'system_health.memory_%s' % cls.page_set.PLATFORM |
| -# https://github.com/catapult-project/catapult/issues/2340 |
| -@benchmark.Disabled('all') |
| +class WebviewStartupSystemHealthBenchmark(_SystemHealthBenchmark): |
|
charliea (OOO until 10-5)
2016/05/27 23:27:26
nednguyen@chromium.org, do we want @benchmark.Disa
|
| + """Chrome Webview Startup System Health Benchmark. |
|
charliea (OOO until 10-5)
2016/05/27 23:27:26
nit: might want to making this "Chrome WebView Sta
alexandermont
2016/05/31 17:21:44
Done
|
| + """ |
|
charliea (OOO until 10-5)
2016/05/27 23:27:26
nit: can we put the ending """ on the same line as
alexandermont
2016/05/31 17:21:44
Done
|
| + page_set = page_sets.BlankPageSet |
| + def CreateTimelineBasedMeasurementOptions(self): |
| + options = timeline_based_measurement.Options( |
| + tracing_category_filter.TracingCategoryFilter( |
| + '-*,disabled-by-default-memory-infra')) |
|
charliea (OOO until 10-5)
2016/05/27 23:27:26
Not sure exactly how this tracing category filter
alexandermont
2016/05/31 17:21:44
Removed
perezju
2016/06/07 08:39:17
The -* is used on memory infra benchmarks to disab
|
| + options.SetTimelineBasedMetric('WebviewStartupMetric') |
|
charliea (OOO until 10-5)
2016/05/27 23:27:26
note: based on suggestion in other CL, this should
alexandermont
2016/05/31 17:21:44
Done
|
| + options.config.enable_atrace_trace = True |
| + options.config.enable_chrome_trace = False |
| + options.config.app_name = 'org.chromium.webview_shell' |
| + return options |
| + |
| + @classmethod |
| + def Name(cls): |
|
charliea (OOO until 10-5)
2016/05/27 23:27:26
not sure about the python style here, but same not
alexandermont
2016/05/31 17:21:45
I can't find anything specific about this in the G
|
| + return 'system_health.webview_startup' |
| + |
| + |
| class DesktopMemorySystemHealth(_MemorySystemHealthBenchmark): |
| """Desktop Chrome Memory System Health Benchmark.""" |
| page_set = page_sets.DesktopMemorySystemHealthStorySet |
| @@ -83,8 +99,7 @@ class DesktopMemorySystemHealth(_MemorySystemHealthBenchmark): |
| def ShouldDisable(cls, possible_browser): |
| return possible_browser.platform.GetDeviceTypeName() != 'Desktop' |
| -# https://github.com/catapult-project/catapult/issues/2340 |
| -@benchmark.Disabled('all') |
| + |
|
charliea (OOO until 10-5)
2016/05/27 23:27:26
Also doubt that we want to alter this
alexandermont
2016/05/31 17:21:44
Changed back
|
| class MobileMemorySystemHealth(_MemorySystemHealthBenchmark): |
| """Mobile Chrome Memory System Health Benchmark.""" |
| page_set = page_sets.MobileMemorySystemHealthStorySet |