[elbe-devel] [PATCH 4/4] tests/simple-amd64-with-grub-uefi: make use of interpreter-firmware

[Thomas Weißschuh]

The firmware binary is not always called OVMF.fd.
Instead make use of the new tag <interpreter-firmware> to find a
matching firmware.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 tests/simple-amd64-with-grub-uefi.xml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/tests/simple-amd64-with-grub-uefi.xml b/tests/simple-amd64-with-grub-uefi.xml
index a224573408ca..83160477ea10 100644
--- a/tests/simple-amd64-with-grub-uefi.xml
+++ b/tests/simple-amd64-with-grub-uefi.xml
@@ -83,20 +83,13 @@ SPDX-FileCopyrightText: Linutronix GmbH
 		<check>
 			<img>sda.img.tar.gz</img>
 			<interpreter>qemu-system-x86_64</interpreter>
-
-			<!--
-			OVMF.fd might be in a different directory than
-			/usr/share/qemu on some distros.
-
-			Use the Qemu's option '-L help' to determine the list
-			of directories.  e.g. on Arch Linux, the option
-			'-L /usr/share/edk2-ovmf/x64' should be used.
-
-			This could be done using variant, but we need to
-			figure out a way to pass variants from elbe-ci to
-			elbe-check-build first.
-			-->
-			<interpreter-opts>-bios OVMF.fd -m 2G -enable-kvm -cpu host -drive format=raw,file=$ELBE_IMG -nographic</interpreter-opts>
+			<interpreter-opts>-m 2G -enable-kvm -cpu host -drive format=raw,file=$ELBE_IMG -nographic</interpreter-opts>
+			<interpreter-firmware
+				architecture="x86_64"
+				machine="pc-q35-6.0"
+				interface_types="uefi !bios"
+				features="!requires-smm"
+			/>
 
 			<action> <login /> </action>
 		</check>

-- 
2.44.0