diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:52:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:52:18 -0800 |
| commit | 664368886781b7c070233c002597b84628eec571 (patch) | |
| tree | 2cb6cf87bdb0ca4ecfe8487cf4fef71fd26e8197 /t | |
| parent | 83f50539a9b1f18ccf0a4e1b84169eb4a24b3ea4 (diff) | |
| parent | abb7c7b31c0896bd838bbb6437b310db5a42227a (diff) | |
| download | git-664368886781b7c070233c002597b84628eec571.tar.gz git-664368886781b7c070233c002597b84628eec571.tar.xz | |
Merge part of jc/portable branch
Diffstat (limited to 't')
| -rw-r--r-- | t/Makefile | 4 | ||||
| -rwxr-xr-x | t/t0000-basic.sh | 2 | ||||
| -rwxr-xr-x | t/t6021-merge-criss-cross.sh | 6 | ||||
| -rwxr-xr-x | t/t6022-merge-rename.sh | 6 | ||||
| -rwxr-xr-x | t/test-lib.sh | 2 |
5 files changed, 19 insertions, 1 deletions
diff --git a/t/Makefile b/t/Makefile index 5c5a62012..ba6ddbec9 100644 --- a/t/Makefile +++ b/t/Makefile @@ -15,6 +15,10 @@ shellquote = '$(call shq,$(1))' T = $(wildcard t[0-9][0-9][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 c339a366f..6729a1826 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -42,7 +42,7 @@ fi . ./test-lib.sh -"$PYTHON" -c 'import subprocess' || { +test "$no_python" || "$PYTHON" -c 'import subprocess' || { echo >&2 'Your python seem to lack "subprocess" module. Please check INSTALL document.' exit 1 diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index e8606c751..262381379 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -10,6 +10,12 @@ test_description='Test criss-cross merge' . ./test-lib.sh +if test "$no_python"; then + echo "Skipping: no python => no recursive merge" + test_done + exit 0 +fi + test_expect_success 'prepare repository' \ 'echo "1 2 diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 1292cafd7..a2d24b5ca 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -3,6 +3,12 @@ test_description='Merge-recursive merging renames' . ./test-lib.sh +if test "$no_python"; then + echo "Skipping: no python => no recursive merge" + test_done + exit 0 +fi + test_expect_success setup \ ' cat >A <<\EOF && diff --git a/t/test-lib.sh b/t/test-lib.sh index 66f62b9c6..05f6e7956 100755 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -63,6 +63,8 @@ do exit 0 ;; -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) verbose=t; shift ;; + --no-python) + no_python=t; shift ;; *) break ;; esac |