test: Rename mkosi_args to mkosi-args

diff --git a/test/TEST-02-UNITTESTS/meson.build b/test/TEST-02-UNITTESTS/meson.build
index 89a3edf2ad283ae60278b0fc80e562f349a73482..8da5555842848909a9295a2b61675f4b06a57613 100644 (file)
--- 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 e3cf0030c503277f3dd13763534d4b09891ff9ac..5376f943c2317d9a7f593e83294577293fd29ea1 100644 (file)
--- 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 91b6f4227479519796638751d36ef25a296b6c63..8d6df66cb06ca6f5dc8d7787f6e24bac6c890580 100644 (file)
--- 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 132a6b30808530453db69beb1c2dad2d39bcba6d..9aef9165cfda3a24954109f329b7b5e96cb9d026 100644 (file)
--- 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 4a7931ab1e95be6b82b24b9e5e8fe304535d8787..6cf431904e3027991574bac1cb4461d92d631580 100644 (file)
--- 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 = {}