diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-08-31 11:35:36 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-31 11:33:13 +0100 |
| commit | dd76c276a8ebaa2e2ab17b819514589ab4507740 (patch) | |
| tree | d3a0eee9c89d9fe080f7bbaf7f33d47fb7e3f8cf | |
| parent | 9f991103218f6fff67934b51411d31180d5d3e1a (diff) | |
| download | openembedded-core-dd76c276a8ebaa2e2ab17b819514589ab4507740.tar.gz openembedded-core-dd76c276a8ebaa2e2ab17b819514589ab4507740.tar.bz2 openembedded-core-dd76c276a8ebaa2e2ab17b819514589ab4507740.zip | |
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.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 6 |
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): 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 |