From 2006f0adaee036145b4261b942d944adb18647ed Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Mon, 17 Sep 2012 22:36:19 +0530 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t0000-basic.sh | 10 ---------- t/test-lib.sh | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index ccb5435b2a..741b6b6d16 100755 --- 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 index 78c428619e..e823d86e41 100644 --- 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 -- 2.11.4.GIT