From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 21 Jan 2024 05:21:12 +0000 (+0900)
Subject: test: show error messages to stderr
X-Git-Tag: v256-rc1~906
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78643f26a2e6e74af80ec35e8dea9ec4742e686e;p=thirdparty%2Fsystemd.git

test: show error messages to stderr

Otherwise, 'meson test' hides the messages on failure.
---

diff --git a/test/test-network-generator-conversion.sh b/test/test-network-generator-conversion.sh
index 9a4732c981d..0a5fa4d22e7 100755
--- a/test/test-network-generator-conversion.sh
+++ b/test/test-network-generator-conversion.sh
@@ -51,13 +51,13 @@ run_network_generator() {
     stderr="$WORK_DIR/stderr"
     if ! "$GENERATOR_BIN" --root "$WORK_DIR" 2>"$stderr"; then
         echo >&2 "Generator failed when parsing $SYSTEMD_PROC_CMDLINE"
-        cat "$stderr"
+        cat >&2 "$stderr"
         return 1
     fi
 
     if [[ -s "$stderr" ]]; then
         echo >&2 "Generator generated unexpected messages on stderr"
-        cat "$stderr"
+        cat >&2 "$stderr"
         return 1
     fi
 
@@ -226,7 +226,7 @@ for f in "$TEST_DATA"/test-*.input; do
     "$GENERATOR_BIN" --root "$out" -- $(cat "$f")
 
     if ! diff -u "$out/run/systemd/network" "${f%.input}.expected"; then
-        echo "**** Unexpected output for $f"
+        echo >&2 "**** Unexpected output for $f"
         exit 1
     fi
 
diff --git a/test/test-sysusers.sh.in b/test/test-sysusers.sh.in
index 5d66c6776d2..a66e33be278 100755
--- a/test/test-sysusers.sh.in
+++ b/test/test-sysusers.sh.in
@@ -36,12 +36,12 @@ preprocess() {
 
 compare() {
     if ! diff -u "$TESTDIR/etc/passwd" <(preprocess "$1.expected-passwd" "$3"); then
-        echo "**** Unexpected output for $f $2"
+        echo >&2 "**** Unexpected output for $f $2"
         exit 1
     fi
 
     if ! diff -u "$TESTDIR/etc/group" <(preprocess "$1.expected-group" "$3"); then
-        echo "**** Unexpected output for $f $2"
+        echo >&2 "**** Unexpected output for $f $2"
         exit 1
     fi
 }
@@ -168,8 +168,8 @@ for f in $(find "$SOURCE"/unhappy-*.input | sort -V); do
     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
     $SYSUSERS --root="$TESTDIR" 2>&1 | tail -n1 | sed -r 's/^[^:]+:[^:]+://' >"$TESTDIR/err"
     if ! diff -u "$TESTDIR/err"  "${f%.*}.expected-err"; then
-        echo "**** Unexpected error output for $f"
-        cat "$TESTDIR/err"
+        echo >&2 "**** Unexpected error output for $f"
+        cat >&2 "$TESTDIR/err"
         exit 1
     fi
 done