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

Framework/Workload: Utilize package_names during package resolution

Browse Source 
Iterate through available package names when resolving an apk file from
the host.
This commit is contained in:
Marc Bonnici 2017-11-23 17:17:47 +00:00 committed by setrofim
parent ff529462e0
commit e9ae08e00b
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wa/framework/workload.py
View File

@ -562,13 +562,29 @@ class PackageHandler(object):
msg = 'Cannot Resolve package; No package name(s) specified' msg = 'Cannot Resolve package; No package name(s) specified'
raise WorkloadError(msg) raise WorkloadError(msg)
self.apk_file = context.resolver.get(ApkFile(self.owner, if self.package_name:
variant=self.variant, self.apk_file = context.resolver.get(ApkFile(self.owner,
version=self.version, variant=self.variant,
package=self.package_name, version=self.version,
exact_abi=self.exact_abi, package=self.package_name,
supported_abi=self.supported_abi), exact_abi=self.exact_abi,
strict=self.strict) supported_abi=self.supported_abi),
strict=self.strict)
else:
available_packages = []
for package in self.owner.package_names:
available_packages.append(context.resolver.get(ApkFile(self.owner,
variant=self.variant,
version=self.version,
package=package,
exact_abi=self.exact_abi,
supported_abi=self.supported_abi),
strict=self.strict))
if len(available_packages) == 1:
self.apk_file = available_packages[0]
elif len(available_packages) > 1:
msg = 'Multiple matching packages found for "{}" on host: {}'
raise WorkloadError(msg.format(self.owner, available_packages))
if self.apk_file: if self.apk_file:
self.apk_info = ApkInfo(self.apk_file) self.apk_info = ApkInfo(self.apk_file)
if self.version: if self.version: