| Message ID | 20241031213348.2057705-9-ju.o@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | *** Fixes for qemu_aarch64_sbsa_defconfig *** | expand |
Hello Julien, Le 31/10/2024 à 22:33, Julien Olivain a écrit : > The EDK2 bump to stable202405 introduced an incompatibility with the > Qemu version 5.2.0 present in the reference Docker image. For that > reason, this test was disabled. > > This commit enables host-qemu in the build, to be used by the runtime > test infrastructure. > > Since this commit switch to a more recent host-qemu, it also removes > firmware options to workaround old qemu bugs. > > Those changes are fixing this test, which is why this commit re-enables > it by removing the skipTest() invocation. > > Signed-off-by: Julien Olivain <ju.o@free.fr> Same question about neoverse-n1. Reviewed-by: Romain Naour <romain.naour@smile.fr> Best regards, Romain > --- > support/testing/tests/boot/test_grub.py | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py > index 41234de2b9..c753a16c34 100644 > --- a/support/testing/tests/boot/test_grub.py > +++ b/support/testing/tests/boot/test_grub.py > @@ -153,13 +153,11 @@ class TestGrubAArch64EFI(infra.basetest.BRTest): > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > + BR2_PACKAGE_HOST_QEMU=y > + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y > """.format(post_image=infra.filepath("tests/boot/test_grub/post-image-aarch64-efi.sh"), > linux_fragment=infra.filepath("tests/boot/test_grub/linux-aarch64-efi.config")) > > - def setUp(self): > - self.skipTest("Incompatible QEmu 5.2.0 (Docker image) / " > - "EDK2 (stable202405) versions.") > - > def test_run(self): > hda = os.path.join(self.builddir, "images", "disk.img") > bios = os.path.join(self.builddir, "images", "QEMU_EFI.fd")
Hi Romain, Thanks for the review. On 31/10/2024 23:12, Romain Naour wrote: > Hello Julien, > > Le 31/10/2024 à 22:33, Julien Olivain a écrit : >> The EDK2 bump to stable202405 introduced an incompatibility with the >> Qemu version 5.2.0 present in the reference Docker image. For that >> reason, this test was disabled. >> >> This commit enables host-qemu in the build, to be used by the runtime >> test infrastructure. >> >> Since this commit switch to a more recent host-qemu, it also removes >> firmware options to workaround old qemu bugs. >> >> Those changes are fixing this test, which is why this commit >> re-enables >> it by removing the skipTest() invocation. >> >> Signed-off-by: Julien Olivain <ju.o@free.fr> > > Same question about neoverse-n1. I think this specific test can stay as it is. Compared to test_edk2 and test_fwts, this test does not use SBSA (it does not select BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y). It is "just" EFI. So I believe it can stay with cortex-a53. > Reviewed-by: Romain Naour <romain.naour@smile.fr> > > Best regards, > Romain Best regards, Julien.
diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 41234de2b9..c753a16c34 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -153,13 +153,11 @@ class TestGrubAArch64EFI(infra.basetest.BRTest): BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """.format(post_image=infra.filepath("tests/boot/test_grub/post-image-aarch64-efi.sh"), linux_fragment=infra.filepath("tests/boot/test_grub/linux-aarch64-efi.config")) - def setUp(self): - self.skipTest("Incompatible QEmu 5.2.0 (Docker image) / " - "EDK2 (stable202405) versions.") - def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "QEMU_EFI.fd")
The EDK2 bump to stable202405 introduced an incompatibility with the Qemu version 5.2.0 present in the reference Docker image. For that reason, this test was disabled. This commit enables host-qemu in the build, to be used by the runtime test infrastructure. Since this commit switch to a more recent host-qemu, it also removes firmware options to workaround old qemu bugs. Those changes are fixing this test, which is why this commit re-enables it by removing the skipTest() invocation. Signed-off-by: Julien Olivain <ju.o@free.fr> --- support/testing/tests/boot/test_grub.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)