mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

meta/lib/oeqa: Remove ext4 for bootimg-biosplusefi

Browse Source 
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>
This commit is contained in:
William Bourque
2019-07-24 15:12:44 -04:00
committed by Richard Purdie
parent fa1a3f5328
commit 30c1d70c32
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
meta/lib/oeqa/selftest/cases/wic.py
View File

@@ -684,11 +684,10 @@ class Wic2(WicTestCase):
@only_for_arch(['i586', 'i686', 'x86_64']) @only_for_arch(['i586', 'i686', 'x86_64'])
def test_biosplusefi_plugin_qemu(self): def test_biosplusefi_plugin_qemu(self):
"""Test biosplusefi plugin in qemu""" """Test biosplusefi plugin in qemu"""
for fstype in ("ext4", "wic"): config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n'
config = 'IMAGE_FSTYPES = "%s"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' % fstype self.append_config(config)
self.append_config(config) self.assertEqual(0, bitbake('core-image-minimal').status)
self.assertEqual(0, bitbake('core-image-minimal').status) self.remove_config(config)
self.remove_config(config)
with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu: with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu:
# Check that we have ONLY two /dev/sda* partitions (/boot and /) # Check that we have ONLY two /dev/sda* partitions (/boot and /)
@@ -722,11 +721,10 @@ class Wic2(WicTestCase):
# If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir() # If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir()
# will raise with "Couldn't find correct bootimg_dir" # will raise with "Couldn't find correct bootimg_dir"
# The easiest way to work-around this issue is to make sure we already built an image here, hence the bitbake call # The easiest way to work-around this issue is to make sure we already built an image here, hence the bitbake call
for fstype in ("ext4", "wic"): config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n'
config = 'IMAGE_FSTYPES = "%s"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' % fstype self.append_config(config)
self.append_config(config) self.assertEqual(0, bitbake('core-image-minimal').status)
self.assertEqual(0, bitbake('core-image-minimal').status) self.remove_config(config)
self.remove_config(config)
img = 'core-image-minimal' img = 'core-image-minimal'
with NamedTemporaryFile("w", suffix=".wks") as wks: with NamedTemporaryFile("w", suffix=".wks") as wks: