Set TEST_DIRECTORY

greened · greened · commit 603ee0f0c3d1 · 2012-04-09T20:23:10.000-05:00
Set TEST_DIRECTORY to the main git test area.  This allows the
git-subtree out-of-tree tests to run correctly.

Signed-off-by: David A. Greene &lt;greened@obbligato.org&gt;
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
@@ -8,7 +8,9 @@ This test verifies the basic operation of the merge, pull, add
 and split subcommands of git subtree.
 '
 
-. ./test-lib.sh
+export TEST_DIRECTORY=$(pwd)/../../../t
+
+. ../../../t/test-lib.sh
 
 create()
 {
@@ -30,7 +32,7 @@ check_equal()
 }
 
 fixnl()
-{	
+{
 	t=""
 	while read x; do
 		t="$t$x "

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ This test verifies the basic operation of the merge, pull, add`
`8`	`8`	`and split subcommands of git subtree.`
`9`	`9`	`'`
`10`	`10`
`11`		`-. ./test-lib.sh`
	`11`	`+export TEST_DIRECTORY=$(pwd)/../../../t`
	`12`	`+`
	`13`	`+. ../../../t/test-lib.sh`
`12`	`14`
`13`	`15`	`create()`
`14`	`16`	`{`
`@@ -30,7 +32,7 @@ check_equal()`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`fixnl()`
`33`		`-{`
	`35`	`+{`
`34`	`36`	`t=""`
`35`	`37`	`while read x; do`
`36`	`38`	`t="$t$x "`