Re: [PATCH] t9300: use cmp instead of test_cmp to compare binary files
- From
Thomas Braun <thomas.braun@virtuell-zuhause.de>
- Date
- Sep 12, 2014, 18:14 UTC
- Message-ID
- <54133812.2050002@virtuell-zuhause.de>
- In-Reply-To
- <xmqq1trgbu0p.fsf@gitster.dls.corp.google.com>
Am 12.09.2014 um 19:58 schrieb Junio C Hamano:
Show 32 quoted lines
> Johannes Sixt <j6t@kdbg.org> writes: > >> test_cmp is intended to produce diff output for human consumption. The >> input in one instance in t9300-fast-import.sh are binary files, however. >> Use cmp to compare the files. > > Thanks. > >> >> This was noticed because on Windows we have a special implementation of >> test_cmp in pure bash code (to ignore differences due to intermittent CR >> in actual output), and bash runs into an infinite loop due to the binary >> nature of the input. >> >> Signed-off-by: Johannes Sixt <j6t@kdbg.org> >> --- >> t/t9300-fast-import.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh >> index 99f5161..4b13170 100755 >> --- a/t/t9300-fast-import.sh >> +++ b/t/t9300-fast-import.sh >> @@ -2687,7 +2687,7 @@ test_expect_success 'R: verify created pack' ' >> test_expect_success \ >> 'R: verify written objects' \ >> 'git --git-dir=R/.git cat-file blob big-file:big1 >actual && >> - test_cmp expect actual && >> + cmp expect actual && >> a=$(git --git-dir=R/.git rev-parse big-file:big1) && >> b=$(git --git-dir=R/.git rev-parse big-file:big2) && >> test $a = $b'
May I suggest to use test_cmp_bin instead of plain cmp? test_cmp_bin was introduced in b93e6e36 (t5000, t5003: do not use test_cmp to compare binary files, 2014-06-04) and by default is plain cmp.