mirror of
https://github.com/morgan9e/systemd
synced 2026-04-15 00:47:10 +09:00
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.
This commit is contained in:
@@ -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',
|
||||
}
|
||||
|
||||
@@ -2,4 +2,6 @@
|
||||
|
||||
test_params += {
|
||||
'storage': 'persistent',
|
||||
# FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.
|
||||
'firmware' : 'uefi',
|
||||
}
|
||||
|
||||
6
test/TEST-18-FAILUREACTION/meson.build
Normal file
6
test/TEST-18-FAILUREACTION/meson.build
Normal file
@@ -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',
|
||||
}
|
||||
@@ -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',
|
||||
|
||||
@@ -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']
|
||||
|
||||
|
||||
Reference in New Issue
Block a user