diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-27 14:29:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-27 14:29:55 -0700 |
| commit | 36889a5078767be8cc0189c10d235dda327c6a30 (patch) | |
| tree | 84275b41ab53dd6b81bbf2cab25f70d221989be1 | |
| parent | 019298015bb7c826b72f2573047b7221b0921fd3 (diff) | |
| download | git-36889a5078767be8cc0189c10d235dda327c6a30.tar.gz | |
tests: merge-recursive is usable without Python
Many tests still protected themselves with $no_python; there is no need
to do so anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 5 | ||||
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 6 | ||||
| -rwxr-xr-x | t/t3403-rebase-skip.sh | 6 | ||||
| -rwxr-xr-x | t/t6021-merge-criss-cross.sh | 6 | ||||
| -rwxr-xr-x | t/t6022-merge-rename.sh | 6 |
5 files changed, 1 insertions, 28 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 360a67060e..8b19d3ccea 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -52,13 +52,10 @@ test_expect_success \ 'rebase topic branch against new master and check git-am did not get halted' \ 'git-rebase master && test ! -d .dotest' -if test -z "$no_python" -then - test_expect_success \ +test_expect_success \ 'rebase --merge topic branch that was partially merged upstream' \ 'git-checkout -f my-topic-branch-merge && git-rebase --merge master-merge && test ! -d .git/.dotest-merge' -fi test_done diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index d34c6cf6f3..0779aaa9ab 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -7,12 +7,6 @@ test_description='git rebase --merge test' . ./test-lib.sh -if test "$no_python"; then - echo "Skipping: no python => no recursive merge" - test_done - exit 0 -fi - T="A quick brown fox jumps over the lazy dog." for i in 1 2 3 4 5 6 7 8 9 10 diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index bb25315361..977c498f00 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -10,12 +10,6 @@ test_description='git rebase --merge --skip tests' # we assume the default git-am -3 --skip strategy is tested independently # and always works :) -if test "$no_python"; then - echo "Skipping: no python => no recursive merge" - test_done - exit 0 -fi - test_expect_success setup ' echo hello > hello && git add hello && diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index 8f7366da8d..499cafb882 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -10,12 +10,6 @@ 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 5ac25647ab..497ef36ad8 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -3,12 +3,6 @@ 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 && |