shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-25 10:04:04 +03:00
Code

test: Rename mkosi_args to mkosi-args

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/TEST-02-UNITTESTS/meson.build
View File

@ -3,7 +3,7 @@
integration_tests += [ integration_tests += [
integration_test_template + { integration_test_template + {
'name' : fs.name(meson.current_source_dir()), '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= '''--kernel-command-line-extra=
frobnicate! frobnicate!

2
test/TEST-06-SELINUX/meson.build
View File

@ -3,7 +3,7 @@
integration_tests += [ integration_tests += [
integration_test_template + { integration_test_template + {
'name' : fs.name(meson.current_source_dir()), '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' '--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. # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware.

2
test/TEST-53-ISSUE-16347/meson.build
View File

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

2
test/TEST-55-OOMD/meson.build
View File

@ -3,7 +3,7 @@
integration_tests += [ integration_tests += [
integration_test_template + { integration_test_template + {
'name' : fs.name(meson.current_source_dir()), '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') '--credential=@0@'.format(meson.current_source_dir() / 'systemd.unit-dropin.init.scope')
] ]
}, },

4
test/meson.build
View File

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