summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-02-02 17:08:56 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-10 16:06:23 +0000
commita619ea293acfdf5700030c27056312bc4b898e97 (patch)
treedfb0ca1ff709b03066d068661ccfbd88b68bd5b2 /meta/lib
parent062dbd6da768c5613e428ada86342c7be4377a1b (diff)
downloadpoky-a619ea293acfdf5700030c27056312bc4b898e97.tar.gz
oeqa/oetest: Fix compatibility SDK tests using eSDK.
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 <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/oetest.py13
1 files changed, 10 insertions, 3 deletions
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):
376 setattr(oeRuntimeTest, "pscmd", "ps -ef" if oeTest.hasPackage("procps") else "ps") 376 setattr(oeRuntimeTest, "pscmd", "ps -ef" if oeTest.hasPackage("procps") else "ps")
377 377
378class SDKTestContext(TestContext): 378class SDKTestContext(TestContext):
379 def __init__(self, d, sdktestdir, sdkenv): 379 def __init__(self, d, sdktestdir, sdkenv, *args):
380 super(SDKTestContext, self).__init__(d) 380 super(SDKTestContext, self).__init__(d)
381 381
382 self.sdktestdir = sdktestdir 382 self.sdktestdir = sdktestdir
@@ -409,9 +409,13 @@ class SDKTestContext(TestContext):
409 "auto").split() if t != "auto"] 409 "auto").split() if t != "auto"]
410 410
411class SDKExtTestContext(SDKTestContext): 411class SDKExtTestContext(SDKTestContext):
412 def __init__(self, d, sdktestdir, sdkenv): 412 def __init__(self, d, sdktestdir, sdkenv, *args):
413 self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True) 413 self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True)
414 self.host_manifest = d.getVar("SDK_EXT_HOST_MANIFEST", True) 414 self.host_manifest = d.getVar("SDK_EXT_HOST_MANIFEST", True)
415 if args:
416 self.cm = args[0] # Compatibility mode for run SDK tests
417 else:
418 self.cm = False
415 419
416 super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv) 420 super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv)
417 421
@@ -419,7 +423,10 @@ class SDKExtTestContext(SDKTestContext):
419 oeqa.sdkext.__file__)), "files") 423 oeqa.sdkext.__file__)), "files")
420 424
421 def _get_test_namespace(self): 425 def _get_test_namespace(self):
422 return "sdkext" 426 if self.cm:
427 return "sdk"
428 else:
429 return "sdkext"
423 430
424 def _get_test_suites(self): 431 def _get_test_suites(self):
425 return (self.d.getVar("TEST_SUITES_SDK_EXT", True) or "auto").split() 432 return (self.d.getVar("TEST_SUITES_SDK_EXT", True) or "auto").split()