t0000: catch trivial pilot errors.

People seem to be getting test failure from t6021 not becuase
git is faulty but because they forgot to install "merge".  Check
this and other trivial pilot errors in the first test.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-12-10 20:55:32 -08:00
parent 73ab46d6d0
commit eea420693b
2 changed files with 36 additions and 2 deletions

View File

@ -17,8 +17,37 @@ IDs. When object ID computation changes, like in the previous case of
swapping compression and hashing order, the person who is making the 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 are getting bitten by not installing
# 'merge' (usually part of RCS package in binary distributions)
# or have too old python without subprocess. Check them and error
# out before running any tests. Also catch the bogosity of trying
# to run tests without building while we are at it.
../git >/dev/null
if test $? != 1
then
echo >&2 'You do not seem to have built git yet.'
exit 1
fi
merge >/dev/null 2>/dev/null
if test $? == 127
then
echo >&2 'You do not seem to have "merge" installed.
Please check INSTALL document.'
exit 1
fi
. ./test-lib.sh . ./test-lib.sh
"$PYTHON" -c 'import subprocess' || {
echo >&2 'Your python seem to lack "subprocess" module.
Please check INSTALL document.'
exit 1
}
################################################################ ################################################################
# init-db has been done in an empty repository. # init-db has been done in an empty repository.
# make sure it is empty. # make sure it is empty.

View File

@ -179,11 +179,16 @@ export PATH GIT_EXEC_PATH
PYTHON=`sed -e '1{ PYTHON=`sed -e '1{
s/^#!// s/^#!//
q q
}' ../git-merge-recursive` && }' ../git-merge-recursive` || {
error "You haven't built things yet, have you?"
}
"$PYTHON" -c 'import subprocess' 2>/dev/null || { "$PYTHON" -c 'import subprocess' 2>/dev/null || {
PYTHONPATH=$(pwd)/../compat PYTHONPATH=$(pwd)/../compat
export PYTHONPATH export PYTHONPATH
} }
test -d ../templates/blt || {
error "You haven't built things yet, have you?"
}
# Test repository # Test repository
test=trash test=trash
@ -191,6 +196,6 @@ rm -fr "$test"
mkdir "$test" mkdir "$test"
cd "$test" cd "$test"
"$GIT_EXEC_PATH/git" init-db --template=../../templates/blt/ 2>/dev/null || "$GIT_EXEC_PATH/git" init-db --template=../../templates/blt/ 2>/dev/null ||
error "cannot run git init-db" error "cannot run git init-db -- have you built things yet?"
mv .git/hooks .git/hooks-disabled mv .git/hooks .git/hooks-disabled