system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 18:24:38 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

test: show error messages to stderr

Browse source 
Otherwise, 'meson test' hides the messages on failure.
This commit is contained in:
Yu Watanabe 2024-01-21 14:21:12 +09:00 committed by Frantisek Sumsal
parent 1651c914df
commit 78643f26a2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/test-network-generator-conversion.sh
View file

@ -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

8
test/test-sysusers.sh.in
View file

@ -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