summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorChee Yang Lee <chee.yang.lee@intel.com>2019-12-03 13:35:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-15 09:08:43 +0000
commitad0d8d2a779ce723ffe584d169b07e1cbf055d49 (patch)
treeded2b13960fbfb3a3c532163772aaf9a48b4ff8c /meta-yocto-bsp
parent3925515d989993146a72214db6796dde4b18ecd7 (diff)
downloadpoky-ad0d8d2a779ce723ffe584d169b07e1cbf055d49.tar.gz
selftest/systemd-boot: test against wic image
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>
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r--meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
index 0a3a2cdc4b..b3db226d7e 100644
--- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
+++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
@@ -38,9 +38,9 @@ class Systemdboot(OESelftestTestCase):
38 """ 38 """
39 Summary: Check if EFI bootloader for systemd is correctly build 39 Summary: Check if EFI bootloader for systemd is correctly build
40 Dependencies: Image was built correctly on testcase 1445 40 Dependencies: Image was built correctly on testcase 1445
41 Steps: 1. Copy bootx64.efi file form the hddimg created 41 Steps: 1. Copy bootx64.efi file from the wic created
42 under build/tmp/deploy/images/genericx86-64 42 under build/tmp/deploy/images/genericx86-64
43 2. Check bootx64.efi was copied form hddimg 43 2. Check bootx64.efi was copied from wic
44 3. Verify the checksums from the copied and previously 44 3. Verify the checksums from the copied and previously
45 created file are equal. 45 created file are equal.
46 Expected : Systemd-bootx64.efi and bootx64.efi should be the same 46 Expected : Systemd-bootx64.efi and bootx64.efi should be the same
@@ -50,15 +50,14 @@ class Systemdboot(OESelftestTestCase):
50 AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com> 50 AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com>
51 """ 51 """
52 52
53 systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.hddimg') 53 systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.wic')
54 imagebootfile = os.path.join(deploydir, 'bootx64.efi') 54 imagebootfile = os.path.join(deploydir, 'bootx64.efi')
55 mcopynative = os.path.join(get_bb_var('STAGING_BINDIR_NATIVE', "core-image-minimal"), 'mcopy')
56 55
57 # Clean environment before start the test 56 # Clean environment before start the test
58 if os.path.isfile(imagebootfile): 57 if os.path.isfile(imagebootfile):
59 runCmd('rm -f %s' % imagebootfile) 58 runCmd('rm -f %s' % imagebootfile)
60 59
61 runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative ,systemdbootimage, 60 runCmd('wic cp %s:1/EFI/BOOT/bootx64.efi %s' % (systemdbootimage,
62 imagebootfile)) 61 imagebootfile))
63 62
64 found = os.path.isfile(imagebootfile) 63 found = os.path.isfile(imagebootfile)