diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-04 23:02:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-04 23:02:26 (GMT) |
| commit | 53d31d71b7432391a8a5c7fdcbc38d803d6bd7e2 (patch) | |
| tree | 6b3a67bfcec9e34fbd127ddff4463a0529fae8b4 | |
| parent | 51aca1665b9fa8214927780fbccd1915649b3c44 (diff) | |
| parent | 339e5638b0a11ea3218214ffb57732098c3705df (diff) | |
| download | git-53d31d71b7432391a8a5c7fdcbc38d803d6bd7e2.zip git-53d31d71b7432391a8a5c7fdcbc38d803d6bd7e2.tar.gz git-53d31d71b7432391a8a5c7fdcbc38d803d6bd7e2.tar.bz2 | |
Merge branch 'jn/test-terminal-punt-on-osx-breakage'
* jn/test-terminal-punt-on-osx-breakage:
tests: skip terminal output tests on OS X
| -rw-r--r-- | t/lib-terminal.sh | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh index c383b57..58d911d 100644 --- a/t/lib-terminal.sh +++ b/t/lib-terminal.sh @@ -1,8 +1,24 @@ #!/bin/sh -test_expect_success 'set up terminal for tests' ' - if - test_have_prereq PERL && +test_expect_success PERL 'set up terminal for tests' ' + # Reading from the pty master seems to get stuck _sometimes_ + # on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9. + # + # Reproduction recipe: run + # + # i=0 + # while ./test-terminal.perl echo hi $i + # do + # : $((i = $i + 1)) + # done + # + # After 2000 iterations or so it hangs. + # https://rt.cpan.org/Ticket/Display.html?id=65692 + # + if test "$(uname -s)" = Darwin + then + : + elif "$PERL_PATH" "$TEST_DIRECTORY"/test-terminal.perl \ sh -c "test -t 1 && test -t 2" then |