sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-24 22:22:38 +01:00
Code Issues Releases Wiki Activity

wa/apk_workloads: Update to not specify a default apk version.

Browse Source 
No longer specify a default version to allow any available apks to be
detected and then choose the appropriate automation based on the
detected version.
Refactor to support new supported_versions attribute and since APK
resolution needs to have happened before setting uiauto parameter
move assignments to ``initialize``.
This commit is contained in:
Marc Bonnici
2019-01-07 11:19:03 +00:00
committed by setrofim
parent a1cecc0002
commit 6ab1ae74a6
4 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wa/workloads/vellamo/__init__.py
View File

@@ -48,11 +48,11 @@ class Vellamo(ApkUiautoWorkload):
'3.0': ['Browser', 'Metal', 'Multi'],
'3.2.4': ['Browser', 'Metal', 'Multi'],
}
valid_versions = list(benchmark_types.keys())
supported_versions = list(benchmark_types.keys())
summary_metrics = None
parameters = [
Parameter('version', kind=str, allowed_values=valid_versions, default=sorted(benchmark_types, reverse=True)[0], override=True,
Parameter('version', kind=str, allowed_values=supported_versions, override=True,
description=('Specify the version of Vellamo to be run. '
'If not specified, the latest available version will be used.')),
Parameter('benchmarks', kind=list_of_strs, allowed_values=benchmark_types['3.0'], default=benchmark_types['3.0'],
@@ -66,15 +66,15 @@ class Vellamo(ApkUiautoWorkload):
]
def setup(self, context):
super(Vellamo, self).setup(context)
self.gui.uiauto_params['version'] = self.version
self.gui.uiauto_params['browserToUse'] = self.browser
self.gui.uiauto_params['metal'] = 'Metal' in self.benchmarks
self.gui.uiauto_params['browser'] = 'Browser' in self.benchmarks
self.gui.uiauto_params['multicore'] = 'Multi' in self.benchmarks
super(Vellamo, self).setup(context)
def validate(self):
super(Vellamo, self).validate()
def initialize(self, context):
super(Vellamo, self).initialize(context)
if self.version == '2.0.3' or not self.benchmarks: # pylint: disable=access-member-before-definition
self.benchmarks = self.benchmark_types[self.version] # pylint: disable=attribute-defined-outside-init
else: