t/test-lib: make sure Git has already been built

When tests were run without building git, they stopped with:

.: 54: Can't open /path/to/git/source/t/../GIT-BUILD-OPTIONS

Move the check that makes sure that git has already been built from
t0000 to test-lib, so that any test will do so before it runs.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index ccb5435b2a7dd4724f3bc8e0b0186f248dbad448..741b6b6d166ed5b59917d010f777b8f54d0928cc 100755 (executable)
--- 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.
 '
 
 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
 
 ################################################################
 . ./test-lib.sh
 
 ################################################################

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 78c428619e99ea0225f61a1fe257e444d464ad0b..e823d86e415226680299fdd4ad487bd45b9d3bed 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -51,6 +51,15 @@ then
 fi
 GIT_BUILD_DIR="$TEST_DIRECTORY"/..
 
 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
 
 . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
 export PERL_PATH SHELL_PATH