From: Daniel Axtens <dja@axtens.net>
Date: Thu, 21 Apr 2022 05:24:13 +0000 (+1000)
Subject: tests: Only pass SeaBIOS fw_opt for x86 non-EFI platforms
X-Git-Tag: grub-2.12-rc1~330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=188d2ff1c3a5d72220bb599e0d95e0f752bae7e9;p=thirdparty%2Fgrub.git

tests: Only pass SeaBIOS fw_opt for x86 non-EFI platforms

This breaks the tests on pseries - just restrict it to x86 platforms
that don't specify an EFI.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 33590baeb..4828afb7c 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -376,7 +376,11 @@ if test -z "$debug"; then
   # workaround unfortunately causes qemu to issue a warning 'externally
   # provided fw_cfg item names should be prefixed with "opt/"', but there
   # doesn't seem to be a better option.
-  qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
+  #
+  # SeaBIOS is used for i386, except on EFI.
+  if [ ${grub_modinfo_target_cpu} == 'i386' ] && [ ${grub_modinfo_platform} != 'efi' ]; then
+    qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
+  fi
 fi
 
 if [ x$boot != xnet ] && [ x$boot != xemu ]; then