]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-sysusers: show diffs in stderr
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 7 Sep 2025 04:32:51 +0000 (13:32 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 17 Sep 2025 13:20:42 +0000 (22:20 +0900)
Otherwise, the diffs are eaten by 'meson test' command unless --verbose
option is specified.

test/test-sysusers.sh.in

index fdeae2c8981f5b197ee9a141ce334da5bccbc527..321892359030258140e55b902a139e5a2a85fd3e 100755 (executable)
@@ -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