From aa5aac9e40b17a0571d0bf92d93e3b2ece98777a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 7 Sep 2025 13:32:51 +0900 Subject: [PATCH] test-sysusers: show diffs in stderr Otherwise, the diffs are eaten by 'meson test' command unless --verbose option is specified. --- test/test-sysusers.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-sysusers.sh.in b/test/test-sysusers.sh.in index fdeae2c8981..32189235903 100755 --- a/test/test-sysusers.sh.in +++ b/test/test-sysusers.sh.in @@ -35,12 +35,12 @@ preprocess() { } compare() { - if ! diff -u "$TESTDIR/etc/passwd" <(preprocess "$1.expected-passwd" "$3"); then + if ! diff -u "$TESTDIR/etc/passwd" <(preprocess "$1.expected-passwd" "$3") >&2; then echo >&2 "**** Unexpected output for $f $2" exit 1 fi - if ! diff -u "$TESTDIR/etc/group" <(preprocess "$1.expected-group" "$3"); then + if ! diff -u "$TESTDIR/etc/group" <(preprocess "$1.expected-group" "$3") >&2; then echo >&2 "**** Unexpected output for $f $2" exit 1 fi @@ -167,7 +167,7 @@ for f in $(find "$SOURCE"/unhappy-*.input | sort -V); do prepare_testdir "${f%.input}" cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf" SYSTEMD_LOG_LEVEL=info "$SYSUSERS" --root="$TESTDIR" 2>&1 | tail -n1 | sed -r 's/^[^:]+:[^:]+://' >"$TESTDIR/err" - if ! diff -u "$TESTDIR/err" "${f%.*}.expected-err"; then + if ! diff -u "$TESTDIR/err" "${f%.*}.expected-err" >&2; then echo >&2 "**** Unexpected error output for $f" cat >&2 "$TESTDIR/err" exit 1 -- 2.47.3