summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-20 08:49:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-22 04:55:39 (GMT)
commit7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch)
tree14d84fbaf70277d8ba833391c03860e98c1defe7 /t
parent594270635732d6320d6e6d7fa127679ae90ef5b1 (diff)
downloadgit-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.zip
git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.gz
git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.bz2
remove merge-recursive-old
This frees the Porcelain-ish that comes with the core Python-free. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rw-r--r--t/Makefile4
-rwxr-xr-xt/t0000-basic.sh14
-rwxr-xr-xt/test-lib.sh15
3 files changed, 6 insertions, 27 deletions
diff --git a/t/Makefile b/t/Makefile
index 8983509..e1c6c92 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -13,10 +13,6 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
TSVN = $(wildcard t91[0-9][0-9]-*.sh)
-ifdef NO_PYTHON
- GIT_TEST_OPTS += --no-python
-endif
-
all: $(T) clean
$(T):
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 6aff0b8..81f3bed 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -20,10 +20,10 @@ 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.
+# 'merge' (usually part of RCS package in binary distributions).
+# Check this 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
@@ -42,12 +42,6 @@ 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.
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 3895f16..ac7be76 100755
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -76,7 +76,8 @@ do
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
verbose=t; shift ;;
--no-python)
- no_python=t; shift ;;
+ # noop now...
+ shift ;;
*)
break ;;
esac
@@ -210,18 +211,6 @@ GIT_EXEC_PATH=$(pwd)/..
HOME=$(pwd)/trash
export PATH GIT_EXEC_PATH HOME
-# Similarly use ../compat/subprocess.py if our python does not
-# have subprocess.py on its own.
-PYTHON=`sed -e '1{
- s/^#!//
- q
-}' ../git-merge-recursive-old` || {
- error "You haven't built things yet, have you?"
-}
-"$PYTHON" -c 'import subprocess' 2>/dev/null || {
- PYTHONPATH=$(pwd)/../compat
- export PYTHONPATH
-}
GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git
export GITPERLLIB
test -d ../templates/blt || {