From 45e2145a719833019bbd95072db98af03647b797 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 17 Aug 2021 17:02:43 -0300 Subject: aux/, tests/lib.sh: Update --- tests/lib.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tests/lib.sh') 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 -- cgit v1.2.3