X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ftest-lib.sh;h=a97d259e26bc269c8f370f1d3bfa82e7d6cb9831;hb=cfee10a773be0f8d0024f2567164c910d4213244;hp=0539dacc1c2bcce02a5f64a8c61571eabd9a7607;hpb=49ccb0877f64308662669a09db7b221419c13d0a;p=git.git

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0539dacc..a97d259e 100755
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -18,6 +18,7 @@ unset GIT_ALTERNATE_OBJECT_DIRECTORIES
 unset GIT_AUTHOR_DATE
 unset GIT_AUTHOR_EMAIL
 unset GIT_AUTHOR_NAME
+unset GIT_COMMITTER_DATE
 unset GIT_COMMITTER_EMAIL
 unset GIT_COMMITTER_NAME
 unset GIT_DIFF_OPTS
@@ -149,7 +150,7 @@ test_expect_code () {
 test_done () {
 	trap - exit
 	case "$test_failure" in
-	0)	
+	0)
 		# We could:
 		# cd .. && rm -fr trash
 		# but that means we forbid any tests that use their own
@@ -179,19 +180,23 @@ export PATH GIT_EXEC_PATH
 PYTHON=`sed -e '1{
 	s/^#!//
 	q
-}' ../git-merge-recursive` &&
+}' ../git-merge-recursive` || {
+	error "You haven't built things yet, have you?"
+}
 "$PYTHON" -c 'import subprocess' 2>/dev/null || {
 	PYTHONPATH=$(pwd)/../compat
 	export PYTHONPATH
 }
+test -d ../templates/blt || {
+	error "You haven't built things yet, have you?"
+}
 
 # Test repository
 test=trash
 rm -fr "$test"
 mkdir "$test"
 cd "$test"
-git-init-db --template=../../templates/blt/ 2>/dev/null ||
-error "cannot run git-init-db"
+"$GIT_EXEC_PATH/git" init-db --template=../../templates/blt/ 2>/dev/null ||
+error "cannot run git init-db -- have you built things yet?"
 
 mv .git/hooks .git/hooks-disabled
-