Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH v3] allow TTY tests to run under recent Mac OS

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:02:56

Mike Blume [off-list ref] writes:
listed bug doesn't reproduce on Mac OS Yosemite or Mavericks. For now,
just enable TTY on Mavericks and higher
What is "listed bug" that begins a sentence in lowercase?
End the description in full-stop, s/higher/&./;
quoted hunk
Signed-off-by: Mike Blume <redacted>
Improved-by: Junio C Hamano [off-list ref]
Signed-off-by: Junio C Hamano <redacted>
Improved-by: John Szakmeister [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..7348f7e 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 13 &&
Is that "13" you have here consistent with "10.10.1" above in the
comment?  I am not a Mac person, but I vaguely recall that they are
usually off by four.
 
 	perl "$TEST_DIRECTORY"/test-terminal.perl \
 		sh -c "test -t 1 && test -t 2"
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help