diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-12-03 01:48:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-07 10:38:06 +0000 |
commit | 1b32c6ed025745cb06b7c28ca0fe9e416ce7abfa (patch) | |
tree | d0a98978147977957d1aad4fdd27fbe5330e438f /meta/lib | |
parent | f0c44d24edec0c1c7fa447e99d25c378f672b0f3 (diff) | |
download | poky-1b32c6ed025745cb06b7c28ca0fe9e416ce7abfa.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)
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>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 3 |
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 |