summaryrefslogtreecommitdiff
path: root/t/test-lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-11 18:34:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-11 18:34:43 -0800
commitbf3f167d65fec8028b488ef0ce3baaa69a571ffd (patch)
tree4a7caa4e5b9e1d72e7365da86c2a7971608f4d37 /t/test-lib.sh
parentMerge branch 'jn/xml-depends-on-asciidoc-conf' (diff)
parentt5003: check if unzip supports symlinks (diff)
downloadtgif-bf3f167d65fec8028b488ef0ce3baaa69a571ffd.tar.xz
Merge branch 'rs/zip-tests'
Update zip tests to skip some that cannot be handled on platform unzip. * rs/zip-tests: t5003: check if unzip supports symlinks t5000, t5003: move ZIP tests into their own script t0024, t5000: use test_lazy_prereq for UNZIP t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
Diffstat (limited to 't/test-lib.sh')
-rw-r--r--t/test-lib.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8a12cbb86a..d8ec408dfd 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)