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 23:20:12 +0100
commit528a890554339b13b4751d5ffc456b5cbb95be44 (patch)
treee0ea2d9d55cc8c6d1e9fa01c8ada1826f4e3f295
parent21823cb466e79540567ad1a43ae6f93d850e4057 (diff)
downloadpoky-528a890554339b13b4751d5ffc456b5cbb95be44.tar.gz
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. (From OE-Core rev: caf9b41e1db7b565ef977200195d57b385127de9) 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):
50 if not Wic.image_is_ready: 50 if not Wic.image_is_ready:
51 bitbake('syslinux syslinux-native parted-native gptfdisk-native ' 51 bitbake('syslinux syslinux-native parted-native gptfdisk-native '
52 'dosfstools-native mtools-native') 52 'dosfstools-native mtools-native')
53 bitbake('core-image-minimal -c do_rootfs_wicenv') 53 bitbake('core-image-minimal')
54 Wic.image_is_ready = True 54 Wic.image_is_ready = True
55 55
56 rmtree(self.resultdir, ignore_errors=True) 56 rmtree(self.resultdir, ignore_errors=True)
@@ -199,6 +199,7 @@ class Wic(oeSelfTest):
199 def test_image_env(self): 199 def test_image_env(self):
200 """Test generation of <image>.env files.""" 200 """Test generation of <image>.env files."""
201 image = 'core-image-minimal' 201 image = 'core-image-minimal'
202 self.assertEqual(0, bitbake('%s -c do_rootfs_wicenv' % image).status)
202 stdir = get_bb_var('STAGING_DIR_TARGET', image) 203 stdir = get_bb_var('STAGING_DIR_TARGET', image)
203 imgdatadir = os.path.join(stdir, 'imgdata') 204 imgdatadir = os.path.join(stdir, 'imgdata')
204 205