Merge branch 'jk/shell-portability'

gitster · gitster · commit 45c0c21eb96c · 2016-06-10T15:26:05.000-07:00
test fixes.

* jk/shell-portability:
  t5500 &amp; t7403: lose bash-ism "local"
  test-lib: add in-shell "env" replacement
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
@@ -1072,7 +1072,7 @@ test_expect_success '--from omits redundant in-body header' '
 '
 
 test_expect_success 'in-body headers trigger content encoding' '
-	GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
+	test_env GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
 	test_when_finished "git reset --hard HEAD^" &&
 	git format-patch -1 --stdout --from >patch &&
 	cat >expect <<-\EOF &&
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
@@ -558,7 +558,6 @@ check_prot_path () {
 }
 
 check_prot_host_port_path () {
-	local diagport
 	case "$2" in
 		*ssh*)
 		pp=ssh
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
@@ -62,13 +62,13 @@ test_expect_success 'change submodule' '
 '
 
 reset_submodule_urls () {
-	local root
-	root=$(pwd) &&
 	(
+		root=$(pwd) &&
 		cd super-clone/submodule &&
 		git config remote.origin.url "$root/submodule"
 	) &&
 	(
+		root=$(pwd) &&
 		cd super-clone/submodule/sub-submodule &&
 		git config remote.origin.url "$root/submodule"
 	)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
@@ -939,3 +939,25 @@ mingw_read_file_strip_cr_ () {
 		eval "$1=\$$1\$line"
 	done
 }
+
+# Like "env FOO=BAR some-program", but run inside a subshell, which means
+# it also works for shell functions (though those functions cannot impact
+# the environment outside of the test_env invocation).
+test_env () {
+	(
+		while test $# -gt 0
+		do
+			case "$1" in
+			*=*)
+				eval "${1%%=*}=\${1#*=}"
+				eval "export ${1%%=*}"
+				shift
+				;;
+			*)
+				"$@"
+				exit
+				;;
+			esac
+		done
+	)
+}

Original file line number	Diff line number	Diff line change
`@@ -1072,7 +1072,7 @@ test_expect_success '--from omits redundant in-body header' '`
`1072`	`1072`	`'`
`1073`	`1073`
`1074`	`1074`	`test_expect_success 'in-body headers trigger content encoding' '`
`1075`		`- GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&`
	`1075`	`+ test_env GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&`
`1076`	`1076`	`test_when_finished "git reset --hard HEAD^" &&`
`1077`	`1077`	`git format-patch -1 --stdout --from >patch &&`
`1078`	`1078`	`cat >expect <<-\EOF &&`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,6 @@ check_prot_path () {`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`check_prot_host_port_path () {`
`561`		`- local diagport`
`562`	`561`	`case "$2" in`
`563`	`562`	`ssh)`
`564`	`563`	`pp=ssh`
Original file line number	Diff line number	Diff line change
`@@ -62,13 +62,13 @@ test_expect_success 'change submodule' '`
`62`	`62`	`'`
`63`	`63`
`64`	`64`	`reset_submodule_urls () {`
`65`		`- local root`
`66`		`- root=$(pwd) &&`
`67`	`65`	`(`
	`66`	`+ root=$(pwd) &&`
`68`	`67`	`cd super-clone/submodule &&`
`69`	`68`	`git config remote.origin.url "$root/submodule"`
`70`	`69`	`) &&`
`71`	`70`	`(`
	`71`	`+ root=$(pwd) &&`
`72`	`72`	`cd super-clone/submodule/sub-submodule &&`
`73`	`73`	`git config remote.origin.url "$root/submodule"`
`74`	`74`	`)`