mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
lib/oeqa: allow multiple layers to provide their own TEST_TARGET class
Use a python module "folder" rather than a single module within layers to ensure multiple layers can define a TEST_TARGET class. Current implementation using controllers.py module will only allow a single layer to define test targets. Add a controllers folder as well as a TestTargetLoader class whose job is to load the given TEST_TARGET class from any number of python modules within the oeqa/controllers/ directory of any layer. The only condition will be that layers will need to ensure the TEST_TARGET class name they provide is unique otherwise there is no guarantee which class is instantiated. a bb.warn is used to alude to this if it happens. (From OE-Core rev: 3f25705f4a986e06cbd397aaea52b841c1a1e054) Signed-off-by: Sipke Vriend <sipke.vriend@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
6e59874e88
commit
c99622e38b
@@ -11,7 +11,7 @@ import bb
|
||||
import traceback
|
||||
from oeqa.utils.sshcontrol import SSHControl
|
||||
from oeqa.utils.qemurunner import QemuRunner
|
||||
|
||||
from oeqa.controllers.testtargetloader import TestTargetLoader
|
||||
|
||||
def get_target_controller(d):
|
||||
testtarget = d.getVar("TEST_TARGET", True)
|
||||
@@ -28,12 +28,13 @@ def get_target_controller(d):
|
||||
except AttributeError:
|
||||
# nope, perhaps a layer defined one
|
||||
try:
|
||||
module = __import__("oeqa.utils.controllers", globals(), locals(), [testtarget])
|
||||
controller = getattr(module, testtarget)
|
||||
bbpath = d.getVar("BBPATH", True).split(':')
|
||||
testtargetloader = TestTargetLoader()
|
||||
controller = testtargetloader.get_controller_module(testtarget, bbpath)
|
||||
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)
|
||||
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)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user