diff options
| author | EuAndreh <eu@euandre.org> | 2021-08-13 09:27:10 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2021-08-13 09:27:10 -0300 |
| commit | 24b0b7e479a9d0d7b7e223d8a7191490bf2d12b6 (patch) | |
| tree | b4314411a35bb6c4b88008db513cc4882b39b37b /tests/lib.sh | |
| parent | aux/workflow/l10n.sh: Support .html files (diff) | |
| download | git-permalink-24b0b7e479a9d0d7b7e223d8a7191490bf2d12b6.tar.gz git-permalink-24b0b7e479a9d0d7b7e223d8a7191490bf2d12b6.tar.xz | |
tests/lib.sh: Make error reporting consistent
Diffstat (limited to 'tests/lib.sh')
| -rwxr-xr-x | tests/lib.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/lib.sh b/tests/lib.sh index 06a5b54..527e645 100755 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -16,7 +16,8 @@ ERROR() { } print_debug_info() { - printf 'LINENO: %s\nOUT: %s\nERR: %s\n' \ + # shellcheck disable=2016 + printf 'LINENO: %s\n$OUT: %s\n$ERR: %s\n' \ "$N" "$OUT" "$ERR" >&2 } @@ -59,8 +60,8 @@ assert_empty_stderr() { assert_stream() { if [ "$(cat "$2")" != "$3" ]; then - printf '\nERR: Bad %s (%s)\n\nexpected: %s\ngot: %s\n' \ - "$1" "$2" "$3" "$(cat "$2")" >&2 + printf '\n%s: Bad %s (%s)\n\nexpected: %s\ngot: %s\n' \ + "$(ERROR)" "$1" "$2" "$3" "$(cat "$2")" >&2 print_debug_info exit 1 fi @@ -76,8 +77,8 @@ assert_stderr() { assert_grep_stream() { if ! grep -qE "$3" "$2"; then - printf '\nERR: Bad %s (%s)\n\ngrepping: %s\nin:\n%s\n' \ - "$1" "$2" "$3" "$(cat "$2")" >&2 + printf '\n%s: Bad %s (%s)\n\ngrepping: %s\nin:\n%s\n' \ + "$(ERROR)" "$1" "$2" "$3" "$(cat "$2")" >&2 print_debug_info exit 1 fi @@ -93,8 +94,8 @@ assert_grep_stderr() { assert_fgrep_stream() { if ! grep -Fq -- "$3" "$2"; then - printf '\nERR: Bad %s (%s)\n\ngrepping: %s\nin:\n%s\n' \ - "$1" "$2" "$3" "$(cat "$2")" >&2 + printf '\n%s: Bad %s (%s)\n\ngrepping: %s\nin:\n%s\n' \ + "$(ERROR)" "$1" "$2" "$3" "$(cat "$2")" >&2 print_debug_info exit 1 fi |