Imported Upstream version 2.27.0

[platform/upstream/git.git] / t / t5003-archive-zip.sh

diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 106eddb..3b76d2e 100755 (executable)
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -7,12 +7,12 @@ test_description='git archive --format=zip test'
 SUBSTFORMAT=%H%n
 
 test_lazy_prereq UNZIP_SYMLINKS '
-       (
-               mkdir unzip-symlinks &&
-               cd unzip-symlinks &&
-               "$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
-               test -h symlink
-       )
+       "$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
+       test -h symlink
+'
+
+test_lazy_prereq UNZIP_CONVERT '
+       "$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip
 '
 
 check_zip() {
@@ -39,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