MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

selftest: wic: wic_sector_size add wic-tools path

Browse Source 
Add wic-tools to the PATH to avoid failures when running the
wic_sector_size test case on a build host that doesn’t have parted.

(From OE-Core rev: 013dcdf75669421bc38d699263cb1e8d5b95d398)

Signed-off-by: Vince Chang <vince_chang@aspeedtech.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Vince Chang 2024-11-01 16:22:08 +08:00 committed by Richard Purdie
parent e07cda3174
commit 806c6b974b
1 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -842,55 +842,59 @@ bootloader --ptable gpt""")
def test_wic_sector_size(self):
"""Test generation image sector size"""
# Add WIC_SECTOR_SIZE into config
config = 'WIC_SECTOR_SIZE = "4096"\n'\
'WIC_BLOCK_SIZE = "4096"\n'\
'WICVARS:append = " WIC_SECTOR_SIZE WIC_BLOCK_SIZE"\n'
self.append_config(config)
bitbake('core-image-minimal')
oldpath = os.environ['PATH']
os.environ['PATH'] = get_bb_var("PATH", "wic-tools")
# Check WIC_SECTOR_SIZE apply to bitbake variable
wic_sector_size_str = get_bb_var('WIC_SECTOR_SIZE', 'core-image-minimal')
wic_sector_size = int(wic_sector_size_str)
self.assertEqual(4096, wic_sector_size)
try:
# Add WIC_SECTOR_SIZE into config
config = 'WIC_SECTOR_SIZE = "4096"\n'\
'WICVARS:append = " WIC_SECTOR_SIZE"\n'
self.append_config(config)
bitbake('core-image-minimal')
self.logger.info("Test wic_sector_size: %d \n" % wic_sector_size)
# Check WIC_SECTOR_SIZE apply to bitbake variable
wic_sector_size_str = get_bb_var('WIC_SECTOR_SIZE', 'core-image-minimal')
wic_sector_size = int(wic_sector_size_str)
self.assertEqual(4096, wic_sector_size)
with NamedTemporaryFile("w", suffix=".wks") as wks:
wks.writelines(
['bootloader --ptable gpt\n',
'part --fstype ext4 --source rootfs --label rofs-a --mkfs-extraopts "-b 4096"\n',
'part --fstype ext4 --source rootfs --use-uuid --mkfs-extraopts "-b 4096"\n'])
wks.flush()
cmd = "wic create %s -e core-image-minimal -o %s" % (wks.name, self.resultdir)
runCmd(cmd)
wksname = os.path.splitext(os.path.basename(wks.name))[0]
images = glob(os.path.join(self.resultdir, "%s-*direct" % wksname))
self.assertEqual(1, len(images))
self.logger.info("Test wic_sector_size: %d \n" % wic_sector_size)
sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
# list partitions
result = runCmd("wic ls %s -n %s" % (images[0], sysroot))
self.assertEqual(3, len(result.output.split('\n')))
self.logger.info("result: %s \n" % result.output)
with NamedTemporaryFile("w", suffix=".wks") as wks:
wks.writelines(
['bootloader --ptable gpt\n',
'part --fstype ext4 --source rootfs --label rofs-a --mkfs-extraopts "-b 4096"\n',
'part --fstype ext4 --source rootfs --use-uuid --mkfs-extraopts "-b 4096"\n'])
wks.flush()
cmd = "wic create %s -e core-image-minimal -o %s" % (wks.name, self.resultdir)
runCmd(cmd)
wksname = os.path.splitext(os.path.basename(wks.name))[0]
images = glob(os.path.join(self.resultdir, "%s-*direct" % wksname))
self.assertEqual(1, len(images))
# verify partition size with wic
res = runCmd("export PARTED_SECTOR_SIZE=%d; parted -m %s unit b p" % (wic_sector_size, images[0]),
stderr=subprocess.PIPE)
sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools')
# list partitions
result = runCmd("wic ls %s -n %s" % (images[0], sysroot))
self.assertEqual(3, len(result.output.split('\n')))
self.logger.info("res: %s \n" % res.output)
# parse parted output which looks like this:
# BYT;\n
# /var/tmp/wic/build/tmpgjzzefdd-202410281021-sda.direct:78569472B:file:4096:4096:gpt::;\n
# 1:139264B:39284735B:39145472B:ext4:rofs-a:;\n
# 2:39284736B:78430207B:39145472B:ext4:primary:;\n
disk_info = res.output.splitlines()[1]
# Check sector sizes
sector_size_logical = int(disk_info.split(":")[3])
sector_size_physical = int(disk_info.split(":")[4])
self.assertEqual(wic_sector_size, sector_size_logical, "Logical sector size is not %d." % wic_sector_size)
self.assertEqual(wic_sector_size, sector_size_physical, "Physical sector size is not %d." % wic_sector_size)
# verify partition size with wic
res = runCmd("export PARTED_SECTOR_SIZE=%d; parted -m %s unit b p" % (wic_sector_size, images[0]),
stderr=subprocess.PIPE)
# parse parted output which looks like this:
# BYT;\n
# /var/tmp/wic/build/tmpgjzzefdd-202410281021-sda.direct:78569472B:file:4096:4096:gpt::;\n
# 1:139264B:39284735B:39145472B:ext4:rofs-a:;\n
# 2:39284736B:78430207B:39145472B:ext4:primary:;\n
disk_info = res.output.splitlines()[1]
# Check sector sizes
sector_size_logical = int(disk_info.split(":")[3])
sector_size_physical = int(disk_info.split(":")[4])
self.assertEqual(wic_sector_size, sector_size_logical, "Logical sector size is not %d." % wic_sector_size)
self.assertEqual(wic_sector_size, sector_size_physical, "Physical sector size is not %d." % wic_sector_size)
finally:
os.environ['PATH'] = oldpath
class Wic2(WicTestCase):