[PATCH v4] Allow TTY tests to run under recent Mac OS
- From
Mike Blume <blume.mike@gmail.com>
- Date
- Nov 14, 2014, 20:13 UTC
- Message-ID
- <1415995993-70879-1-git-send-email-blume.mike@gmail.com>
TTY tests were previously skipped on all Mac OS systems because of a bug where reading from pty master occasionally hung. This bug has since been found not to be reproducible under Mac OS 10.9 and 10.10.1.
Therefore, run TTY tests under Mac OS 10.9 (Mavericks) and higher.
Signed-off-by: Mike Blume <blume.mike@gmail.com> Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Improved-by: John Szakmeister <john@szakmeister.net> Improved-by: Johannes Sixt <j6t@kdbg.org> Improved-by: Jeff King <peff@peff.net> --- t/lib-terminal.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh index 5184549..275fb09 100644 --- a/t/lib-terminal.sh +++ b/t/lib-terminal.sh @@ -29,7 +29,12 @@ test_lazy_prereq TTY ' # After 2000 iterations or so it hangs. # https://rt.cpan.org/Ticket/Display.html?id=65692 # - test "$(uname -s)" != Darwin && + # Under Mac OS X 10.9, this problem appears to be gone. + # + { + test "$(uname -s)" != Darwin || + test "$(uname -r | cut -d. -f1)" -ge 13 + } && perl "$TEST_DIRECTORY"/test-terminal.perl \ sh -c "test -t 1 && test -t 2"
-- 2.2.0.rc1.197.g60bf093