From: Luca Boccassi <bluca@debian.org>
Date: Mon, 24 Jun 2024 14:20:11 +0000 (+0100)
Subject: mkosi: add support for TEST_SAVE_JOURNAL to integration test wrapper
X-Git-Tag: v257-rc1~1058
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59d4970a552cbc30d7977bdc9eca756b41260875;p=thirdparty%2Fsystemd.git

mkosi: add support for TEST_SAVE_JOURNAL to integration test wrapper

Same variable and values as supported by the shell suite
---

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: