[PATCH v2] allow TTY tests to run under recent Mac OS
- From
Mike Blume <blume.mike@gmail.com>
- Date
- Nov 13, 2014, 22:40 UTC
- Message-ID
- <1415918419-20807-1-git-send-email-blume.mike@gmail.com>
listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable TTY on Yosemite and higher
Signed-off-by: Mike Blume <blume.mike@gmail.com> Improved-by: Junio C Hamano <gitster@pobox.com> --- t/lib-terminal.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh index 5184549..6395a34 100644 --- a/t/lib-terminal.sh +++ b/t/lib-terminal.sh @@ -29,7 +29,10 @@ 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.10.1 and Perl 5.18.2, this problem + # appears to be gone. + # + test "$(uname -s)" != Darwin || test "$(uname -r | cut -d. -f1)" -ge 14 && perl "$TEST_DIRECTORY"/test-terminal.perl \ sh -c "test -t 1 && test -t 2"
-- 2.2.0.rc1.197.g60bf093