mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-13 12:13:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

oe-selftest: wic: fix test19_image_env test case

Browse Source 
This test case fails on qemu machines as not all expected bitbake
variables are present in .env file.

Fixed by filtering out optional variables.

(From OE-Core rev: dd76c276a8ebaa2e2ab17b819514589ab4507740)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2015-08-31 11:35:36 +03:00
committed by Richard Purdie
parent 67ed7c3435
commit beea25ec42
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/lib/oeqa/selftest/wic.py
View File

@@ -180,8 +180,10 @@ class Wic(oeSelfTest):
path = os.path.join(imgdatadir, basename) + '.env'
self.assertTrue(os.path.isfile(path))
wicvars = get_bb_var('WICVARS', image).split()
wicvars.remove('IMAGE_BOOT_FILES') # this variable is optional
wicvars = set(get_bb_var('WICVARS', image).split())
# filter out optional variables
wicvars = wicvars.difference(('HDDDIR', 'IMAGE_BOOT_FILES',
'INITRD', 'ISODIR'))
with open(path) as envfile:
content = dict(line.split("=", 1) for line in envfile)
# test if variables used by wic present in the .env file