undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5300-pack-object: do not compare binary data using test_cmp

Browse Source 
Users may set test_cmp to a comparison tool of their liking. The intent is
that the tool performs comparison of line-oriented texts. However, t5300
uses it also to compare binary data. Change those tests to use 'cmp'.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt 2013-10-26 21:17:14 +02:00 committed by Junio C Hamano
parent 3d092bfc6f
commit ce1a0473e8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t5300-pack-object.sh
View File

@ -151,7 +151,7 @@ test_expect_success \
git cat-file $t $object || return 1 git cat-file $t $object || return 1
done <obj-list done <obj-list
} >current && } >current &&
test_cmp expect current' cmp expect current'
test_expect_success \ test_expect_success \
'use packed deltified (REF_DELTA) objects' \ 'use packed deltified (REF_DELTA) objects' \
@ -166,7 +166,7 @@ test_expect_success \
git cat-file $t $object || return 1 git cat-file $t $object || return 1
done <obj-list done <obj-list
} >current && } >current &&
test_cmp expect current' cmp expect current'
test_expect_success \ test_expect_success \
'use packed deltified (OFS_DELTA) objects' \ 'use packed deltified (OFS_DELTA) objects' \
@ -181,7 +181,7 @@ test_expect_success \
git cat-file $t $object || return 1 git cat-file $t $object || return 1
done <obj-list done <obj-list
} >current && } >current &&
test_cmp expect current' cmp expect current'
unset GIT_OBJECT_DIRECTORY unset GIT_OBJECT_DIRECTORY
@ -195,9 +195,9 @@ test_expect_success 'survive missing objects/pack directory' '
rm -fr $GOP && rm -fr $GOP &&
git index-pack --stdin --keep=test <../test-3-${packname_3}.pack && git index-pack --stdin --keep=test <../test-3-${packname_3}.pack &&
test -f $GOP/pack-${packname_3}.pack && test -f $GOP/pack-${packname_3}.pack &&
test_cmp $GOP/pack-${packname_3}.pack ../test-3-${packname_3}.pack && cmp $GOP/pack-${packname_3}.pack ../test-3-${packname_3}.pack &&
test -f $GOP/pack-${packname_3}.idx && test -f $GOP/pack-${packname_3}.idx &&
test_cmp $GOP/pack-${packname_3}.idx ../test-3-${packname_3}.idx && cmp $GOP/pack-${packname_3}.idx ../test-3-${packname_3}.idx &&
test -f $GOP/pack-${packname_3}.keep test -f $GOP/pack-${packname_3}.keep
) )
' '