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

Only the first test t0000 in the test suite made sure we have built
Git to be tested; move the check to test-lib so that it applies to
all tests equally.

* rr/test-make-sure-we-have-git:
  t/test-lib: make sure Git has already been built
This commit is contained in:
Junio C Hamano 2012-09-25 10:40:24 -07:00
Родитель cbea001a86 2006f0adae
Коммит 86bdfa3955
2 изменённых файлов: 9 добавлений и 10 удалений

Просмотреть файл

@ -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
################################################################ ################################################################

Просмотреть файл

@ -51,6 +51,15 @@ then
fi fi
GIT_BUILD_DIR="$TEST_DIRECTORY"/.. 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 . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH export PERL_PATH SHELL_PATH