[OE-core] [wic][PATCH] oe-selftest: wic: fix test19_image_env test case
Ed Bartosh
ed.bartosh at linux.intel.com
Mon Aug 31 08:35:36 UTC 2015
This test case fails on qemu machines as not all expected bitbake
variables are present in .env file.
Fixed by filtering out optional variables.
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
meta/lib/oeqa/selftest/wic.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index deb2333..6bc4b60 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
--
2.1.4
More information about the Openembedded-core
mailing list