sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-18 12:06:08 +00:00
Code Issues Releases Wiki Activity

workloads/geekbench: Clean up version handling

Browse Source 
The workload could attempt to use the version attribute before it was
discovered to assess the workload activity causing an error however the
whole process can be simplified using newer discovery features.
This commit is contained in:
Marc Bonnici 2019-05-13 16:50:37 +01:00 committed by setrofim
parent b4ea2798dd
commit 8cd9862e32
1 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wa/workloads/geekbench/__init__.py
View File

@ -51,34 +51,10 @@ class Geekbench(ApkUiautoWorkload):
http://support.primatelabs.com/kb/geekbench/interpreting-geekbench-scores
"""
summary_metrics = ['score', 'multicore_score']
versions = {
'4.3.1': {
'package': 'com.primatelabs.geekbench',
'activity': '.HomeActivity',
},
'4.2.0': {
'package': 'com.primatelabs.geekbench',
'activity': '.HomeActivity',
},
'4.0.1': {
'package': 'com.primatelabs.geekbench',
'activity': '.HomeActivity',
},
# Version 3.4.1 was the final version 3 variant
'3.4.1': {
'package': 'com.primatelabs.geekbench',
'activity': '.HomeActivity',
},
'3.0.0': {
'package': 'com.primatelabs.geekbench3',
'activity': '.HomeActivity',
},
'2': {
'package': 'ca.primatelabs.geekbench2',
'activity': '.HomeActivity',
},
}
supported_versions = sorted(versions.keys())
supported_versions = ['4.3.1', '4.2.0', '4.0.1', '3.4.1', '3.0.0', '2']
package_names = ['com.primatelabs.geekbench', 'com.primatelabs.geekbench3', 'ca.primatelabs.geekbench2']
begin_regex = re.compile(r'^\s*D/WebViewClassic.loadDataWithBaseURL\(\s*\d+\s*\)'
r'\s*:\s*(?P<content>\<.*)\s*$')
replace_regex = re.compile(r'<[^>]*>')
@ -106,14 +82,6 @@ class Geekbench(ApkUiautoWorkload):
requires_network = True
@property
def activity(self):
return self.versions[self.version]['activity']
@property
def package_names(self):
return set(self.versions[v]['package'] for v in self.versions)
def initialize(self, context):
super(Geekbench, self).initialize(context)
self.gui.uiauto_params['version'] = self.version