summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-28 11:49:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-29 10:58:54 +0100
commit0007b5c5967536131246970e7d55602e52a87e95 (patch)
tree57c9c5e2d1ee25b351ae1adfd10c035967c40bf4 /meta/classes
parent515a8b790e08a48aaf64a6b7237e2b39390e35f6 (diff)
downloadpoky-0007b5c5967536131246970e7d55602e52a87e95.tar.gz
testimage: Fix sdk test manifest handling
Fix SDK_MANIFEST -> SDK_TARGET_MANIFEST and add support for host version too which is useful in SDK QA tests. (From OE-Core rev: df91dd8d064dc3e59c7f057d3f869500a233a76f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/testimage.bbclass8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index dc163c7313..1557675eec 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -287,12 +287,18 @@ def testsdk_main(d):
287 self.sdkenv = sdkenv 287 self.sdkenv = sdkenv
288 self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split() 288 self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split()
289 self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split() 289 self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split()
290 manifest = os.path.join(d.getVar("SDK_MANIFEST", True)) 290 manifest = d.getVar("SDK_TARGET_MANIFEST", True)
291 try: 291 try:
292 with open(manifest) as f: 292 with open(manifest) as f:
293 self.pkgmanifest = f.read() 293 self.pkgmanifest = f.read()
294 except IOError as e: 294 except IOError as e:
295 bb.fatal("No package manifest file found. Did you build the sdk image?\n%s" % e) 295 bb.fatal("No package manifest file found. Did you build the sdk image?\n%s" % e)
296 hostmanifest = d.getVar("SDK_HOST_MANIFEST", True)
297 try:
298 with open(hostmanifest) as f:
299 self.hostpkgmanifest = f.read()
300 except IOError as e:
301 bb.fatal("No host package manifest file found. Did you build the sdk image?\n%s" % e)
296 302
297 # test context 303 # test context
298 tc = TestContext() 304 tc = TestContext()