From 2122ceba8e3da8a04e40dc168d736af0c09a3930 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Mon, 11 Apr 2022 15:37:04 +0100 Subject: [PATCH] tests: b2sum.sh: fix false failure on cygwin * tests/misc/b2sum.sh: Avoid binary '*' tags when comparing checksums. Reported by Bruno Haible --- tests/misc/b2sum.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/misc/b2sum.sh b/tests/misc/b2sum.sh index 1602aec89..30897021d 100755 --- a/tests/misc/b2sum.sh +++ b/tests/misc/b2sum.sh @@ -41,8 +41,9 @@ $prog --strict -c openssl.b2sum || fail=1 rm -f check.vals || framework_failure_ # Ensure we can check non tagged format [ "$prog" != 'b2sum' ] && tag_opt='--untagged' || tag_opt='' +[ "$prog" == 'b2sum' ] && text_opt='--text' || text_opt='' for l in 0 128; do - $prog $tag_opt -l $l /dev/null | tee -a check.vals > check.b2sum + $prog $tag_opt $text_opt -l $l /dev/null | tee -a check.vals > check.b2sum $prog -l $l --strict -c check.b2sum || fail=1 $prog --strict -c check.b2sum || fail=1 done @@ -50,7 +51,8 @@ done # Ensure the checksum values are correct. The reference # check.vals was created with the upstream SSE reference implementation. [ "$prog" != 'b2sum' ] && tag_opt='--untagged' || tag_opt='' -$prog $tag_opt --length=128 check.vals > out || fail=1 +$prog $tag_opt --length=128 check.vals > out.tmp || fail=1 +tr '*' ' ' < out.tmp > out || framework_failure_ # Remove binary tag on cygwin printf '%s\n' '796485dd32fe9b754ea5fd6c721271d9 check.vals' > exp compare exp out || fail=1 -- 2.11.4.GIT