From 027ddcbff65bb9dc1799d89fc140a33e81d35421 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 29 Oct 2024 21:54:49 +0100 Subject: [PATCH] support/testing: test_fwts: update and re-enable the test 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 updates ATF to 2.11, and enables host-qemu in the build, to be used by the runtime test infrastructure. Those changes are fixing this test, which is why this commit re-enables it by removing the skipTest() invocation. Signed-off-by: Julien Olivain Reviewed-by: Romain Naour Signed-off-by: Romain Naour --- support/testing/tests/package/test_fwts.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/package/test_fwts.py b/support/testing/tests/package/test_fwts.py index 2c9873ee54..5b79a17e33 100644 --- a/support/testing/tests/package/test_fwts.py +++ b/support/testing/tests/package/test_fwts.py @@ -26,7 +26,7 @@ class TestFwts(infra.basetest.BRTest): BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_PACKAGE_FWTS=y @@ -34,12 +34,10 @@ class TestFwts(infra.basetest.BRTest): BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """ - 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") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd")