Skip to content

Commit 0ac432f

Browse files
dschoGit for Windows Build Agent
authored andcommitted
t5003: skip unzip -a tests with BusyBox
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 <[email protected]>
1 parent 8f26601 commit 0ac432f

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

t/t5003-archive-zip.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,39 @@ check_zip() {
3939
extracted=${dir_with_prefix}a
4040
original=a
4141

42-
test_expect_success UNZIP " extract ZIP archive with EOL conversion" '
42+
test_expect_success !BUSYBOX,UNZIP \
43+
" extract ZIP archive with EOL conversion" '
4344
(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
4445
'
4546

46-
test_expect_success UNZIP " validate that text files are converted" "
47+
test_expect_success !BUSYBOX,UNZIP \
48+
" validate that text files are converted" "
4749
test_cmp_bin $extracted/text.cr $extracted/text.crlf &&
4850
test_cmp_bin $extracted/text.cr $extracted/text.lf
4951
"
5052

51-
test_expect_success UNZIP " validate that binary files are unchanged" "
53+
test_expect_success !BUSYBOX,UNZIP \
54+
" validate that binary files are unchanged" "
5255
test_cmp_bin $original/binary.cr $extracted/binary.cr &&
5356
test_cmp_bin $original/binary.crlf $extracted/binary.crlf &&
5457
test_cmp_bin $original/binary.lf $extracted/binary.lf
5558
"
5659

57-
test_expect_success UNZIP " validate that diff files are converted" "
60+
test_expect_success !BUSYBOX,UNZIP \
61+
" validate that diff files are converted" "
5862
test_cmp_bin $extracted/diff.cr $extracted/diff.crlf &&
5963
test_cmp_bin $extracted/diff.cr $extracted/diff.lf
6064
"
6165

62-
test_expect_success UNZIP " validate that -diff files are unchanged" "
66+
test_expect_success !BUSYBOX,UNZIP \
67+
" validate that -diff files are unchanged" "
6368
test_cmp_bin $original/nodiff.cr $extracted/nodiff.cr &&
6469
test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf &&
6570
test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf
6671
"
6772

68-
test_expect_success UNZIP " validate that custom diff is unchanged " "
73+
test_expect_success !BUSYBOX,UNZIP \
74+
" validate that custom diff is unchanged " "
6975
test_cmp_bin $original/custom.cr $extracted/custom.cr &&
7076
test_cmp_bin $original/custom.crlf $extracted/custom.crlf &&
7177
test_cmp_bin $original/custom.lf $extracted/custom.lf

0 commit comments

Comments
 (0)