From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Aug 2010 18:53:58 +0000 (-0700)
Subject: Merge branch 'ab/tap' into maint
X-Git-Tag: v1.7.2.2~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7d808125a0197e5660a57f77d14937604b16e39a?ds=inline;hp=-c

Merge branch 'ab/tap' into maint

* ab/tap:
test-lib: Remove 3 year old no-op --no-python option
test-lib: Ignore --quiet under a TAP harness
---

7d808125a0197e5660a57f77d14937604b16e39a
diff --combined t/test-lib.sh
index e5523dd690,07a5eff7f9..e8f21d577c
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -127,14 -127,13 +127,13 @@@ d
  	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
  		verbose=t; shift ;;
  	-q|--q|--qu|--qui|--quie|--quiet)
- 		quiet=t; shift ;;
+ 		# Ignore --quiet under a TAP::Harness. Saying how many tests
+ 		# passed without the ok/not ok details is always an error.
+ 		test -z "$HARNESS_ACTIVE" && quiet=t; shift ;;
  	--with-dashes)
  		with_dashes=t; shift ;;
  	--no-color)
  		color=; shift ;;
- 	--no-python)
- 		# noop now...
- 		shift ;;
  	--va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
  		valgrind=t; verbose=t; shift ;;
  	--tee)
@@@ -385,7 -384,6 +384,7 @@@ test_skip () 
  		case $this_test.$test_count in
  		$skp)
  			to_skip=t
 +			break
  		esac
  	done
  	if test -z "$to_skip" && test -n "$prereq" &&
@@@ -396,7 -394,7 +395,7 @@@
  	case "$to_skip" in
  	t)
  		say_color skip >&3 "skipping test: $@"
 -		say_color skip "ok $test_count: # skip $1"
 +		say_color skip "ok $test_count # skip $1"
  		: true
  		;;
  	*)
@@@ -636,7 -634,7 +635,7 @@@ test_done () 
  	GIT_EXIT_OK=t
  	test_results_dir="$TEST_DIRECTORY/test-results"
  	mkdir -p "$test_results_dir"
 -	test_results_path="$test_results_dir/${0%.sh}-$$"
 +	test_results_path="$test_results_dir/${0%.sh}-$$.counts"
  
  	echo "total $test_count" >> $test_results_path
  	echo "success $test_success" >> $test_results_path
@@@ -830,10 -828,18 +829,10 @@@ this_test=${0##*/
  this_test=${this_test%%-*}
  for skp in $GIT_SKIP_TESTS
  do
 -	to_skip=
 -	for skp in $GIT_SKIP_TESTS
 -	do
 -		case "$this_test" in
 -		$skp)
 -			to_skip=t
 -		esac
 -	done
 -	case "$to_skip" in
 -	t)
 +	case "$this_test" in
 +	$skp)
  		say_color skip >&3 "skipping test $this_test altogether"
 -		say_color skip "skip all tests in $this_test"
 +		skip_all="skip all tests in $this_test"
  		test_done
  	esac
  done