yoctoproject/poky-contrib
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky-contrib synced 2025-05-08 15:42:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

selftest: systemd_boot.py: respect IMAGE_LINK_NAME

Browse Source 
* use IMAGE_LINK_NAME instead of hardcoding
  core-image-minimal-genericx86-64.wic assumption

[YOCTO #12937]

(From meta-yocto rev: d0557c03c5fdeb294f8461ca90f875f0387bff8a)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2023-03-18 10:42:26 +01:00 committed by Richard Purdie
parent 3ae3669468
commit df3ce81ed3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import os
from oeqa.selftest.case import OESelftestTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu
class Systemdboot(OESelftestTestCase):
@ -21,8 +21,9 @@ class Systemdboot(OESelftestTestCase):
features += 'MACHINE = "genericx86-64"'
self.append_config(features)
deploydir = get_bb_var('DEPLOY_DIR_IMAGE', "core-image-minimal")
systemdbootfile = os.path.join(deploydir, 'systemd-bootx64.efi')
image = 'core-image-minimal'
bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image)
systemdbootfile = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], 'systemd-bootx64.efi')
# Ensure we're actually testing that this gets built and not that
# it was around from an earlier build
@ -50,8 +51,8 @@ class Systemdboot(OESelftestTestCase):
AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com>
"""
systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.wic')
imagebootfile = os.path.join(deploydir, 'bootx64.efi')
systemdbootimage = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], '%s.wic' % bb_vars['IMAGE_LINK_NAME'])
imagebootfile = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], 'bootx64.efi')
# Clean environment before start the test
if os.path.isfile(imagebootfile):