Merge branch 'jk/tests-write-script'

gitster · gitster · commit e06ed3ed8a72 · 2012-02-10T14:07:42.000-08:00
* jk/tests-write-script:
  t0300: use write_script helper
  tests: add write_script helper function
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
@@ -14,22 +14,18 @@ test_expect_success 'setup helper scripts' '
 	done
 	EOF
 
-	cat >git-credential-useless <<-\EOF &&
-	#!/bin/sh
+	write_script git-credential-useless <<-\EOF &&
 	. ./dump
 	exit 0
 	EOF
-	chmod +x git-credential-useless &&
 
-	cat >git-credential-verbatim <<-\EOF &&
-	#!/bin/sh
+	write_script git-credential-verbatim <<-\EOF &&
 	user=$1; shift
 	pass=$1; shift
 	. ./dump
 	test -z "$user" || echo username=$user
 	test -z "$pass" || echo password=$pass
 	EOF
-	chmod +x git-credential-verbatim &&
 
 	PATH="$PWD:$PATH"
 '
diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -395,11 +395,20 @@ test_config () {
 	git config "$@"
 }
 
+
 test_config_global () {
 	test_when_finished "test_unconfig --global '$1'" &&
 	git config --global "$@"
 }
 
+write_script () {
+	{
+		echo "#!${2-"$SHELL_PATH"}" &&
+		cat
+	} >"$1" &&
+	chmod +x "$1"
+}
+
 # Use test_set_prereq to tell that a particular prerequisite is available.
 # The prerequisite can later be checked for in two ways:
 #

Original file line number	Diff line number	Diff line change
`@@ -395,11 +395,20 @@ test_config () {`
`395`	`395`	`git config "$@"`
`396`	`396`	`}`
`397`	`397`
	`398`	`+`
`398`	`399`	`test_config_global () {`
`399`	`400`	`test_when_finished "test_unconfig --global '$1'" &&`
`400`	`401`	`git config --global "$@"`
`401`	`402`	`}`
`402`	`403`
	`404`	`+write_script () {`
	`405`	`+ {`
	`406`	`+ echo "#!${2-"$SHELL_PATH"}" &&`
	`407`	`+ cat`
	`408`	`+ } >"$1" &&`
	`409`	`+ chmod +x "$1"`
	`410`	`+}`
	`411`	`+`
`403`	`412`	`# Use test_set_prereq to tell that a particular prerequisite is available.`
`404`	`413`	`# The prerequisite can later be checked for in two ways:`
`405`	`414`	`#`