selftest: wic: fix test_qemu
PATCH 1/1 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.
Signed-off-by Ed Bartosh <[email protected]>
--- meta/conf/machine/qemux86-64.conf | 2 +- meta/lib/oeqa/selftest/wic.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
meta/conf/machine/qemux86-64.conf +1 -1
@@ -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"
meta/lib/oeqa/selftest/wic.py +2 -1
@@ -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
Signature · 1 line
2.1.4