From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 14 Dec 2023 10:36:52 +0000 (+0100)
Subject: test: forward journal messages to console during sd-bsod tests
X-Git-Tag: v256-rc1~1483^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f7c876bdc;p=thirdparty%2Fsystemd.git

test: forward journal messages to console during sd-bsod tests

Since we nuke the journal multiple times during that, which makes
potential fails undebugable.
---

diff --git a/test/units/testsuite-04.bsod.sh b/test/units/testsuite-04.bsod.sh
index 8f5ff5f35c8..1de446bc124 100755
--- a/test/units/testsuite-04.bsod.sh
+++ b/test/units/testsuite-04.bsod.sh
@@ -22,6 +22,9 @@ at_exit() {
         journalctl --flush
     fi
 
+    rm -f /run/systemd/journald.conf.d/99-forward-to-console.conf
+    systemctl restart systemd-journald
+
     return 0
 }
 
@@ -49,7 +52,12 @@ vcs_dump_and_check() {
 # current boot, let's temporarily overmount /var/log/journal with a tmpfs,
 # as we're going to wipe it multiple times, but we need to keep the original
 # journal intact for the other tests to work correctly.
+#
+# Also, since we'll eventually lose the journal from this test, let's temporarily
+# forward everything to console, to make potential fails debug-able.
 trap at_exit EXIT
+mkdir -p /run/systemd/journald.conf.d/
+echo -ne '[Journal]\nForwardToConsole=yes' >/run/systemd/journald.conf.d/99-forward-to-console.conf
 mount -t tmpfs tmpfs /var/log/journal
 systemctl restart systemd-journald