sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-04-15 15:20:45 +01:00
Code Issues Releases Wiki Activity

android/workload: Move parameter from GameWorkload to ApkWorkload Class

Browse Source 
In addition to `GameWorkloads` some benchmarks also download additional
data upon initialisation. Moving this parameter to the `ApkWorkload`
parent class allows all APK based workloads to indicate that their data
should not be cleared prior to running the workload.
This commit is contained in:
Marc Bonnici 2018-02-06 15:23:25 +00:00 committed by setrofim
parent 9a9e8395cf
commit ba6889ea7f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wlauto/common/android/workload.py
View File

@ -195,6 +195,11 @@ class ApkWorkload(Workload):
If ``True``, workload will check that the APK matches the target If ``True``, workload will check that the APK matches the target
device ABI, otherwise any APK found will be used. device ABI, otherwise any APK found will be used.
'''), '''),
Parameter('clear_data_on_reset', kind=bool, default=True,
description="""
If set to ``False``, this will prevent WA from clearing package
data for this workload prior to running it.
"""),
] ]
def __init__(self, device, _call_super=True, **kwargs): def __init__(self, device, _call_super=True, **kwargs):
@ -404,7 +409,8 @@ class ApkWorkload(Workload):
def reset(self, context): # pylint: disable=W0613 def reset(self, context): # pylint: disable=W0613
self.device.execute('am force-stop {}'.format(self.package)) self.device.execute('am force-stop {}'.format(self.package))
self.device.execute('pm clear {}'.format(self.package)) if self.clear_data_on_reset:
self.device.execute('pm clear {}'.format(self.package))
# As of android API level 23, apps can request permissions at runtime, # As of android API level 23, apps can request permissions at runtime,
# this will grant all of them so requests do not pop up when running the app # this will grant all of them so requests do not pop up when running the app
@ -647,11 +653,6 @@ class GameWorkload(ApkWorkload, ReventWorkload):
after setup and run"""), after setup and run"""),
Parameter('assets_push_timeout', kind=int, default=500, Parameter('assets_push_timeout', kind=int, default=500,
description='Timeout used during deployment of the assets package (if there is one).'), description='Timeout used during deployment of the assets package (if there is one).'),
Parameter('clear_data_on_reset', kind=bool, default=True,
description="""
If set to ``False``, this will prevent WA from clearing package
data for this workload prior to running it.
"""),
] ]
def __init__(self, device, **kwargs): # pylint: disable=W0613 def __init__(self, device, **kwargs): # pylint: disable=W0613