From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 5 May 2024 16:14:44 +0000 (+0200)
Subject: test: Default to linux qemu firmware
X-Git-Tag: v256-rc2~97^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f2c9bda495e062c34b891ca8e77ce0ec43a5012;p=thirdparty%2Fsystemd.git

test: Default to linux qemu firmware

Direct kernel boot results in much faster boot times so let's use
it by default.

We disable it for tests that need to reboot because +-50% of the
time, doing a reboot when using direct kernel boot causes qemu to
hang on reboot. Until we figure that out, let's use UEFI for the
tests that need to reboot.
---

diff --git a/test/TEST-06-SELINUX/meson.build b/test/TEST-06-SELINUX/meson.build
index 50247d3e473..a62d144048e 100644
--- a/test/TEST-06-SELINUX/meson.build
+++ b/test/TEST-06-SELINUX/meson.build
@@ -2,4 +2,6 @@
 
 test_params += {
         'mkosi_args' : ['--kernel-command-line-extra=apparmor=0 selinux=1 enforcing=0 lsm=selinux systemd.wants=autorelabel.service systemd.wants=firstboot-autorelabel.service'],
+        # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.
+        'firmware' : 'uefi',
 }
diff --git a/test/TEST-09-REBOOT/meson.build b/test/TEST-09-REBOOT/meson.build
index 7f5cc704c9d..a511a829af2 100644
--- a/test/TEST-09-REBOOT/meson.build
+++ b/test/TEST-09-REBOOT/meson.build
@@ -2,4 +2,6 @@
 
 test_params += {
         'storage': 'persistent',
+        # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.
+        'firmware' : 'uefi',
 }
diff --git a/test/TEST-18-FAILUREACTION/meson.build b/test/TEST-18-FAILUREACTION/meson.build
new file mode 100644
index 00000000000..e1bca2d7a83
--- /dev/null
+++ b/test/TEST-18-FAILUREACTION/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+test_params += {
+        # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.
+        'firmware' : 'uefi',
+}
diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index a32210c06f1..575403344e4 100755
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -48,6 +48,7 @@ def main():
     parser.add_argument('--test-name', required=True)
     parser.add_argument('--test-number', required=True)
     parser.add_argument('--storage', required=True)
+    parser.add_argument('--firmware', required=True)
     parser.add_argument('mkosi_args', nargs="*")
     args = parser.parse_args()
 
@@ -119,6 +120,7 @@ def main():
         '--runtime-network=none',
         '--runtime-scratch=no',
         '--append',
+        '--qemu-firmware', args.firmware,
         '--kernel-command-line-extra',
         ' '.join([
             'systemd.hostname=H',
diff --git a/test/meson.build b/test/meson.build
index 43314f8c794..f5c48cedba5 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -415,6 +415,7 @@ foreach test_number, dirname : integration_tests
                 'timeout' : 1800,
                 'storage' : 'volatile',
                 'priority' : 0,
+                'firmware' : 'linux',
         }
 
         # TODO: This fs.exists call isn't included in rebuild logic
@@ -430,6 +431,7 @@ foreach test_number, dirname : integration_tests
                 '--test-name', dirname,
                 '--test-number', test_number,
                 '--storage', test_params['storage'],
+                '--firmware', test_params['firmware'],
                 '--',
         ] + test_params['mkosi_args']