summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/targetcontrol.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/targetcontrol.py')
-rw-r--r--meta/lib/oeqa/targetcontrol.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 757f9d3d50..ba5e6e5dc1 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -11,7 +11,7 @@ import bb
11import traceback 11import traceback
12from oeqa.utils.sshcontrol import SSHControl 12from oeqa.utils.sshcontrol import SSHControl
13from oeqa.utils.qemurunner import QemuRunner 13from oeqa.utils.qemurunner import QemuRunner
14 14from oeqa.controllers.testtargetloader import TestTargetLoader
15 15
16def get_target_controller(d): 16def get_target_controller(d):
17 testtarget = d.getVar("TEST_TARGET", True) 17 testtarget = d.getVar("TEST_TARGET", True)
@@ -28,12 +28,13 @@ def get_target_controller(d):
28 except AttributeError: 28 except AttributeError:
29 # nope, perhaps a layer defined one 29 # nope, perhaps a layer defined one
30 try: 30 try:
31 module = __import__("oeqa.utils.controllers", globals(), locals(), [testtarget]) 31 bbpath = d.getVar("BBPATH", True).split(':')
32 controller = getattr(module, testtarget) 32 testtargetloader = TestTargetLoader()
33 controller = testtargetloader.get_controller_module(testtarget, bbpath)
33 except ImportError as e: 34 except ImportError as e:
34 bb.fatal("Failed to import oeqa.utils.controllers:\n%s" % traceback.format_exc()) 35 bb.fatal("Failed to import {0} from available controller modules:\n{1}".format(testtarget,traceback.format_exc()))
35 except AttributeError: 36 except AttributeError as e:
36 bb.fatal("\"%s\" is not a valid value for TEST_TARGET" % testtarget) 37 bb.fatal("Invalid TEST_TARGET - " + str(e))
37 return controller(d) 38 return controller(d)
38 39
39 40