From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Kory Maincent <kory.maincent@bootlin.com>
Cc: thomas.petazzoni@bootlin.com, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v3 7/7] support/testing/tests/fs/test_iso9660.py: add support to test using EFI BIOS
Date: Sun, 3 Oct 2021 14:50:17 +0200 [thread overview]
Message-ID: <20211003125017.GJ1504958@scaer> (raw)
In-Reply-To: <20210923155726.87851-8-kory.maincent@bootlin.com>
Köry, All,
On 2021-09-23 17:57 +0200, Kory Maincent spake thusly:
> The ISO9660 tests are only testing BIOS Legacy.
> Add support to test an ISO9660 image based on EFI BIOS.
> Add support to test an ISO9660 hybrid image based on Legacy and EFI BIOS.
> Add dedicated Grub2 builtin config for the EFI compatible cases.
>
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
> ---
> support/testing/conf/grub2-efi.cfg | 2 +
> support/testing/tests/fs/test_iso9660.py | 74 +++++++++++++++++++++++-
> 2 files changed, 74 insertions(+), 2 deletions(-)
> create mode 100644 support/testing/conf/grub2-efi.cfg
>
> diff --git a/support/testing/conf/grub2-efi.cfg b/support/testing/conf/grub2-efi.cfg
> new file mode 100644
> index 0000000000..11c32e880e
> --- /dev/null
> +++ b/support/testing/conf/grub2-efi.cfg
> @@ -0,0 +1,2 @@
> +set root=(cd0)
> +set prefix=/boot/grub
> diff --git a/support/testing/tests/fs/test_iso9660.py b/support/testing/tests/fs/test_iso9660.py
> index 1b699e1fef..8315442604 100644
> --- a/support/testing/tests/fs/test_iso9660.py
> +++ b/support/testing/tests/fs/test_iso9660.py
> @@ -25,9 +25,13 @@ BASIC_CONFIG = \
> """.format(infra.filepath("conf/minimal-x86-qemu-kernel.config"))
>
>
> -def test_mount_internal_external(emulator, builddir, internal=True):
> +def test_mount_internal_external(emulator, builddir, internal=True, efi=False):
> img = os.path.join(builddir, "images", "rootfs.iso9660")
> - emulator.boot(arch="i386", options=["-cdrom", img])
> + if efi:
> + efi_img = os.path.join(builddir, "images", "OVMF.fd")
> + emulator.boot(arch="i386", options=["-cdrom", img, "-bios", efi_img])
> + else:
> + emulator.boot(arch="i386", options=["-cdrom", img])
> emulator.login()
>
> if internal:
> @@ -53,6 +57,7 @@ class TestIso9660Grub2External(infra.basetest.BRTest):
> BR2_TARGET_ROOTFS_ISO9660=y
> # BR2_TARGET_ROOTFS_ISO9660_INITRD is not set
> BR2_TARGET_GRUB2=y
> + BR2_TARGET_GRUB2_I386_PC=y
This is no longer needed now that we ensure that it is the default
setting. Ditto for the following two, of course.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
> BR2_TARGET_GRUB2_BUILTIN_MODULES_PC="boot linux ext2 fat part_msdos part_gpt normal biosdisk iso9660"
> BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
> @@ -74,6 +79,7 @@ class TestIso9660Grub2ExternalCompress(infra.basetest.BRTest):
> # BR2_TARGET_ROOTFS_ISO9660_INITRD is not set
> BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION=y
> BR2_TARGET_GRUB2=y
> + BR2_TARGET_GRUB2_I386_PC=y
> BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
> BR2_TARGET_GRUB2_BUILTIN_MODULES_PC="boot linux ext2 fat part_msdos part_gpt normal biosdisk iso9660"
> BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
> @@ -94,6 +100,7 @@ class TestIso9660Grub2Internal(infra.basetest.BRTest):
> BR2_TARGET_ROOTFS_ISO9660=y
> BR2_TARGET_ROOTFS_ISO9660_INITRD=y
> BR2_TARGET_GRUB2=y
> + BR2_TARGET_GRUB2_I386_PC=y
> BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
> BR2_TARGET_GRUB2_BUILTIN_MODULES_PC="boot linux ext2 fat part_msdos part_gpt normal biosdisk iso9660"
> BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
> @@ -107,6 +114,69 @@ class TestIso9660Grub2Internal(infra.basetest.BRTest):
> exit_code = test_touch_file(self.emulator)
> self.assertEqual(exit_code, 0)
>
> +
> +class TestIso9660Grub2EFI(infra.basetest.BRTest):
> + config = BASIC_CONFIG + \
> + """
> + BR2_TARGET_ROOTFS_ISO9660=y
> + BR2_TARGET_ROOTFS_ISO9660_INITRD=y
> + BR2_TARGET_GRUB2=y
> + BR2_TARGET_GRUB2_I386_EFI=y
> + BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat part_msdos part_gpt normal iso9660"
> + BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="{}"
> + BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
> + BR2_TARGET_EDK2=y
> + """.format(infra.filepath("conf/grub2-efi.cfg"),
> + infra.filepath("conf/grub2.cfg"))
> +
> + def test_run(self):
> + exit_code = test_mount_internal_external(self.emulator,
> + self.builddir, internal=True,
> + efi=True)
> + self.assertEqual(exit_code, 0)
> +
> + exit_code = test_touch_file(self.emulator)
> + self.assertEqual(exit_code, 0)
> +
> +
> +class TestIso9660Grub2Hybrid(infra.basetest.BRTest):
> + config = BASIC_CONFIG + \
> + """
> + BR2_TARGET_ROOTFS_ISO9660=y
> + BR2_TARGET_ROOTFS_ISO9660_INITRD=y
> + BR2_TARGET_GRUB2=y
> + BR2_TARGET_GRUB2_I386_PC=y
> + BR2_TARGET_GRUB2_I386_EFI=y
> + BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
> + BR2_TARGET_GRUB2_BUILTIN_MODULES_PC="boot linux ext2 fat squash4 part_msdos part_gpt normal iso9660 biosdisk"
> + BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC=""
> + BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal iso9660 efi_gop"
> + BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="{}"
> + BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
> + BR2_TARGET_EDK2=y
> + """.format(infra.filepath("conf/grub2-efi.cfg"),
> + infra.filepath("conf/grub2.cfg"))
> +
> + def test_run(self):
> + exit_code = test_mount_internal_external(self.emulator,
> + self.builddir, internal=True,
> + efi=False)
> + self.assertEqual(exit_code, 0)
> +
> + exit_code = test_touch_file(self.emulator)
> + self.assertEqual(exit_code, 0)
> +
> + self.emulator.stop()
> +
> + exit_code = test_mount_internal_external(self.emulator,
> + self.builddir, internal=True,
> + efi=True)
> + self.assertEqual(exit_code, 0)
> +
> + exit_code = test_touch_file(self.emulator)
> + self.assertEqual(exit_code, 0)
> +
> +
> #
> # Syslinux
>
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2021-10-03 12:50 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 15:57 [Buildroot] [PATCH v3 0/7] Add support for ISO9660 image compatible with Legacy and EFI BIOS Kory Maincent
2021-09-23 15:57 ` [Buildroot] [PATCH v3 1/7] board, boot, package: remove usage of startup.nsh in EFI partition Kory Maincent
2021-09-23 20:06 ` Yann E. MORIN
2021-09-24 20:28 ` Erico Nunes
2021-09-27 19:28 ` Yann E. MORIN
2021-09-27 19:27 ` Yann E. MORIN
2021-09-23 15:57 ` [Buildroot] [PATCH v3 2/7] boot/grub2: add support to build multiple Grub2 configurations in the same build Kory Maincent
2021-09-27 19:42 ` Yann E. MORIN
2021-10-06 18:11 ` Yann E. MORIN
2021-10-07 8:23 ` Köry Maincent
2021-10-07 9:53 ` Yann E. MORIN
2021-10-07 12:43 ` Köry Maincent
2021-10-07 16:29 ` Yann E. MORIN
2021-10-08 8:20 ` Köry Maincent
2021-10-11 10:27 ` Köry Maincent
2021-10-14 20:02 ` Yann E. MORIN
2021-10-14 20:27 ` Yann E. MORIN
2021-10-14 20:48 ` Adam Duskett
2021-10-14 21:02 ` Yann E. MORIN
2021-10-15 9:19 ` Köry Maincent
2021-10-15 9:28 ` Thomas Petazzoni
2021-10-15 20:50 ` Yann E. MORIN
2021-10-19 16:30 ` Adam Duskett
2021-10-20 15:58 ` Köry Maincent
2021-09-23 15:57 ` [Buildroot] [PATCH v3 3/7] fs/iso9660: add support to Grub EFI bootloader in the image Kory Maincent
2021-09-27 20:43 ` Yann E. MORIN
2021-09-28 5:35 ` Yann E. MORIN
2021-09-23 15:57 ` [Buildroot] [PATCH v3 4/7] fs/iso9660: add support for hybrid image using Grub bootloader on BIOS and EFI Kory Maincent
2021-09-27 21:05 ` Yann E. MORIN
2021-09-29 8:23 ` Köry Maincent
2021-09-29 21:26 ` Yann E. MORIN
2021-09-30 9:12 ` Köry Maincent
2021-09-23 15:57 ` [Buildroot] [PATCH v3 5/7] support/testing/infra/emulator.py: update encoding when calling qemu Kory Maincent
2021-09-30 20:28 ` Yann E. MORIN
2021-10-02 20:28 ` Yann E. MORIN
2021-10-03 9:09 ` Thomas Petazzoni
2021-10-03 12:47 ` Yann E. MORIN
2021-10-04 7:47 ` Köry Maincent
2021-10-06 14:59 ` Peter Korsgaard
2021-09-23 15:57 ` [Buildroot] [PATCH v3 6/7] boot/edk2: add support to i386 architecture Kory Maincent
2021-09-30 19:51 ` Yann E. MORIN
2021-10-03 12:49 ` Yann E. MORIN
2021-10-04 10:22 ` Köry Maincent
2021-09-23 15:57 ` [Buildroot] [PATCH v3 7/7] support/testing/tests/fs/test_iso9660.py: add support to test using EFI BIOS Kory Maincent
2021-10-03 12:50 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211003125017.GJ1504958@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=kory.maincent@bootlin.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox