From 0007b5c5967536131246970e7d55602e52a87e95 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 28 Apr 2015 11:49:08 +0100 Subject: 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 --- meta/classes/testimage.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/classes/testimage.bbclass') 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): self.sdkenv = sdkenv self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split() self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split() - manifest = os.path.join(d.getVar("SDK_MANIFEST", True)) + manifest = d.getVar("SDK_TARGET_MANIFEST", True) try: with open(manifest) as f: self.pkgmanifest = f.read() except IOError as e: bb.fatal("No package manifest file found. Did you build the sdk image?\n%s" % e) + hostmanifest = d.getVar("SDK_HOST_MANIFEST", True) + try: + with open(hostmanifest) as f: + self.hostpkgmanifest = f.read() + except IOError as e: + bb.fatal("No host package manifest file found. Did you build the sdk image?\n%s" % e) # test context tc = TestContext() -- cgit v1.2.3-54-g00ecf