diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh index 09516d11f5..507dace514 100755 --- a/test/TEST-04-JOURNAL/test.sh +++ b/test/TEST-04-JOURNAL/test.sh @@ -14,10 +14,6 @@ test_append_files() { cp -av "${TEST_BASE_DIR:?}/test-journals/"* "$workspace/test-journals/" inst_binary unzstd - - ( - command -v logger >/dev/null 2>&1 && inst_binary logger - ) } do_test "$@" diff --git a/test/units/testsuite-04.journal.sh b/test/units/testsuite-04.journal.sh index 58c3661391..5e8a0235c5 100755 --- a/test/units/testsuite-04.journal.sh +++ b/test/units/testsuite-04.journal.sh @@ -52,15 +52,13 @@ grep -q '^PRIORITY=6$' /tmp/output (! grep '^SYSLOG_FACILITY=' /tmp/output) # --truncate shows only first line, skip under asan due to logger -if [ -z "${ASAN_OPTIONS+x}${UBSAN_OPTIONS+x}" ] && command -v logger >/dev/null 2>&1 ;then - ID=$(journalctl --new-id128 | sed -n 2p) - logger -t "$ID" $'HEAD\nTAIL\nTAIL' - journalctl --sync - journalctl -q -b -t "$ID" | grep -q HEAD - journalctl -q -b -t "$ID" | grep -q TAIL - journalctl -q -b -t "$ID" --truncate-newline | grep -q HEAD - journalctl -q -b -t "$ID" --truncate-newline | grep -q -v TAIL -fi +ID="$(systemd-id128 new)" +echo -e 'HEAD\nTAIL\nTAIL' | systemd-cat -t "$ID" +journalctl --sync +journalctl -b -t "$ID" | grep -q HEAD +journalctl -b -t "$ID" | grep -q TAIL +journalctl -b -t "$ID" --truncate-newline | grep -q HEAD +journalctl -b -t "$ID" --truncate-newline | grep -q -v TAIL # '-b all' negates earlier use of -b (-b and -m are otherwise exclusive) journalctl -b -1 -b all -m >/dev/null