diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-03-18 10:42:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-30 12:32:30 +0100 |
commit | df3ce81ed3e5491b084041c5bcbd16dada129cf9 (patch) | |
tree | 9f91aefd19b4bac321f54a25a93fdecad180a026 /meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | |
parent | 3ae3669468c133e5cd26120e7ee2d82bcaad8b56 (diff) | |
download | poky-df3ce81ed3e5491b084041c5bcbd16dada129cf9.tar.gz |
selftest: systemd_boot.py: respect IMAGE_LINK_NAME
* 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>
Diffstat (limited to 'meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py')
-rw-r--r-- | meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | 11 |
1 files changed, 6 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 57599e19aa..6ce9a3b3f8 100644 --- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py +++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py | |||
@@ -2,7 +2,7 @@ import os | |||
2 | 2 | ||
3 | from oeqa.selftest.case import OESelftestTestCase | 3 | from oeqa.selftest.case import OESelftestTestCase |
4 | from oeqa.core.decorator.depends import OETestDepends | 4 | from oeqa.core.decorator.depends import OETestDepends |
5 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu | 5 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu |
6 | 6 | ||
7 | class Systemdboot(OESelftestTestCase): | 7 | class Systemdboot(OESelftestTestCase): |
8 | 8 | ||
@@ -21,8 +21,9 @@ class Systemdboot(OESelftestTestCase): | |||
21 | features += 'MACHINE = "genericx86-64"' | 21 | features += 'MACHINE = "genericx86-64"' |
22 | self.append_config(features) | 22 | self.append_config(features) |
23 | 23 | ||
24 | deploydir = get_bb_var('DEPLOY_DIR_IMAGE', "core-image-minimal") | 24 | image = 'core-image-minimal' |
25 | systemdbootfile = os.path.join(deploydir, 'systemd-bootx64.efi') | 25 | bb_vars = get_bb_vars(['DEPLOY_DIR_IMAGE', 'IMAGE_LINK_NAME'], image) |
26 | systemdbootfile = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], 'systemd-bootx64.efi') | ||
26 | 27 | ||
27 | # Ensure we're actually testing that this gets built and not that | 28 | # Ensure we're actually testing that this gets built and not that |
28 | # it was around from an earlier build | 29 | # it was around from an earlier build |
@@ -50,8 +51,8 @@ class Systemdboot(OESelftestTestCase): | |||
50 | AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com> | 51 | AutomatedBy: Jose Perez Carranza <jose.perez.carranza at linux-intel.com> |
51 | """ | 52 | """ |
52 | 53 | ||
53 | systemdbootimage = os.path.join(deploydir, 'core-image-minimal-genericx86-64.wic') | 54 | systemdbootimage = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], '%s.wic' % bb_vars['IMAGE_LINK_NAME']) |
54 | imagebootfile = os.path.join(deploydir, 'bootx64.efi') | 55 | imagebootfile = os.path.join(bb_vars['DEPLOY_DIR_IMAGE'], 'bootx64.efi') |
55 | 56 | ||
56 | # Clean environment before start the test | 57 | # Clean environment before start the test |
57 | if os.path.isfile(imagebootfile): | 58 | if os.path.isfile(imagebootfile): |