From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 May 2016 21:08:14 +0000 (-0700)
Subject: Merge branch 'sg/test-lib-simplify-expr-away'
X-Git-Tag: v2.9.0-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3944f903eb8eba3fe86f5b95acdb9af7a0f0438e?hp=-c

Merge branch 'sg/test-lib-simplify-expr-away'

Code cleanup.

* sg/test-lib-simplify-expr-away:
test-lib: simplify '--option=value' parsing
---

3944f903eb8eba3fe86f5b95acdb9af7a0f0438e
diff --combined t/test-lib.sh
index cd0ecd444d,79afa8748e..286c5f33d1
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -202,13 -202,13 +202,13 @@@ d
  		}
  		run_list=$1; shift ;;
  	--run=*)
- 		run_list=$(expr "z$1" : 'z[^=]*=\(.*\)'); shift ;;
+ 		run_list=${1#--*=}; shift ;;
  	-h|--h|--he|--hel|--help)
  		help=t; shift ;;
  	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
  		verbose=t; shift ;;
  	--verbose-only=*)
- 		verbose_only=$(expr "z$1" : 'z[^=]*=\(.*\)')
+ 		verbose_only=${1#--*=}
  		shift ;;
  	-q|--q|--qu|--qui|--quie|--quiet)
  		# Ignore --quiet under a TAP::Harness. Saying how many tests
@@@ -222,15 -222,15 +222,15 @@@
  		valgrind=memcheck
  		shift ;;
  	--valgrind=*)
- 		valgrind=$(expr "z$1" : 'z[^=]*=\(.*\)')
+ 		valgrind=${1#--*=}
  		shift ;;
  	--valgrind-only=*)
- 		valgrind_only=$(expr "z$1" : 'z[^=]*=\(.*\)')
+ 		valgrind_only=${1#--*=}
  		shift ;;
  	--tee)
  		shift ;; # was handled already
  	--root=*)
- 		root=$(expr "z$1" : 'z[^=]*=\(.*\)')
+ 		root=${1#--*=}
  		shift ;;
  	--chain-lint)
  		GIT_TEST_CHAIN_LINT=1
@@@ -854,10 -854,10 +854,10 @@@ test -d "$GIT_BUILD_DIR"/templates/blt 
  	error "You haven't built things yet, have you?"
  }
  
 -if ! test -x "$GIT_BUILD_DIR"/test-chmtime
 +if ! test -x "$GIT_BUILD_DIR"/t/helper/test-chmtime
  then
  	echo >&2 'You need to build test-chmtime:'
 -	echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
 +	echo >&2 'Run "make t/helper/test-chmtime" in the source (toplevel) directory'
  	exit 1
  fi