Merge branch 'rr/test-make-sure-we-have-git' into maint

* rr/test-make-sure-we-have-git: t/test-lib: make sure Git has already been built
git-mirror · Oct 17, 2012 · 5178ee1 · 5178ee1
2 parents 756583f + 2006f0a
commit 5178ee1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
@@ -18,16 +18,6 @@ swapping compression and hashing order, the person who is making the
 modification *should* take notice and update the test vectors here.
 '
 
-################################################################
-# It appears that people try to run tests without building...
-
-../git >/dev/null
-if test $? != 1
-then
-	echo >&2 'You do not seem to have built git yet.'
-	exit 1
-fi
-
 . ./test-lib.sh
 
 ################################################################

diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -51,6 +51,15 @@ then
 fi
 GIT_BUILD_DIR="$TEST_DIRECTORY"/..
 
+################################################################
+# It appears that people try to run tests without building...
+"$GIT_BUILD_DIR/git" >/dev/null
+if test $? != 1
+then
+	echo >&2 'error: you do not seem to have built git yet.'
+	exit 1
+fi
+
 . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
 export PERL_PATH SHELL_PATH