undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead

Browse Source 
InfoZIP's unzip takes default parameters from the environment variable
UNZIP.  Unset it in the test library and use GIT_UNZIP for specifying
alternate versions of the unzip command instead.

t0024 wasn't even using variable for the actual extraction.  t5000
was, but when setting it to InfoZIP's unzip it would try to extract
from itself (because it treats the contents of $UNZIP as parameters),
which failed of course.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2013-01-06 18:47:57 +01:00 committed by Junio C Hamano
parent 15999998fb
commit ac00128298
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t0024-crlf-archive.sh
View File

@ -3,7 +3,7 @@
test_description='respect crlf in git archive' test_description='respect crlf in git archive'
. ./test-lib.sh . ./test-lib.sh
UNZIP=${UNZIP:-unzip} GIT_UNZIP=${GIT_UNZIP:-unzip}
test_expect_success setup ' 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 if [ $? -eq 127 ]; then
say "Skipping ZIP test, because unzip was not found" say "Skipping ZIP test, because unzip was not found"
else else
@ -37,7 +37,7 @@ test_expect_success UNZIP 'zip archive' '
git archive --format=zip HEAD >test.zip && 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 test_cmp sample unzipped/sample

10
t/t5000-tar-tree.sh
View File

@ -25,7 +25,7 @@ commit id embedding:
' '
. ./test-lib.sh . ./test-lib.sh
UNZIP=${UNZIP:-unzip} GIT_UNZIP=${GIT_UNZIP:-unzip}
GZIP=${GZIP:-gzip} GZIP=${GZIP:-gzip}
GUNZIP=${GUNZIP:-gzip -d} GUNZIP=${GUNZIP:-gzip -d}
@ -37,9 +37,9 @@ check_zip() {
dir=$1 dir=$1
dir_with_prefix=$dir/$2 dir_with_prefix=$dir/$2
test_expect_success UNZIP " extract ZIP archive" " test_expect_success UNZIP " extract ZIP archive" '
(mkdir $dir && cd $dir && $UNZIP ../$zipfile) (mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
" '
test_expect_success UNZIP " validate filenames" " test_expect_success UNZIP " validate filenames" "
(cd ${dir_with_prefix}a && find .) | sort >$listfile && (cd ${dir_with_prefix}a && find .) | sort >$listfile &&
@ -201,7 +201,7 @@ test_expect_success \
test_cmp a/substfile2 g/prefix/a/substfile2 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 if [ $? -eq 127 ]; then
say "Skipping ZIP tests, because unzip was not found" say "Skipping ZIP tests, because unzip was not found"
else else

2
t/test-lib.sh
View File

@ -85,6 +85,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
.*_TEST .*_TEST
PROVE PROVE
VALGRIND VALGRIND
UNZIP
PERF_AGGREGATING_LATER PERF_AGGREGATING_LATER
)); ));
my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env); my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
@ -128,6 +129,7 @@ fi
unset CDPATH unset CDPATH
unset GREP_OPTIONS unset GREP_OPTIONS
unset UNZIP
case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
1|2|true) 1|2|true)