summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-08-31 11:35:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-31 11:33:31 +0100
commitbeea25ec424b242d10f6913efd891614509d80c3 (patch)
tree0cefe65639d7df6030d7fd9f6bfc2e6d40152795 /meta/lib
parent67ed7c34351c4601a4a7ed9d049d68cfacf93a12 (diff)
downloadpoky-beea25ec424b242d10f6913efd891614509d80c3.tar.gz
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 <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/wic.py6
1 files changed, 4 insertions, 2 deletions
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):
180 path = os.path.join(imgdatadir, basename) + '.env' 180 path = os.path.join(imgdatadir, basename) + '.env'
181 self.assertTrue(os.path.isfile(path)) 181 self.assertTrue(os.path.isfile(path))
182 182
183 wicvars = get_bb_var('WICVARS', image).split() 183 wicvars = set(get_bb_var('WICVARS', image).split())
184 wicvars.remove('IMAGE_BOOT_FILES') # this variable is optional 184 # filter out optional variables
185 wicvars = wicvars.difference(('HDDDIR', 'IMAGE_BOOT_FILES',
186 'INITRD', 'ISODIR'))
185 with open(path) as envfile: 187 with open(path) as envfile:
186 content = dict(line.split("=", 1) for line in envfile) 188 content = dict(line.split("=", 1) for line in envfile)
187 # test if variables used by wic present in the .env file 189 # test if variables used by wic present in the .env file