diff options
| -rwxr-xr-x | t/t0024-crlf-archive.sh | 6 | ||||
| -rwxr-xr-x | t/t5000-tar-tree.sh | 10 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh index ec6c1b3..080fe5c 100755 --- a/t/t0024-crlf-archive.sh +++ b/t/t0024-crlf-archive.sh @@ -3,7 +3,7 @@ test_description='respect crlf in git archive' . ./test-lib.sh -UNZIP=${UNZIP:-unzip} +GIT_UNZIP=${GIT_UNZIP:-unzip} test_expect_success setup ' @@ -26,7 +26,7 @@ test_expect_success 'tar archive' ' ' -"$UNZIP" -v >/dev/null 2>&1 +"$GIT_UNZIP" -v >/dev/null 2>&1 if [ $? -eq 127 ]; then say "Skipping ZIP test, because unzip was not found" else @@ -37,7 +37,7 @@ test_expect_success UNZIP 'zip archive' ' git archive --format=zip HEAD >test.zip && - ( mkdir unzipped && cd unzipped && unzip ../test.zip ) && + ( mkdir unzipped && cd unzipped && "$GIT_UNZIP" ../test.zip ) && test_cmp sample unzipped/sample diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index ecf00ed..1f7593d 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -25,7 +25,7 @@ commit id embedding: ' . ./test-lib.sh -UNZIP=${UNZIP:-unzip} +GIT_UNZIP=${GIT_UNZIP:-unzip} GZIP=${GZIP:-gzip} GUNZIP=${GUNZIP:-gzip -d} @@ -37,9 +37,9 @@ check_zip() { dir=$1 dir_with_prefix=$dir/$2 - test_expect_success UNZIP " extract ZIP archive" " - (mkdir $dir && cd $dir && $UNZIP ../$zipfile) - " + test_expect_success UNZIP " extract ZIP archive" ' + (mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile) + ' test_expect_success UNZIP " validate filenames" " (cd ${dir_with_prefix}a && find .) | sort >$listfile && @@ -201,7 +201,7 @@ test_expect_success \ test_cmp a/substfile2 g/prefix/a/substfile2 ' -$UNZIP -v >/dev/null 2>&1 +"$GIT_UNZIP" -v >/dev/null 2>&1 if [ $? -eq 127 ]; then say "Skipping ZIP tests, because unzip was not found" else diff --git a/t/test-lib.sh b/t/test-lib.sh index 489bc80..c9a6b03 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -85,6 +85,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' .*_TEST PROVE VALGRIND + UNZIP PERF_AGGREGATING_LATER )); my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env); @@ -128,6 +129,7 @@ fi unset CDPATH unset GREP_OPTIONS +unset UNZIP case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in 1|2|true) |