From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 19 May 2023 15:37:17 +0000 (+0200)
Subject: test: check if we can use --merge with --follow
X-Git-Tag: v254-rc1~432^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c11c50a53f677f3977f3144b9fc5f02a3516de9f;p=thirdparty%2Fsystemd.git

test: check if we can use --merge with --follow

Provides coverage for #24565.
---

diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh
index 3c4c8afd538..6ed41f24ea5 100755
--- a/test/units/testsuite-04.sh
+++ b/test/units/testsuite-04.sh
@@ -154,8 +154,12 @@ sleep 3
 [[ ! -f "/tmp/i-lose-my-logs" ]]
 systemctl stop forever-print-hola
 
+set +o pipefail
 # https://github.com/systemd/systemd/issues/15528
-journalctl --follow --file=/var/log/journal/*/* | head -n1 || [[ $? -eq 1 ]]
+journalctl --follow --file=/var/log/journal/*/* | head -n1 | grep .
+# https://github.com/systemd/systemd/issues/24565
+journalctl --follow --merge | head -n1 | grep .
+set -o pipefail
 
 add_logs_filtering_override() {
     local unit="${1:?}"