From b3145869cbf744f671bbff3790af584835522aaf Mon Sep 17 00:00:00 2001 From: Mike Blume Date: Fri, 14 Nov 2014 12:13:13 -0800 Subject: t/lib-terminal: allow TTY tests to run under recent Mac OS TTY tests were previously skipped on all Mac OS systems to avoid a bug where reading from pty master occasionally hung. The bug has since been found not to be reproducible under Mac OS 10.9 and 10.10.1, so allow TTY tests under Mac OS 10.9 (Mavericks) and more recent versions. Helped-by: Junio C Hamano Helped-by: John Szakmeister Helped-by: Johannes Sixt Helped-by: Jeff King Signed-off-by: Mike Blume Signed-off-by: Junio C Hamano --- 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 51845491bb..275fb092e2 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" -- cgit v1.2.1