log: Prefer logging to CLI unless JOURNAL_STREAM is set

This commit is contained in:
Daan De Meyer
2020-06-22 14:23:48 +02:00
committed by Lennart Poettering
parent 7830b5c103
commit bc694c06e6
2 changed files with 29 additions and 6 deletions
+1 -3
View File
@@ -115,9 +115,7 @@ test_run() {
echo "*** Running test $f"
prepare_testdir ${f%.input}
cp $f $TESTDIR/usr/lib/sysusers.d/test.conf
systemd-sysusers --root=$TESTDIR 2> /dev/null
journalctl --sync
journalctl -t systemd-sysusers -o cat | tail -n1 > $TESTDIR/tmp/err
systemd-sysusers --root=$TESTDIR 2>&1 | tail -n1 > $TESTDIR/tmp/err
if ! diff -u $TESTDIR/tmp/err ${f%.*}.expected-err; then
echo "**** Unexpected error output for $f"
cat $TESTDIR/tmp/err