From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 May 2017 02:16:44 +0000 (+0900)
Subject: Merge branch 'jc/skip-test-in-the-middle'
X-Git-Tag: v2.14.0-rc0~139
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9aa55594027cc33def7c08ff4eea354a6e9c9457?ds=inline;hp=-c

Merge branch 'jc/skip-test-in-the-middle'

A recent update to t5545-push-options.sh started skipping all the
tests in the script when a web server testing is disabled or
unavailable, not just the ones that require a web server.  Non HTTP
tests have been salvaged to always run in this script.

* jc/skip-test-in-the-middle:
t5545: enhance test coverage when no http server is installed
test: allow skipping the remainder
---

9aa55594027cc33def7c08ff4eea354a6e9c9457
diff --combined t/test-lib.sh
index 26b3edfb2e,30eb743719..ec2571f018
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -745,31 -745,31 +745,36 @@@ test_done () 
  	fi
  	case "$test_failure" in
  	0)
- 		# Maybe print SKIP message
- 		if test -n "$skip_all" && test $test_count -gt 0
- 		then
- 			error "Can't use skip_all after running some tests"
- 		fi
- 		test -z "$skip_all" || skip_all=" # SKIP $skip_all"
- 
  		if test $test_external_has_tap -eq 0
  		then
  			if test $test_remaining -gt 0
  			then
  				say_color pass "# passed all $msg"
  			fi
- 			say "1..$test_count$skip_all"
+ 
+ 			# Maybe print SKIP message
+ 			test -z "$skip_all" || skip_all="# SKIP $skip_all"
+ 			case "$test_count" in
+ 			0)
+ 				say "1..$test_count${skip_all:+ $skip_all}"
+ 				;;
+ 			*)
+ 				test -z "$skip_all" ||
+ 				say_color warn "$skip_all"
+ 				say "1..$test_count"
+ 				;;
+ 			esac
  		fi
  
 -		test -d "$remove_trash" &&
 -		cd "$(dirname "$remove_trash")" &&
 -		rm -rf "$(basename "$remove_trash")"
 +		if test -z "$debug"
 +		then
 +			test -d "$TRASH_DIRECTORY" ||
 +			error "Tests passed but trash directory already removed before test cleanup; aborting"
  
 +			cd "$TRASH_DIRECTORY/.." &&
 +			rm -fr "$TRASH_DIRECTORY" ||
 +			error "Tests passed but test cleanup failed; aborting"
 +		fi
  		test_at_end_hook_
  
  		exit 0 ;;
@@@ -924,6 -924,7 +929,6 @@@ case "$TRASH_DIRECTORY" i
  /*) ;; # absolute path is good
   *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;;
  esac
 -test ! -z "$debug" || remove_trash=$TRASH_DIRECTORY
  rm -fr "$TRASH_DIRECTORY" || {
  	GIT_EXIT_OK=t
  	echo >&5 "FATAL: Cannot prepare test area"
@@@ -1168,6 -1169,3 +1173,6 @@@ build_option () 
  test_lazy_prereq LONG_IS_64BIT '
  	test 8 -le "$(build_option sizeof-long)"
  '
 +
 +test_lazy_prereq TIME_IS_64BIT 'test-date is64bit'
 +test_lazy_prereq TIME_T_IS_64BIT 'test-date time_t-is64bit'