[oe-commits] Richard Purdie : testimage: Fix sdk test manifest handling

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: df91dd8d064dc3e59c7f057d3f869500a233a76f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=df91dd8d064dc3e59c7f057d3f869500a233a76f

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Apr 28 11:49:08 2015 +0100

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.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/testimage.bbclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index dc163c7..1557675 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()