From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jan 2013 01:22:22 +0000 (-0800)
Subject: Merge branch 'rs/zip-tests' into maint
X-Git-Tag: v1.8.1.2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1bc7a2b38f29e1336c91f57bc88d2391e0f72786?ds=inline;hp=-c

Merge branch 'rs/zip-tests' into maint

* 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
---

1bc7a2b38f29e1336c91f57bc88d2391e0f72786
diff --combined t/test-lib.sh
index f50f8341d4,c9a6b03953..fc42d3a9c4
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -85,6 -85,7 +85,7 @@@ unset VISUAL EMAIL LANGUAGE COLUMNS $("
  		.*_TEST
  		PROVE
  		VALGRIND
+ 		UNZIP
  		PERF_AGGREGATING_LATER
  	));
  	my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
@@@ -128,6 -129,7 +129,7 @@@ f
  unset CDPATH
  
  unset GREP_OPTIONS
+ unset UNZIP
  
  case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
  1|2|true)
@@@ -389,8 -391,7 +391,8 @@@ test_done () 
  	then
  		test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results"
  		mkdir -p "$test_results_dir"
 -		test_results_path="$test_results_dir/${0%.sh}-$$.counts"
 +		base=${0##*/}
 +		test_results_path="$test_results_dir/${base%.sh}-$$.counts"
  
  		cat >>"$test_results_path" <<-EOF
  		total $test_count
@@@ -739,12 -740,6 +741,12 @@@ test_lazy_prereq UTF8_NFD_TO_NFC 
  	esac
  '
  
 +test_lazy_prereq AUTOIDENT '
 +	sane_unset GIT_AUTHOR_NAME &&
 +	sane_unset GIT_AUTHOR_EMAIL &&
 +	git var GIT_AUTHOR_IDENT
 +'
 +
  # When the tests are run as root, permission tests will report that
  # things are writable when they shouldn't be.
  test -w / || test_set_prereq SANITY