diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-27 06:19:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-27 06:19:56 (GMT) |
| commit | 88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8 (patch) | |
| tree | 3c461861be7704f2701c69ae006d1bc1d1e74bf4 /t | |
| parent | d63afe9ebb9b27952d3c29215a246b252f2d80f9 (diff) | |
| parent | c1751616381b6e8c8eae311107b5969a0233a6d8 (diff) | |
| download | git-88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8.zip git-88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8.tar.gz git-88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8.tar.bz2 | |
Merge branch 'jc/merge'
* branch 'jc/merge':
git-merge: do not leak rev-parse output used for checking internally.
git-merge: tighten error checking.
merge: allow merging into a yet-to-be-born branch.
git-merge: make it usable as the first class UI
remove merge-recursive-old
Diffstat (limited to 't')
| -rw-r--r-- | t/Makefile | 4 | ||||
| -rwxr-xr-x | t/t0000-basic.sh | 14 | ||||
| -rwxr-xr-x | t/test-lib.sh | 15 |
3 files changed, 6 insertions, 27 deletions
@@ -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 || { |