summaryrefslogtreecommitdiffstats
path: root/test/meson.build
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-05-12 11:13:58 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-05-14 12:43:28 +0200
commit31c797e03d2f24b9b84f1c95cc43aa8c5f35e04a (patch)
tree1001fc072c4517b348c443e5b0b33fef4bf315d8 /test/meson.build
parenttest: Generate basic testsuite services with meson (diff)
downloadsystemd-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.
Diffstat (limited to 'test/meson.build')
-rw-r--r--test/meson.build11
1 files changed, 10 insertions, 1 deletions
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 = {}