summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-03-29 11:38:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-29 12:55:44 +0100
commitcaf9b41e1db7b565ef977200195d57b385127de9 (patch)
tree911b3e373a41c7ff53ee29a378756d3b300c9366
parenta3e254992444b0cc92e182151fefba7e3324ad55 (diff)
downloadopenembedded-core-contrib-caf9b41e1db7b565ef977200195d57b385127de9.tar.gz
openembedded-core-contrib-caf9b41e1db7b565ef977200195d57b385127de9.tar.bz2
openembedded-core-contrib-caf9b41e1db7b565ef977200195d57b385127de9.zip
oe-selftest: generate .env only in test_image_env
Most of wic functionality doesn't depend on .wicenv file, so it's better to generate it only in test_image_env test case where it's used. 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.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 3829de2f1c..56ce8c83de 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -50,7 +50,7 @@ class Wic(oeSelfTest):
if not Wic.image_is_ready:
bitbake('syslinux syslinux-native parted-native gptfdisk-native '
'dosfstools-native mtools-native')
- bitbake('core-image-minimal -c do_rootfs_wicenv')
+ bitbake('core-image-minimal')
Wic.image_is_ready = True
rmtree(self.resultdir, ignore_errors=True)
@@ -199,6 +199,7 @@ class Wic(oeSelfTest):
def test_image_env(self):
"""Test generation of <image>.env files."""
image = 'core-image-minimal'
+ self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status)
stdir = get_bb_var('STAGING_DIR_TARGET', image)
imgdatadir = os.path.join(stdir, 'imgdata')