X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft0000-basic.sh;h=6729a18266e9539e3a3b34e200bdaee53e8a67a7;hb=cf9dc65368113caa28f2829e2ada5477fbb031ec;hp=22bdacaf7861d15bb5fd383e9b17c22f082d72b7;hpb=423325a2d24638ddcc82ce47be5e40be550f4507;p=git.git

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 22bdacaf..6729a182 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -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
 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 "$no_python" || "$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.
 # make sure it is empty.