diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:45 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:45 +0000 |
| commit | efeb864cb547a2cbf96dc0053a8bdb4d9190b364 (patch) | |
| tree | c0b83368f18be983fcc763200c4c24d633244588 /test/test-network-generator-conversion.sh | |
| parent | Releasing progress-linux version 255.5-1~progress7.99u1. (diff) | |
| download | systemd-efeb864cb547a2cbf96dc0053a8bdb4d9190b364.tar.xz systemd-efeb864cb547a2cbf96dc0053a8bdb4d9190b364.zip | |
Merging upstream version 256.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'test/test-network-generator-conversion.sh')
| -rwxr-xr-x | test/test-network-generator-conversion.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test-network-generator-conversion.sh b/test/test-network-generator-conversion.sh index 9a4732c..12254ac 100755 --- a/test/test-network-generator-conversion.sh +++ b/test/test-network-generator-conversion.sh @@ -49,15 +49,15 @@ run_network_generator() { rm -rf "${WORK_DIR:?}"/* stderr="$WORK_DIR/stderr" - if ! "$GENERATOR_BIN" --root "$WORK_DIR" 2>"$stderr"; then + if ! SYSTEMD_LOG_LEVEL="info" "$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 |