mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
test: Make journal storage configurable per test and make persistent for TEST-09-JOURNAL
Also fix a bug in the logic since it's 'volatile' and not 'runtime'.
This commit is contained in:
5
test/TEST-09-REBOOT/meson.build
Normal file
5
test/TEST-09-REBOOT/meson.build
Normal file
@@ -0,0 +1,5 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
test_params = test_params + {
|
||||
'storage': 'persistent',
|
||||
}
|
||||
@@ -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',
|
||||
]
|
||||
|
||||
@@ -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']
|
||||
|
||||
|
||||
Reference in New Issue
Block a user