From a619ea293acfdf5700030c27056312bc4b898e97 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Tue, 2 Feb 2016 17:08:56 -0600 Subject: oeqa/oetest: Fix compatibility SDK tests using eSDK. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When run SDK tests over eSDK we need to use SDKExtTestContext instead of SDKTestContext because if we use SDKTestContext search for SDK manifest and depends on the SDK manifest generation so populate_sdk needs to be executed. Adds a compatibility mode flag to SDKExtTestContext for search tests over sdk module instead of sdkext module and change testsdk calls to comply with this new param. (From OE-Core rev: ebe743235b383b17225553d84bf8e6f80d364dcd) Signed-off-by: Aníbal Limón Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/oetest.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'meta/lib/oeqa/oetest.py') diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py index 80b40b6fa9..3e2ea0f874 100644 --- a/meta/lib/oeqa/oetest.py +++ b/meta/lib/oeqa/oetest.py @@ -376,7 +376,7 @@ class ImageTestContext(TestContext): setattr(oeRuntimeTest, "pscmd", "ps -ef" if oeTest.hasPackage("procps") else "ps") class SDKTestContext(TestContext): - def __init__(self, d, sdktestdir, sdkenv): + def __init__(self, d, sdktestdir, sdkenv, *args): super(SDKTestContext, self).__init__(d) self.sdktestdir = sdktestdir @@ -409,9 +409,13 @@ class SDKTestContext(TestContext): "auto").split() if t != "auto"] class SDKExtTestContext(SDKTestContext): - def __init__(self, d, sdktestdir, sdkenv): + def __init__(self, d, sdktestdir, sdkenv, *args): self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True) self.host_manifest = d.getVar("SDK_EXT_HOST_MANIFEST", True) + if args: + self.cm = args[0] # Compatibility mode for run SDK tests + else: + self.cm = False super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv) @@ -419,7 +423,10 @@ class SDKExtTestContext(SDKTestContext): oeqa.sdkext.__file__)), "files") def _get_test_namespace(self): - return "sdkext" + if self.cm: + return "sdk" + else: + return "sdkext" def _get_test_suites(self): return (self.d.getVar("TEST_SUITES_SDK_EXT", True) or "auto").split() -- cgit v1.2.3-54-g00ecf