aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-03 17:22:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:22:18 +0000
commit675bb9ddb8565a0fb29ace2d0bdea41a2090fcef (patch)
tree161b16cefd7c0b4e8da7a77dd7fc14ce578abdae
parent23237b46dc81fc36e6e2864feae203b6b0c5fef7 (diff)
downloadopenembedded-core-contrib-675bb9ddb8565a0fb29ace2d0bdea41a2090fcef.tar.gz
openembedded-core-contrib-675bb9ddb8565a0fb29ace2d0bdea41a2090fcef.tar.bz2
openembedded-core-contrib-675bb9ddb8565a0fb29ace2d0bdea41a2090fcef.zip
selftest: wic: stop using iso image type
Removed 'IMAGE_FSTYPES = "iso" as this functionality depends on do_bootimg, which is going to be obsoleted soon. As wic doesn't depend on bootimg it's safe to remove this. (From OE-Core rev: a08e2019223d7c04916967d8fd42279e8e1e186f) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/wic.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 07b8312a21c..417ba3d26f4 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -42,8 +42,7 @@ class Wic(oeSelfTest):
def setUpLocal(self):
"""This code is executed before each test method."""
- self.write_config('IMAGE_FSTYPES = "iso"\n'
- 'MACHINE_FEATURES_append = " efi"\n')
+ self.write_config('MACHINE_FEATURES_append = " efi"\n')
# Do this here instead of in setUpClass as the base setUp does some
# clean up which can result in the native tools built earlier in
@@ -151,7 +150,8 @@ class Wic(oeSelfTest):
@testcase(1346)
def test_iso_image(self):
"""Test creation of hybrid iso image with legacy and EFI boot"""
- config = 'MACHINE_FEATURES_append = " efi"\n'
+ config = 'INITRAMFS_IMAGE = "core-image-minimal-initramfs"\n'\
+ 'MACHINE_FEATURES_append = " efi"\n'
self.append_config(config)
bitbake('core-image-minimal')
self.remove_config(config)