From 028cad9149b2dc6f27ee4d5680582fcdfb3299db 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: md5sum: fix false failures on cygwin * tests/misc/md5sum-newline.pl: Avoid binary '*' tags when comparing checksums. * tests/misc/md5sum-bsd.sh: Avoid binary '*' tags so that we correctly trigger the ambiguity test. Reported by Bruno Haible --- tests/misc/md5sum-bsd.sh | 2 +- tests/misc/md5sum-newline.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/misc/md5sum-bsd.sh b/tests/misc/md5sum-bsd.sh index 8ff4a9a715..57188e8630 100755 --- a/tests/misc/md5sum-bsd.sh +++ b/tests/misc/md5sum-bsd.sh @@ -28,7 +28,7 @@ print_ver_ md5sum # I.e., one not starting with ' ' or '*' for i in 'a' ' b' '*c' 'dd' ' '; do echo "$i" > "$i" - md5sum "$i" >> check.md5sum || fail=1 + md5sum --text "$i" >> check.md5sum || fail=1 done sed 's/ / /' check.md5sum > check.md5 diff --git a/tests/misc/md5sum-newline.pl b/tests/misc/md5sum-newline.pl index 4997c2198e..a89b3ca7c1 100755 --- a/tests/misc/md5sum-newline.pl +++ b/tests/misc/md5sum-newline.pl @@ -35,7 +35,7 @@ my $z = '--zero'; my @Tests = ( ['newline', $t, {IN=> {"a\nb"=> ''}}, {OUT=>"\\$degenerate a\\nb\n"}], - ['zero', $z, {IN=> {"a\nb"=> ''}}, {OUT=>"$degenerate a\nb\0"}], + ['zero', "$t $z", {IN=> {"a\nb"=> ''}}, {OUT=>"$degenerate a\nb\0"}], ); my $save_temps = $ENV{DEBUG}; -- 2.47.2