From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Sep 2016 20:51:41 +0000 (-0700)
Subject: Merge branch 'ep/use-git-trace-curl-in-tests' into maint
X-Git-Tag: v2.10.1~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e28677e5b16515518bdd1dbef02ca48a4438c4e?ds=inline;hp=-c

Merge branch 'ep/use-git-trace-curl-in-tests' into maint

Update a few tests that used to use GIT_CURL_VERBOSE to use the
newer GIT_TRACE_CURL.

* ep/use-git-trace-curl-in-tests:
t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment var
t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment var
test-lib.sh: preserve GIT_TRACE_CURL from the environment
t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment var
---

1e28677e5b16515518bdd1dbef02ca48a4438c4e
diff --combined t/test-lib.sh
index eada492d88,986eba1d00..ac56512a1c
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -89,6 -89,7 +89,7 @@@ unset VISUAL EMAIL LANGUAGE COLUMNS $("
  		UNZIP
  		PERF_
  		CURL_VERBOSE
+ 		TRACE_CURL
  	));
  	my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
  	print join("\n", @vars);
@@@ -687,9 -688,9 +688,9 @@@ test_done () 
  		test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results"
  		mkdir -p "$test_results_dir"
  		base=${0##*/}
 -		test_results_path="$test_results_dir/${base%.sh}-$$.counts"
 +		test_results_path="$test_results_dir/${base%.sh}.counts"
  
 -		cat >>"$test_results_path" <<-EOF
 +		cat >"$test_results_path" <<-EOF
  		total $test_count
  		success $test_success
  		fixed $test_fixed