diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-05-12 11:13:58 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-05-14 12:43:28 +0200 |
| commit | 31c797e03d2f24b9b84f1c95cc43aa8c5f35e04a (patch) | |
| tree | 1001fc072c4517b348c443e5b0b33fef4bf315d8 | |
| parent | test: Generate basic testsuite services with meson (diff) | |
| download | systemd-31c797e03d2f24b9b84f1c95cc43aa8c5f35e04a.tar.xz systemd-31c797e03d2f24b9b84f1c95cc43aa8c5f35e04a.zip | |
test: Add cmdline field to configure extra kernel command line args
Configuring extra cmdline arguments as a list is much nicer than
having to pass the --kernel-command-line-extra argument manually.
| -rw-r--r-- | test/TEST-02-UNITTESTS/meson.build | 11 | ||||
| -rw-r--r-- | test/TEST-06-SELINUX/meson.build | 4 | ||||
| -rw-r--r-- | test/meson.build | 11 |
3 files changed, 16 insertions, 10 deletions
diff --git a/test/TEST-02-UNITTESTS/meson.build b/test/TEST-02-UNITTESTS/meson.build index 8da5555842..b0003391b5 100644 --- a/test/TEST-02-UNITTESTS/meson.build +++ b/test/TEST-02-UNITTESTS/meson.build @@ -3,15 +3,14 @@ integration_tests += [ integration_test_template + { 'name' : fs.name(meson.current_source_dir()), - 'mkosi-args' : integration_test_template['mkosi-args'] + [ - '''--kernel-command-line-extra= - -frobnicate! + 'cmdline' : integration_test_template['cmdline'] + [ + ''' systemd.setenv=TEST_CMDLINE_NEWLINE=foo + ''', + ''' systemd.setenv=TEST_CMDLINE_NEWLINE=bar - -''', + ''', ], }, ] diff --git a/test/TEST-06-SELINUX/meson.build b/test/TEST-06-SELINUX/meson.build index ec4b502b94..dd1dfb0baf 100644 --- a/test/TEST-06-SELINUX/meson.build +++ b/test/TEST-06-SELINUX/meson.build @@ -3,9 +3,7 @@ integration_tests += [ integration_test_template + { 'name' : fs.name(meson.current_source_dir()), - 'mkosi-args' : integration_test_template['mkosi-args'] + [ - '--kernel-command-line-extra=selinux=1 lsm=selinux' - ], + 'cmdline' : integration_test_template['cmdline'] + ['selinux=1', 'lsm=selinux'], # FIXME; Figure out why reboot sometimes hangs with 'linux' firmware. 'firmware' : 'uefi', }, diff --git a/test/meson.build b/test/meson.build index fab802a66d..61aa01089a 100644 --- a/test/meson.build +++ b/test/meson.build @@ -287,6 +287,7 @@ integration_test_template = { 'memory-accounting' : 'no', 'command' : testdata_dir / 'units/%N.sh', }, + 'cmdline' : [], } testdata_subdirs = [ 'auxv', @@ -399,7 +400,15 @@ foreach integration_test : integration_tests integration_test_args += ['--slow'] endif - integration_test_args += ['--'] + integration_test['mkosi-args'] + integration_test_args += ['--'] + + if integration_test['cmdline'].length() > 0 + integration_test_args += [ + '--kernel-command-line-extra=@0@'.format(' '.join(integration_test['cmdline'])) + ] + endif + + integration_test_args += integration_test['mkosi-args'] integration_test_env = {} |