From ff0d08cc8ea2e374d6a4fe54bc7e49081815a326 Mon Sep 17 00:00:00 2001
From: Sergei Trofimov <sergei.trofimov@arm.com>
Date: Mon, 20 Apr 2015 09:18:49 +0100
Subject: [PATCH] All using idetifier version of non-identifier named
 instruments in configuration.

E.g. refering to "trace-cmd" as "trace_cmd" in the instrumentation list.
---
 wlauto/core/instrumentation.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wlauto/core/instrumentation.py b/wlauto/core/instrumentation.py
index 8286e608..ad33ab7c 100644
--- a/wlauto/core/instrumentation.py
+++ b/wlauto/core/instrumentation.py
@@ -106,6 +106,7 @@ import wlauto.core.signal as signal
 from wlauto.core.extension import Extension
 from wlauto.exceptions import WAError, DeviceNotRespondingError, TimeoutError
 from wlauto.utils.misc import get_traceback, isiterable
+from wlauto.utils.types import identifier
 
 
 logger = logging.getLogger('instrumentation')
@@ -191,7 +192,7 @@ def is_installed(instrument):
         if instrument in [i.__class__ for i in installed]:
             return True
     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 False
 
@@ -300,7 +301,7 @@ def get_instrument(inst):
     if isinstance(inst, Instrument):
         return inst
     for installed_inst in installed:
-        if installed_inst.name == inst:
+        if identifier(installed_inst.name) == identifier(inst):
             return installed_inst
     raise ValueError('Instrument {} is not installed'.format(inst))