diff options
| author | Mike Blume <blume.mike@gmail.com> | 2014-11-14 12:13:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-14 12:17:48 -0800 |
| commit | b3145869cbf744f671bbff3790af584835522aaf (patch) | |
| tree | 40e5c56dc42b9c65220350a386224e8d2c80655d | |
| parent | f5709437d963e585df0691989d3ccfee1de1572b (diff) | |
| download | git-mb/enable-lib-terminal-test-on-newer-darwin.tar.gz | |
t/lib-terminal: allow TTY tests to run under recent Mac OSmb/enable-lib-terminal-test-on-newer-darwin
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 <gitster@pobox.com>
Helped-by: John Szakmeister <john@szakmeister.net>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Mike Blume <blume.mike@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-terminal.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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" |