diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-09 01:39:44 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-09 01:39:44 +0000 |
| commit | c21dedd60db23f9fd0d2d630dae31969852cebf9 (patch) | |
| tree | 2d695ac53a6852d1ef151cb15e67aa7197b407df /tools | |
| parent | 74baa9399a38b212f7546bae88109ab268b5f905 (diff) | |
| download | chromium_src-c21dedd60db23f9fd0d2d630dae31969852cebf9.zip chromium_src-c21dedd60db23f9fd0d2d630dae31969852cebf9.tar.gz chromium_src-c21dedd60db23f9fd0d2d630dae31969852cebf9.tar.bz2 | |
[Telemetry] Fix Octane on non-rooted devices.
This condition was added to prevent the zlib benchmark from OOMing on the
Galaxy Nexus device. Now, it's no longer on the waterfall, so I'm just
removing the check.
This has the desired side-effect that we'll try to run this benchmark on any
device, even if we can't determine the physical memory.
BUG=391079
Review URL: https://codereview.chromium.org/450873002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/benchmarks/octane.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/benchmarks/octane.py b/tools/perf/benchmarks/octane.py index 16b0bf3..eba74f1 100644 --- a/tools/perf/benchmarks/octane.py +++ b/tools/perf/benchmarks/octane.py @@ -76,7 +76,9 @@ class _OctaneMeasurement(page_measurement.PageMeasurement): self._power_metric = power.PowerMetric(browser) def WillNavigateToPage(self, page, tab): - if tab.browser.memory_stats['SystemTotalPhysicalMemory'] < 1 * _GB: + memory_stats = tab.browser.memory_stats + if ('SystemTotalPhysicalMemory' in memory_stats and + memory_stats['SystemTotalPhysicalMemory'] < 1 * _GB): skipBenchmarks = '"zlib"' else: skipBenchmarks = '' |