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/systemd-boot: test against wic image

Browse Source 
effort to remove live for x86 from default image
see https://bugzilla.yoctoproject.org/show_bug.cgi?id=11291

reduce dependency on hddimg, change the test to based on wic image.

(From meta-yocto rev: 8cce1493f625664c21c156a36d9c9fb6d4dd4b1f)

Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chee Yang Lee 2019-12-03 13:35:59 +08:00 committed by Richard Purdie
parent 3925515d98
commit ad0d8d2a77
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
View File

@ -38,9 +38,9 @@ class Systemdboot(OESelftestTestCase):
""" """
Summary: Check if EFI bootloader for systemd is correctly build Summary: Check if EFI bootloader for systemd is correctly build
Dependencies: Image was built correctly on testcase 1445 Dependencies: Image was built correctly on testcase 1445
Steps: 1. Copy bootx64.efi file form the hddimg created Steps: 1. Copy bootx64.efi file from the wic created
under build/tmp/deploy/images/genericx86-64 under build/tmp/deploy/images/genericx86-64
2. Check bootx64.efi was copied form hddimg 2. Check bootx64.efi was copied from wic
3. Verify the checksums from the copied and previously 3. Verify the checksums from the copied and previously
created file are equal. created file are equal.
Expected : Systemd-bootx64.efi and bootx64.efi should be the same Expected : Systemd-bootx64.efi and bootx64.efi should be the same
@ -50,15 +50,14 @@ class Systemdboot(OESelftestTestCase):
AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com> AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com>
""" """
systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.hddimg') systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.wic')
imagebootfile = os.path.join(deploydir, 'bootx64.efi') imagebootfile = os.path.join(deploydir, 'bootx64.efi')
mcopynative = os.path.join(get_bb_var('STAGING_BINDIR_NATIVE', "core-image-minimal"), 'mcopy')
# Clean environment before start the test # Clean environment before start the test
if os.path.isfile(imagebootfile): if os.path.isfile(imagebootfile):
runCmd('rm -f %s' % imagebootfile) runCmd('rm -f %s' % imagebootfile)
runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative ,systemdbootimage, runCmd('wic cp %s:1/EFI/BOOT/bootx64.efi %s' % (systemdbootimage,
imagebootfile)) imagebootfile))
found = os.path.isfile(imagebootfile) found = os.path.isfile(imagebootfile)