diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 23 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/__init__.py | 3 |
2 files changed, 22 insertions, 4 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index dee38ec1d6..757f9d3d50 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -8,18 +8,33 @@ import os import shutil import subprocess import bb - +import traceback from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner def get_target_controller(d): - if d.getVar("TEST_TARGET", True) == "qemu": + testtarget = d.getVar("TEST_TARGET", True) + # old, simple names + if testtarget == "qemu": return QemuTarget(d) - elif d.getVar("TEST_TARGET", True) == "simpleremote": + elif testtarget == "simpleremote": return SimpleRemoteTarget(d) else: - bb.fatal("Please set a valid TEST_TARGET") + # use the class name + try: + # is it a core class defined here? + controller = getattr(__name__, testtarget) + except AttributeError: + # nope, perhaps a layer defined one + try: + module = __import__("oeqa.utils.controllers", globals(), locals(), [testtarget]) + controller = getattr(module, testtarget) + except ImportError as e: + bb.fatal("Failed to import oeqa.utils.controllers:\n%s" % traceback.format_exc()) + except AttributeError: + bb.fatal("\"%s\" is not a valid value for TEST_TARGET" % testtarget) + return controller(d) class BaseTarget(object): diff --git a/meta/lib/oeqa/utils/__init__.py b/meta/lib/oeqa/utils/__init__.py index e69de29bb2..8eda92763c 100644 --- a/meta/lib/oeqa/utils/__init__.py +++ b/meta/lib/oeqa/utils/__init__.py @@ -0,0 +1,3 @@ +# Enable other layers to have modules in the same named directory +from pkgutil import extend_path +__path__ = extend_path(__path__, __name__) |