From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jan 2013 19:20:15 +0000 (-0800)
Subject: Merge branch 'nd/fix-perf-parameters-in-tests'
X-Git-Tag: v1.8.2-rc0~116
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/55599ac1043672c4dd1cde175a11ca129334b84f?ds=inline;hp=-c

Merge branch 'nd/fix-perf-parameters-in-tests'

Allow GIT_PERF_* environment variables to be passed through the
test framework.

* nd/fix-perf-parameters-in-tests:
test-lib.sh: unfilter GIT_PERF_*
---

55599ac1043672c4dd1cde175a11ca129334b84f
diff --combined t/test-lib.sh
index d8ec408dfd,bf4cf7199c..1a6c4ab08c
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -85,8 -85,7 +85,8 @@@ unset VISUAL EMAIL LANGUAGE COLUMNS $("
  		.*_TEST
  		PROVE
  		VALGRIND
 +		UNZIP
- 		PERF_AGGREGATING_LATER
+ 		PERF_
  	));
  	my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
  	print join("\n", @vars);
@@@ -129,7 -128,6 +129,7 @@@ f
  unset CDPATH
  
  unset GREP_OPTIONS
 +unset UNZIP
  
  case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
  1|2|true)
@@@ -214,13 -212,11 +214,13 @@@ the
  		error)
  			tput bold; tput setaf 1;; # bold red
  		skip)
 -			tput bold; tput setaf 2;; # bold green
 +			tput setaf 4;; # blue
 +		warn)
 +			tput setaf 3;; # brown/yellow
  		pass)
 -			tput setaf 2;;            # green
 +			tput setaf 2;; # green
  		info)
 -			tput setaf 3;;            # brown
 +			tput setaf 6;; # cyan
  		*)
  			test -n "$quiet" && return;;
  		esac
@@@ -302,7 -298,7 +302,7 @@@ test_ok_ () 
  
  test_failure_ () {
  	test_failure=$(($test_failure + 1))
 -	say_color error "not ok - $test_count $1"
 +	say_color error "not ok $test_count - $1"
  	shift
  	echo "$@" | sed -e 's/^/#	/'
  	test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
@@@ -310,12 -306,12 +310,12 @@@
  
  test_known_broken_ok_ () {
  	test_fixed=$(($test_fixed+1))
 -	say_color "" "ok $test_count - $@ # TODO known breakage"
 +	say_color error "ok $test_count - $@ # TODO known breakage vanished"
  }
  
  test_known_broken_failure_ () {
  	test_broken=$(($test_broken+1))
 -	say_color skip "not ok $test_count - $@ # TODO known breakage"
 +	say_color warn "not ok $test_count - $@ # TODO known breakage"
  }
  
  test_debug () {
@@@ -408,18 -404,13 +408,18 @@@ test_done () 
  
  	if test "$test_fixed" != 0
  	then
 -		say_color pass "# fixed $test_fixed known breakage(s)"
 +		say_color error "# $test_fixed known breakage(s) vanished; please update test(s)"
  	fi
  	if test "$test_broken" != 0
  	then
 -		say_color error "# still have $test_broken known breakage(s)"
 -		msg="remaining $(($test_count-$test_broken)) test(s)"
 +		say_color warn "# still have $test_broken known breakage(s)"
 +	fi
 +	if test "$test_broken" != 0 || test "$test_fixed" != 0
 +	then
 +		test_remaining=$(( $test_count - $test_broken - $test_fixed ))
 +		msg="remaining $test_remaining test(s)"
  	else
 +		test_remaining=$test_count
  		msg="$test_count test(s)"
  	fi
  	case "$test_failure" in
@@@ -433,7 -424,7 +433,7 @@@
  
  		if test $test_external_has_tap -eq 0
  		then
 -			if test $test_count -gt 0
 +			if test $test_remaining -gt 0
  			then
  				say_color pass "# passed all $msg"
  			fi
@@@ -624,7 -615,7 +624,7 @@@ for skp in $GIT_SKIP_TEST
  do
  	case "$this_test" in
  	$skp)
 -		say_color skip >&3 "skipping test $this_test altogether"
 +		say_color info >&3 "skipping test $this_test altogether"
  		skip_all="skip all tests in $this_test"
  		test_done
  	esac