summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-12-03 01:48:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-11 17:21:46 +0000
commit124df4ee35030b5858a89a7cafe9cbf1e5eea043 (patch)
treebd770d3ddc6c280bb188768b235fe2216f62461a /meta/lib/oeqa
parent6c5a52ca8f47388a841eab5e3a7703b38bff3ba7 (diff)
downloadpoky-124df4ee35030b5858a89a7cafe9cbf1e5eea043.tar.gz
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) (From OE-Core rev: bda4e3cceda2205a0a5d916ef5b674df560d43f9) 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> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/selftest/wic.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index faac11e216..e652fad24a 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -42,7 +42,8 @@ class Wic(oeSelfTest):
42 def setUpLocal(self): 42 def setUpLocal(self):
43 """This code is executed before each test method.""" 43 """This code is executed before each test method."""
44 self.write_config('IMAGE_FSTYPES += " hddimg"\n' 44 self.write_config('IMAGE_FSTYPES += " hddimg"\n'
45 'MACHINE_FEATURES_append = " efi"\n') 45 'MACHINE_FEATURES_append = " efi"\n'
46 'WKS_FILE = "wic-image-minimal"\n')
46 47
47 # Do this here instead of in setUpClass as the base setUp does some 48 # Do this here instead of in setUpClass as the base setUp does some
48 # clean up which can result in the native tools built earlier in 49 # clean up which can result in the native tools built earlier in