diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-05-12 22:01:19 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-05-14 12:43:28 +0200 |
| commit | c87e243fef196f7e44fd597169f45269e9a0ccc7 (patch) | |
| tree | d94b1558d7f282e9d45a0d5750a95fc1e483527f | |
| parent | test: Disable tests via 'enabled' field (diff) | |
| download | systemd-c87e243fef196f7e44fd597169f45269e9a0ccc7.tar.xz systemd-c87e243fef196f7e44fd597169f45269e9a0ccc7.zip | |
test: Rename mkosi_args to mkosi-args
| -rw-r--r-- | test/TEST-02-UNITTESTS/meson.build | 2 | ||||
| -rw-r--r-- | test/TEST-06-SELINUX/meson.build | 2 | ||||
| -rw-r--r-- | test/TEST-53-ISSUE-16347/meson.build | 2 | ||||
| -rw-r--r-- | test/TEST-55-OOMD/meson.build | 2 | ||||
| -rw-r--r-- | test/meson.build | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/test/TEST-02-UNITTESTS/meson.build b/test/TEST-02-UNITTESTS/meson.build index 89a3edf2ad..8da5555842 100644 --- a/test/TEST-02-UNITTESTS/meson.build +++ b/test/TEST-02-UNITTESTS/meson.build @@ -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! diff --git a/test/TEST-06-SELINUX/meson.build b/test/TEST-06-SELINUX/meson.build index e3cf0030c5..5376f943c2 100644 --- a/test/TEST-06-SELINUX/meson.build +++ b/test/TEST-06-SELINUX/meson.build @@ -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. diff --git a/test/TEST-53-ISSUE-16347/meson.build b/test/TEST-53-ISSUE-16347/meson.build index 91b6f42274..8d6df66cb0 100644 --- a/test/TEST-53-ISSUE-16347/meson.build +++ b/test/TEST-53-ISSUE-16347/meson.build @@ -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', ], }, diff --git a/test/TEST-55-OOMD/meson.build b/test/TEST-55-OOMD/meson.build index 132a6b3080..9aef9165cf 100644 --- a/test/TEST-55-OOMD/meson.build +++ b/test/TEST-55-OOMD/meson.build @@ -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') ] }, diff --git a/test/meson.build b/test/meson.build index 4a7931ab1e..6cf431904e 100644 --- a/test/meson.build +++ b/test/meson.build @@ -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 = {} |