summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <limon.anibal@gmail.com>2016-02-21 13:01:03 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:06 +0000
commit738bd1a6407d87573edcc61c1eb2d276fbffd0f3 (patch)
tree4384c1d00c29a3433d25febd92f28c300b776604
parent2a410b225ab90d3655a4fd637ae77965c4c9fbfb (diff)
downloadpoky-738bd1a6407d87573edcc61c1eb2d276fbffd0f3.tar.gz
classes/testsdk: Pass tcname to SDK and SDKExt contexts
tcname is needed for eSDK update testcase will be used for publish it and then try to update (From OE-Core rev: a75944a63482597be88ff0f3ce55025647b78e2c) Signed-off-by: Aníbal Limón <limon.anibal@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/testsdk.bbclass2
-rw-r--r--meta/lib/oeqa/oetest.py7
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 157077e18e..f4dc2c36dc 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -22,7 +22,7 @@ def run_test_context(CTestContext, d, testdir, tcname, pn, *args):
22 targets = glob.glob(d.expand(testdir + "/tc/environment-setup-*")) 22 targets = glob.glob(d.expand(testdir + "/tc/environment-setup-*"))
23 for sdkenv in targets: 23 for sdkenv in targets:
24 bb.plain("Testing %s" % sdkenv) 24 bb.plain("Testing %s" % sdkenv)
25 tc = CTestContext(d, testdir, sdkenv, args) 25 tc = CTestContext(d, testdir, sdkenv, tcname, args)
26 26
27 # this is a dummy load of tests 27 # this is a dummy load of tests
28 # we are doing that to find compile errors in the tests themselves 28 # we are doing that to find compile errors in the tests themselves
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py
index 3809ed722b..fc1e8b514d 100644
--- a/meta/lib/oeqa/oetest.py
+++ b/meta/lib/oeqa/oetest.py
@@ -386,11 +386,12 @@ class ImageTestContext(TestContext):
386 setattr(oeRuntimeTest, "pscmd", "ps -ef" if oeTest.hasPackage("procps") else "ps") 386 setattr(oeRuntimeTest, "pscmd", "ps -ef" if oeTest.hasPackage("procps") else "ps")
387 387
388class SDKTestContext(TestContext): 388class SDKTestContext(TestContext):
389 def __init__(self, d, sdktestdir, sdkenv, *args): 389 def __init__(self, d, sdktestdir, sdkenv, tcname, *args):
390 super(SDKTestContext, self).__init__(d) 390 super(SDKTestContext, self).__init__(d)
391 391
392 self.sdktestdir = sdktestdir 392 self.sdktestdir = sdktestdir
393 self.sdkenv = sdkenv 393 self.sdkenv = sdkenv
394 self.tcname = tcname
394 395
395 if not hasattr(self, 'target_manifest'): 396 if not hasattr(self, 'target_manifest'):
396 self.target_manifest = d.getVar("SDK_TARGET_MANIFEST", True) 397 self.target_manifest = d.getVar("SDK_TARGET_MANIFEST", True)
@@ -419,7 +420,7 @@ class SDKTestContext(TestContext):
419 "auto").split() if t != "auto"] 420 "auto").split() if t != "auto"]
420 421
421class SDKExtTestContext(SDKTestContext): 422class SDKExtTestContext(SDKTestContext):
422 def __init__(self, d, sdktestdir, sdkenv, *args): 423 def __init__(self, d, sdktestdir, sdkenv, tcname, *args):
423 self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True) 424 self.target_manifest = d.getVar("SDK_EXT_TARGET_MANIFEST", True)
424 self.host_manifest = d.getVar("SDK_EXT_HOST_MANIFEST", True) 425 self.host_manifest = d.getVar("SDK_EXT_HOST_MANIFEST", True)
425 if args: 426 if args:
@@ -427,7 +428,7 @@ class SDKExtTestContext(SDKTestContext):
427 else: 428 else:
428 self.cm = False 429 self.cm = False
429 430
430 super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv) 431 super(SDKExtTestContext, self).__init__(d, sdktestdir, sdkenv, tcname)
431 432
432 self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath( 433 self.sdkextfilesdir = os.path.join(os.path.dirname(os.path.abspath(
433 oeqa.sdkext.__file__)), "files") 434 oeqa.sdkext.__file__)), "files")