From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Apr 2018 04:09:54 +0000 (+0900)
Subject: Merge branch 'jc/test-must-be-empty'
X-Git-Tag: v2.18.0-rc0~145
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5ff42d42da9c2c26737988d19b347c99489c8faa?ds=inline;hp=-c

Merge branch 'jc/test-must-be-empty'

Test helper update.

* jc/test-must-be-empty:
test_must_be_empty: simplify file existence check
---

5ff42d42da9c2c26737988d19b347c99489c8faa
diff --combined t/test-lib-functions.sh
index b895366fee,36ad8accdd..7d620bf2a9
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@@ -610,14 -610,6 +610,14 @@@ list_contains () 
  #
  # Writing this as "! git checkout ../outerspace" is wrong, because
  # the failure could be due to a segv.  We want a controlled failure.
 +#
 +# Accepts the following options:
 +#
 +#   ok=<signal-name>[,<...>]:
 +#     Don't treat an exit caused by the given signal as error.
 +#     Multiple signals can be specified as a comma separated list.
 +#     Currently recognized signal names are: sigpipe, success.
 +#     (Don't use 'success', use 'test_might_fail' instead.)
  
  test_must_fail () {
  	case "$1" in
@@@ -629,30 -621,30 +629,30 @@@
  		_test_ok=
  		;;
  	esac
 -	"$@"
 +	"$@" 2>&7
  	exit_code=$?
  	if test $exit_code -eq 0 && ! list_contains "$_test_ok" success
  	then
 -		echo >&2 "test_must_fail: command succeeded: $*"
 +		echo >&4 "test_must_fail: command succeeded: $*"
  		return 1
  	elif test_match_signal 13 $exit_code && list_contains "$_test_ok" sigpipe
  	then
  		return 0
  	elif test $exit_code -gt 129 && test $exit_code -le 192
  	then
 -		echo >&2 "test_must_fail: died by signal $(($exit_code - 128)): $*"
 +		echo >&4 "test_must_fail: died by signal $(($exit_code - 128)): $*"
  		return 1
  	elif test $exit_code -eq 127
  	then
 -		echo >&2 "test_must_fail: command not found: $*"
 +		echo >&4 "test_must_fail: command not found: $*"
  		return 1
  	elif test $exit_code -eq 126
  	then
 -		echo >&2 "test_must_fail: valgrind error: $*"
 +		echo >&4 "test_must_fail: valgrind error: $*"
  		return 1
  	fi
  	return 0
 -}
 +} 7>&2 2>&4
  
  # Similar to test_must_fail, but tolerates success, too.  This is
  # meant to be used in contexts like:
@@@ -664,12 -656,10 +664,12 @@@
  #
  # Writing "git config --unset all.configuration || :" would be wrong,
  # because we want to notice if it fails due to segv.
 +#
 +# Accepts the same options as test_must_fail.
  
  test_might_fail () {
 -	test_must_fail ok=success "$@"
 -}
 +	test_must_fail ok=success "$@" 2>&7
 +} 7>&2 2>&4
  
  # Similar to test_must_fail and test_might_fail, but check that a
  # given command exited with a given exit code. Meant to be used as:
@@@ -681,16 -671,16 +681,16 @@@
  test_expect_code () {
  	want_code=$1
  	shift
 -	"$@"
 +	"$@" 2>&7
  	exit_code=$?
  	if test $exit_code = $want_code
  	then
  		return 0
  	fi
  
 -	echo >&2 "test_expect_code: command exited with $exit_code, we wanted $want_code $*"
 +	echo >&4 "test_expect_code: command exited with $exit_code, we wanted $want_code $*"
  	return 1
 -}
 +} 7>&2 2>&4
  
  # test_cmp is a helper function to compare actual and expected output.
  # You can use it like:
@@@ -715,66 -705,12 +715,66 @@@ test_cmp_bin() 
  	cmp "$@"
  }
  
 +# Use this instead of test_cmp to compare files that contain expected and
 +# actual output from git commands that can be translated.  When running
 +# under GETTEXT_POISON this pretends that the command produced expected
 +# results.
 +test_i18ncmp () {
 +	test -n "$GETTEXT_POISON" || test_cmp "$@"
 +}
 +
 +# Use this instead of "grep expected-string actual" to see if the
 +# output from a git command that can be translated either contains an
 +# expected string, or does not contain an unwanted one.  When running
 +# under GETTEXT_POISON this pretends that the command produced expected
 +# results.
 +test_i18ngrep () {
 +	eval "last_arg=\${$#}"
 +
 +	test -f "$last_arg" ||
 +	error "bug in the test script: test_i18ngrep requires a file" \
 +	      "to read as the last parameter"
 +
 +	if test $# -lt 2 ||
 +	   { test "x!" = "x$1" && test $# -lt 3 ; }
 +	then
 +		error "bug in the test script: too few parameters to test_i18ngrep"
 +	fi
 +
 +	if test -n "$GETTEXT_POISON"
 +	then
 +		# pretend success
 +		return 0
 +	fi
 +
 +	if test "x!" = "x$1"
 +	then
 +		shift
 +		! grep "$@" && return 0
 +
 +		echo >&4 "error: '! grep $@' did find a match in:"
 +	else
 +		grep "$@" && return 0
 +
 +		echo >&4 "error: 'grep $@' didn't find a match in:"
 +	fi
 +
 +	if test -s "$last_arg"
 +	then
 +		cat >&4 "$last_arg"
 +	else
 +		echo >&4 "<File '$last_arg' is empty>"
 +	fi
 +
 +	return 1
 +}
 +
  # Call any command "$@" but be more verbose about its
  # failure. This is handy for commands like "test" which do
  # not output anything when they fail.
  verbose () {
  	"$@" && return 0
 -	echo >&2 "command failed: $(git rev-parse --sq-quote "$@")"
 +	echo >&4 "command failed: $(git rev-parse --sq-quote "$@")"
  	return 1
  }
  
@@@ -782,11 -718,8 +782,8 @@@
  # otherwise.
  
  test_must_be_empty () {
- 	if ! test -f "$1"
- 	then
- 		echo "'$1' is missing"
- 		return 1
- 	elif test -s "$1"
+ 	test_path_is_file "$1" &&
+ 	if test -s "$1"
  	then
  		echo "'$1' is not empty, it contains:"
  		cat "$1"
@@@ -896,8 -829,8 +893,8 @@@ test_write_lines () 
  }
  
  perl () {
 -	command "$PERL_PATH" "$@"
 -}
 +	command "$PERL_PATH" "$@" 2>&7
 +} 7>&2 2>&4
  
  # Is the value one of the various ways to spell a boolean true/false?
  test_normalize_bool () {
@@@ -1037,13 -970,13 +1034,13 @@@ test_env () 
  				shift
  				;;
  			*)
 -				"$@"
 +				"$@" 2>&7
  				exit
  				;;
  			esac
  		done
  	)
 -}
 +} 7>&2 2>&4
  
  # Returns true if the numeric exit code in "$2" represents the expected signal
  # in "$1". Signals should be given numerically.
@@@ -1085,40 -1018,6 +1082,40 @@@ nongit () 
  		GIT_CEILING_DIRECTORIES=$(pwd) &&
  		export GIT_CEILING_DIRECTORIES &&
  		cd non-repo &&
 -		"$@"
 +		"$@" 2>&7
  	)
 +} 7>&2 2>&4
 +
 +# convert stdin to pktline representation; note that empty input becomes an
 +# empty packet, not a flush packet (for that you can just print 0000 yourself).
 +packetize() {
 +	cat >packetize.tmp &&
 +	len=$(wc -c <packetize.tmp) &&
 +	printf '%04x%s' "$(($len + 4))" &&
 +	cat packetize.tmp &&
 +	rm -f packetize.tmp
 +}
 +
 +# Parse the input as a series of pktlines, writing the result to stdout.
 +# Sideband markers are removed automatically, and the output is routed to
 +# stderr if appropriate.
 +#
 +# NUL bytes are converted to "\\0" for ease of parsing with text tools.
 +depacketize () {
 +	perl -e '
 +		while (read(STDIN, $len, 4) == 4) {
 +			if ($len eq "0000") {
 +				print "FLUSH\n";
 +			} else {
 +				read(STDIN, $buf, hex($len) - 4);
 +				$buf =~ s/\0/\\0/g;
 +				if ($buf =~ s/^[\x2\x3]//) {
 +					print STDERR $buf;
 +				} else {
 +					$buf =~ s/^\x1//;
 +					print $buf;
 +				}
 +			}
 +		}
 +	'
  }