From beea25ec424b242d10f6913efd891614509d80c3 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 31 Aug 2015 11:35:36 +0300 Subject: oe-selftest: wic: fix test19_image_env test case 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/wic.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index deb2333e05..6bc4b60519 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -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 -- cgit v1.2.3-54-g00ecf