From a71e71f9c4d8c64fb27a03b5a048710c8aee01c1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 8 Nov 2017 14:14:24 +0000 Subject: oeqa/targetcontrol: Drop unused get_target_controller function This funciton appears completely unused, drop it. (From OE-Core rev: 31ccc70c4ea58e3781ea14eb534e00e9e06e131a) (From OE-Core rev: 31b8991de32ce91af58eab183f283adcded737c2) Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/lib/oeqa/targetcontrol.py | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 3255e3a5c6..e17c89552f 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -20,31 +20,6 @@ from abc import ABCMeta, abstractmethod logger = logging.getLogger('BitBake.QemuRunner') -def get_target_controller(d): - testtarget = d.getVar("TEST_TARGET") - # old, simple names - if testtarget == "qemu": - return QemuTarget(d) - elif testtarget == "simpleremote": - return SimpleRemoteTarget(d) - else: - # use the class name - try: - # is it a core class defined here? - controller = getattr(sys.modules[__name__], testtarget) - except AttributeError: - # nope, perhaps a layer defined one - try: - bbpath = d.getVar("BBPATH").split(':') - testtargetloader = TestTargetLoader() - controller = testtargetloader.get_controller_module(testtarget, bbpath) - except ImportError as e: - bb.fatal("Failed to import {0} from available controller modules:\n{1}".format(testtarget,traceback.format_exc())) - except AttributeError as e: - bb.fatal("Invalid TEST_TARGET - " + str(e)) - return controller(d) - - class BaseTarget(object, metaclass=ABCMeta): supported_image_fstypes = [] @@ -115,9 +90,9 @@ class QemuTarget(BaseTarget): supported_image_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] - def __init__(self, d, image_fstype=None): + def __init__(self, d, image_fstype=None, logger=None): - super(QemuTarget, self).__init__(d) + super(QemuTarget, self).__init__(d, logger) self.rootfs = '' self.kernel = '' -- cgit v1.2.3-54-g00ecf