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

fw/target: account for platform_target_defaults

Browse Source 
When iterating over PLATFORMS tuples, account for the
platform_target_defaults introduced by 7470fb5ee.

Also, correct the tuple description in the comments.
This commit is contained in:
Sergei Trofimov 2018-06-19 10:01:39 +01:00 committed by Marc Bonnici
parent 578d2d3a16
commit 9f06950fb1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wa/framework/target/descriptor.py
View File

@ -416,7 +416,7 @@ ASSISTANTS = {
'chromeos': ChromeOsAssistant 'chromeos': ChromeOsAssistant
} }
# name --> (((platform_class, conn_class), params_list, defaults), target_defaults) # name --> ((platform_class, conn_class), params_list, defaults, target_defaults)
# Note: normally, connection is defined by the Target name, but # Note: normally, connection is defined by the Target name, but
# platforms may choose to override it # platforms may choose to override it
# Note: the target_defaults allows you to override common target_params for a # Note: the target_defaults allows you to override common target_params for a
@ -556,7 +556,7 @@ def add_description_for_target(target, description=None, **kwargs):
if 'platform' not in kwargs: if 'platform' not in kwargs:
kwargs['platform'] = Platform kwargs['platform'] = Platform
if 'platform_params' not in kwargs: if 'platform_params' not in kwargs:
for (plat, conn), params, _ in PLATFORMS.values(): for (plat, conn), params, _, _ in PLATFORMS.values():
if plat == kwargs['platform']: if plat == kwargs['platform']:
kwargs['platform_params'] = params kwargs['platform_params'] = params
if conn is not None and kwargs['conn'] is None: if conn is not None and kwargs['conn'] is None: