test: Make journal storage configurable per test and make persistent for TEST-09...

Also fix a bug in the logic since it's 'volatile' and not 'runtime'.

diff --git a/test/TEST-09-REBOOT/meson.build b/test/TEST-09-REBOOT/meson.build
new file mode 100644 (file)
index 0000000..30a5a10
--- /dev/null
+++ b/test/TEST-09-REBOOT/meson.build
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+test_params = test_params + {
+        'storage': 'persistent',
+}

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 0d3e4abde7b0de8a2b2bec28bd6c1718358f2364..1954d0fec0c4bd9043cc1245eb103d461c980d98 100755 (executable)
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -47,6 +47,7 @@ def main():
     parser.add_argument('--meson-build-dir', required=True, type=Path)
     parser.add_argument('--test-name', required=True)
     parser.add_argument('--test-number', required=True)
+    parser.add_argument('--storage', required=True)
     parser.add_argument('mkosi_args', nargs="*")
     args = parser.parse_args()
 
@@ -119,7 +120,7 @@ def main():
                 else []
             ),
         ]),
-        '--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else 'runtime'}" ,
+        '--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}" ,
         *args.mkosi_args,
         'qemu',
     ]

diff --git a/test/meson.build b/test/meson.build
index 235c68ae29c565bb48f1bfc76277312667545b29..289f564e1efcf560979fb28fe16976cb10dc984e 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -375,6 +375,7 @@ foreach test_number, dirname : integration_tests
         test_params = {
                 'mkosi_args' : [],
                 'timeout' : 600,
+                'storage': 'volatile',
         }
 
         # TODO: This fs.exists call isn't included in rebuild logic
@@ -389,6 +390,7 @@ foreach test_number, dirname : integration_tests
                 '--meson-build-dir', meson.project_build_root(),
                 '--test-name', dirname,
                 '--test-number', test_number,
+                '--storage', test_params['storage'],
                 '--',
         ] + test_params['mkosi_args']