global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 14:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

t5003: skip unzip -a tests with BusyBox

Browse Source 
BusyBox' unzip is working pretty well. But Git's tests want to abuse it
to not only extract files, but to convert their line endings on the fly,
too. BusyBox' unzip does not support that, and it would appear that
it would require rather intrusive changes.

So let's just work around this by skipping the test case that uses
`unzip -a` and the subsequent test cases expecting `unzip -a`'s output.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2017-07-05 22:58:26 +02:00
parent 2a73e24ebe
commit 8bacb46356
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
t/t5003-archive-zip.sh
View File

@@ -39,33 +39,39 @@ check_zip() {
extracted=${dir_with_prefix}a
original=a
test_expect_success UNZIP " extract ZIP archive with EOL conversion" '
test_expect_success !BUSYBOX,UNZIP \
" extract ZIP archive with EOL conversion" '
(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
'
test_expect_success UNZIP " validate that text files are converted" "
test_expect_success !BUSYBOX,UNZIP \
" validate that text files are converted" "
test_cmp_bin $extracted/text.cr $extracted/text.crlf &&
test_cmp_bin $extracted/text.cr $extracted/text.lf
"
test_expect_success UNZIP " validate that binary files are unchanged" "
test_expect_success !BUSYBOX,UNZIP \
" validate that binary files are unchanged" "
test_cmp_bin $original/binary.cr $extracted/binary.cr &&
test_cmp_bin $original/binary.crlf $extracted/binary.crlf &&
test_cmp_bin $original/binary.lf $extracted/binary.lf
"
test_expect_success UNZIP " validate that diff files are converted" "
test_expect_success !BUSYBOX,UNZIP \
" validate that diff files are converted" "
test_cmp_bin $extracted/diff.cr $extracted/diff.crlf &&
test_cmp_bin $extracted/diff.cr $extracted/diff.lf
"
test_expect_success UNZIP " validate that -diff files are unchanged" "
test_expect_success !BUSYBOX,UNZIP \
" validate that -diff files are unchanged" "
test_cmp_bin $original/nodiff.cr $extracted/nodiff.cr &&
test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf &&
test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf
"
test_expect_success UNZIP " validate that custom diff is unchanged " "
test_expect_success !BUSYBOX,UNZIP \
" validate that custom diff is unchanged " "
test_cmp_bin $original/custom.cr $extracted/custom.cr &&
test_cmp_bin $original/custom.crlf $extracted/custom.crlf &&
test_cmp_bin $original/custom.lf $extracted/custom.lf