From 59d4970a552cbc30d7977bdc9eca756b41260875 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 24 Jun 2024 15:20:11 +0100 Subject: [PATCH] mkosi: add support for TEST_SAVE_JOURNAL to integration test wrapper Same variable and values as supported by the shell suite --- test/integration-test-wrapper.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py index b6a16aa3efe..21ec00680f2 100755 --- a/test/integration-test-wrapper.py +++ b/test/integration-test-wrapper.py @@ -61,6 +61,8 @@ def main(): print(f"TEST_NO_QEMU=1, skipping {args.name}", file=sys.stderr) exit(77) + keep_journal = os.getenv("TEST_SAVE_JOURNAL", "fail") + name = args.name + (f"-{i}" if (i := os.getenv("MESON_TEST_ITERATION")) else "") dropin = textwrap.dedent( @@ -152,11 +154,10 @@ def main(): result = subprocess.run(cmd) - if result.returncode in (args.exit_code, 77): - # Do not keep journal files for tests that don't fail. - if journal_file: - journal_file.unlink(missing_ok=True) + if journal_file and (keep_journal == "0" or (result.returncode in (args.exit_code, 77) and keep_journal == "fail")): + journal_file.unlink(missing_ok=True) + if result.returncode in (args.exit_code, 77): exit(0 if result.returncode == args.exit_code else 77) if journal_file: