sh t3403-rebase-skip.sh </dev/null fails because stdin is not connected to a terminal, as in the Debian autobuild environment. This disbales the test 3 and 7 in this case. Signed-off-by: Gerrit Pape <pape@xxxxxxxxxxx> --- t/t3403-rebase-skip.sh | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index 8ab63c5..983d152 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -39,10 +39,16 @@ test_expect_success setup ' test_expect_failure 'rebase with git am -3 (default)' 'git rebase master' -test_expect_success 'rebase --skip with am -3' ' - git reset --hard HEAD && - git rebase --skip - ' +if tty -s +then + test_expect_success 'rebase --skip with am -3' ' + git reset --hard HEAD && + git rebase --skip + ' +else + echo 'stdin is not a terminal, skip test.' +fi + test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge' test_expect_failure 'rebase with --merge' 'git rebase --merge master' @@ -52,8 +58,13 @@ test_expect_success 'rebase --skip with git rebase --skip ' -test_expect_success 'merge and reference trees equal' \ - 'test -z "`git-diff-tree skip-merge skip-reference`"' +if tty -s +then + test_expect_success 'merge and reference trees equal' \ + 'test -z "`git-diff-tree skip-merge skip-reference`"' +else + echo 'stdin is not a terminal, skip test.' +fi test_debug 'gitk --all & sleep 1' -- 1.4.2.1 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html