]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t5003: skip conversion test if unzip -a is unavailable
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>
Wed, 25 Mar 2020 15:06:17 +0000 (22:06 +0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2020 15:54:37 +0000 (08:54 -0700)
Alpine Linux's default unzip(1) doesn't support `-a`.

Skip those tests on that platform.

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5003-archive-zip.sh

index df1374a312d500a25ef625e1a426defe07208fb1..3b76d2eb653f7aed47d4c7391105ec6f24623e97 100755 (executable)
@@ -11,6 +11,10 @@ test_lazy_prereq UNZIP_SYMLINKS '
        test -h symlink
 '
 
+test_lazy_prereq UNZIP_CONVERT '
+       "$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip
+'
+
 check_zip() {
        zipfile=$1.zip
        listfile=$1.lst
@@ -35,33 +39,33 @@ check_zip() {
        extracted=${dir_with_prefix}a
        original=a
 
-       test_expect_success UNZIP " extract ZIP archive with EOL conversion" '
+       test_expect_success UNZIP_CONVERT " 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 UNZIP_CONVERT " 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 UNZIP_CONVERT " 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 UNZIP_CONVERT " 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 UNZIP_CONVERT " 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 UNZIP_CONVERT " 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