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

All using idetifier version of non-identifier named instruments in configuration.

Browse Source 
E.g. refering to "trace-cmd" as "trace_cmd" in the instrumentation list.
This commit is contained in:
Sergei Trofimov 2015-04-20 09:18:49 +01:00
parent 7655007f8a
commit ff0d08cc8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wlauto/core/instrumentation.py
View File

@ -106,6 +106,7 @@ import wlauto.core.signal as signal
from wlauto.core.extension import Extension from wlauto.core.extension import Extension
from wlauto.exceptions import WAError, DeviceNotRespondingError, TimeoutError from wlauto.exceptions import WAError, DeviceNotRespondingError, TimeoutError
from wlauto.utils.misc import get_traceback, isiterable from wlauto.utils.misc import get_traceback, isiterable
from wlauto.utils.types import identifier
logger = logging.getLogger('instrumentation') logger = logging.getLogger('instrumentation')
@ -191,7 +192,7 @@ def is_installed(instrument):
if instrument in [i.__class__ for i in installed]: if instrument in [i.__class__ for i in installed]:
return True return True
else: # assume string else: # assume string
if instrument in [i.name for i in installed]: if identifier(instrument) in [identifier(i.name) for i in installed]:
return True return True
return False return False
@ -300,7 +301,7 @@ def get_instrument(inst):
if isinstance(inst, Instrument): if isinstance(inst, Instrument):
return inst return inst
for installed_inst in installed: for installed_inst in installed:
if installed_inst.name == inst: if identifier(installed_inst.name) == identifier(inst):
return installed_inst return installed_inst
raise ValueError('Instrument {} is not installed'.format(inst)) raise ValueError('Instrument {} is not installed'.format(inst))