test: Rename mkosi_args to mkosi-args

This commit is contained in:
Daan De Meyer 2024-05-12 22:01:19 +02:00
parent 4ce12c3933
commit c87e243fef
5 changed files with 6 additions and 6 deletions

View file

@ -3,7 +3,7 @@
integration_tests += [
integration_test_template + {
'name' : fs.name(meson.current_source_dir()),
'mkosi_args' : integration_test_template['mkosi_args'] + [
'mkosi-args' : integration_test_template['mkosi-args'] + [
'''--kernel-command-line-extra=
frobnicate!

View file

@ -3,7 +3,7 @@
integration_tests += [
integration_test_template + {
'name' : fs.name(meson.current_source_dir()),
'mkosi_args' : integration_test_template['mkosi_args'] + [
'mkosi-args' : integration_test_template['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.

View file

@ -3,7 +3,7 @@
integration_tests += [
integration_test_template + {
'name' : fs.name(meson.current_source_dir()),
'mkosi_args' : integration_test_template['mkosi_args'] + [
'mkosi-args' : integration_test_template['mkosi-args'] + [
'--configure-script', meson.current_source_dir() / 'mkosi.configure',
],
},

View file

@ -3,7 +3,7 @@
integration_tests += [
integration_test_template + {
'name' : fs.name(meson.current_source_dir()),
'mkosi_args' : integration_test_template['mkosi_args'] + [
'mkosi-args' : integration_test_template['mkosi-args'] + [
'--credential=@0@'.format(meson.current_source_dir() / 'systemd.unit-dropin.init.scope')
]
},

View file

@ -276,7 +276,7 @@ endif
integration_test_wrapper = find_program('integration-test-wrapper.py')
integration_tests = []
integration_test_template = {
'mkosi_args' : [],
'mkosi-args' : [],
'timeout' : 1800,
'storage' : 'volatile',
'priority' : 0,
@ -380,7 +380,7 @@ foreach integration_test : integration_tests
integration_test_args += ['--slow']
endif
integration_test_args += ['--'] + integration_test['mkosi_args']
integration_test_args += ['--'] + integration_test['mkosi-args']
integration_test_env = {}