Re: [PATCH v2] allow TTY tests to run under recent Mac OS
From: Johannes Sixt <hidden>
Date: 2016-06-15 23:02:56
Am 13.11.2014 um 23:40 schrieb Mike Blume:
quoted hunk ↗ jump to hunk
listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable TTY on Yosemite and higher Signed-off-by: Mike Blume <redacted> Improved-by: Junio C Hamano [off-list ref] --- 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 &&
This is part of an &&-chain; you can't just throw in a || in the middle. How about if test "$(uname -s)" = Darwin then test "$(uname -r | cut -d. -f1)" -ge 14 fi &&
perl "$TEST_DIRECTORY"/test-terminal.perl \ sh -c "test -t 1 && test -t 2"
-- Hannes