summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWilliam Bourque <wbourque@gmail.com>2019-07-24 15:12:44 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-26 08:41:39 +0100
commit30c1d70c3289b3445f93a053f8cf2fabb830fabc (patch)
tree789b9d97f102c15ffd0e5b825d0ff1692614c641 /meta
parentfa1a3f5328d2ee6d96e01f55e7c194a0e09c95da (diff)
downloadpoky-30c1d70c3289b3445f93a053f8cf2fabb830fabc.tar.gz
meta/lib/oeqa: Remove ext4 for bootimg-biosplusefi
Remove "ext4" IMAGE_FSTYPES when generating core-image-minimal for the bootimg-biosplusefi unittests; "wic" type is enough. (From OE-Core rev: 73f69585e9f30819d8fb484d458e3408a04c0433) Signed-off-by: William Bourque <wbourque@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index 928c476ebc..fcdd55059d 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -684,11 +684,10 @@ class Wic2(WicTestCase):
684 @only_for_arch(['i586', 'i686', 'x86_64']) 684 @only_for_arch(['i586', 'i686', 'x86_64'])
685 def test_biosplusefi_plugin_qemu(self): 685 def test_biosplusefi_plugin_qemu(self):
686 """Test biosplusefi plugin in qemu""" 686 """Test biosplusefi plugin in qemu"""
687 for fstype in ("ext4", "wic"): 687 config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n'
688 config = 'IMAGE_FSTYPES = "%s"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' % fstype 688 self.append_config(config)
689 self.append_config(config) 689 self.assertEqual(0, bitbake('core-image-minimal').status)
690 self.assertEqual(0, bitbake('core-image-minimal').status) 690 self.remove_config(config)
691 self.remove_config(config)
692 691
693 with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu: 692 with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu:
694 # Check that we have ONLY two /dev/sda* partitions (/boot and /) 693 # Check that we have ONLY two /dev/sda* partitions (/boot and /)
@@ -722,11 +721,10 @@ class Wic2(WicTestCase):
722 # If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir() 721 # If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir()
723 # will raise with "Couldn't find correct bootimg_dir" 722 # will raise with "Couldn't find correct bootimg_dir"
724 # The easiest way to work-around this issue is to make sure we already built an image here, hence the bitbake call 723 # The easiest way to work-around this issue is to make sure we already built an image here, hence the bitbake call
725 for fstype in ("ext4", "wic"): 724 config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n'
726 config = 'IMAGE_FSTYPES = "%s"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' % fstype 725 self.append_config(config)
727 self.append_config(config) 726 self.assertEqual(0, bitbake('core-image-minimal').status)
728 self.assertEqual(0, bitbake('core-image-minimal').status) 727 self.remove_config(config)
729 self.remove_config(config)
730 728
731 img = 'core-image-minimal' 729 img = 'core-image-minimal'
732 with NamedTemporaryFile("w", suffix=".wks") as wks: 730 with NamedTemporaryFile("w", suffix=".wks") as wks: