[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3559/8267] selftest: wic: fix test_qemu

[Emmanuele Bassi <ebassi src gnome org>]

commit 1b32c6ed025745cb06b7c28ca0fe9e416ce7abfa
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Sat Dec 3 01:48:06 2016 +0200

    selftest: wic: fix test_qemu
    
    Setting WKS_FILE variable in qemux86-64 made wic test to
    use wrong wks file to produce an image and resulted in
    test_qemu failure.
    
    Used conditional assignment in qemux86-64 and explicitly
    set WKS_FILE in wic testing suite to make the suite to use
    wic-image-minimal.wsk. This should fix test_qemu failure.
    
    (From OE-Core rev: 3bca4d18c2712e3b154bacfb917f0a749ebaddeb)
    
    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/conf/machine/qemux86-64.conf |    2 +-
 meta/lib/oeqa/selftest/wic.py     |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 7559724..3117ca1 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -29,5 +29,5 @@ MACHINE_FEATURES += "x86"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
 
-WKS_FILE = "directdisk.wks"
+WKS_FILE ?= "directdisk.wks"
 do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot 
mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index faac11e..e652fad 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -42,7 +42,8 @@ class Wic(oeSelfTest):
     def setUpLocal(self):
         """This code is executed before each test method."""
         self.write_config('IMAGE_FSTYPES += " hddimg"\n'
-                          'MACHINE_FEATURES_append = " efi"\n')
+                          'MACHINE_FEATURES_append = " efi"\n'
+                          'WKS_FILE = "wic-image-minimal"\n')
 
         # Do this here instead of in setUpClass as the base setUp does some
         # clean up which can result in the native tools built earlier in