[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4516/8267] selftest: wic: use wic-tools recipe to get STAGING_DIR

[Emmanuele Bassi <ebassi src gnome org>]

commit 23237b46dc81fc36e6e2864feae203b6b0c5fef7
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Feb 3 16:58:15 2017 +0200

    selftest: wic: use wic-tools recipe to get STAGING_DIR
    
    STAGING_DIR variable is used to get path to a boot dir.
    It's better to use wic-tools recipe to it as it contains
    all bootloader artifacts.
    
    Modified test_build_artifacts and test_rootfs_artifacts to
    use wic-tools target to get STAGING_DIR.
    
    (From OE-Core rev: eb648ac5566fbcc679e8544fd8403a730ce71058)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/wic.py |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index ebf3d18..07b8312 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -212,9 +212,12 @@ class Wic(oeSelfTest):
     @testcase(1212)
     def test_build_artifacts(self):
         """Test wic create directdisk providing all artifacts."""
-        bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal'))
-                      for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS'))
-        bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
+        variables = (('STAGING_DATADIR', 'wic-tools'),
+                     ('RECIPE_SYSROOT_NATIVE', 'wic-tools'),
+                     ('DEPLOY_DIR_IMAGE', 'core-image-minimal'),
+                     ('IMAGE_ROOTFS', 'core-image-minimal'))
+        bbvars = {var.lower(): get_bb_var(var, recipe) \
+                      for var, recipe in variables}
         bbvars['resultdir'] = self.resultdir
         status = runCmd("wic create directdisk "
                         "-b %(staging_datadir)s "
@@ -318,9 +321,12 @@ class Wic(oeSelfTest):
     @testcase(1269)
     def test_rootfs_artifacts(self):
         """Test usage of rootfs plugin with rootfs paths"""
-        bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal'))
-                      for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE', 'IMAGE_ROOTFS'))
-        bbvars['recipe_sysroot_native'] = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
+        variables = (('STAGING_DATADIR', 'wic-tools'),
+                     ('RECIPE_SYSROOT_NATIVE', 'wic-tools'),
+                     ('DEPLOY_DIR_IMAGE', 'core-image-minimal'),
+                     ('IMAGE_ROOTFS', 'core-image-minimal'))
+        bbvars = {var.lower(): get_bb_var(var, recipe) \
+                      for var, recipe in variables}
         bbvars['wks'] = "directdisk-multi-rootfs"
         bbvars['resultdir'] = self.resultdir
         status = runCmd("wic create %(wks)s "