Git development
 help / color / mirror / Atom feed
From: Mike Blume <blume.mike@gmail.com>
To: git@vger.kernel.org
Cc: Mike Blume <blume.mike@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v4] Allow TTY tests to run under recent Mac OS
Date: Fri, 14 Nov 2014 12:13:13 -0800	[thread overview]
Message-ID: <1415995993-70879-1-git-send-email-blume.mike@gmail.com> (raw)

TTY tests were previously skipped on all Mac OS systems because of a
bug where reading from pty master occasionally hung. This bug has since
been found not to be reproducible under Mac OS 10.9 and 10.10.1.

Therefore, run TTY tests under Mac OS 10.9 (Mavericks) and higher.

Signed-off-by: Mike Blume <blume.mike@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Improved-by: John Szakmeister <john@szakmeister.net>
Improved-by: Johannes Sixt <j6t@kdbg.org>
Improved-by: Jeff King <peff@peff.net>
---
 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 5184549..275fb09 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"
-- 
2.2.0.rc1.197.g60bf093

             reply	other threads:[~2014-11-14 20:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-14 20:13 Mike Blume [this message]
2014-11-14 20:20 ` [PATCH v4] Allow TTY tests to run under recent Mac OS Junio C Hamano
2014-11-14 23:21 ` Jonathan Nieder
2014-11-14 23:29   ` Junio C Hamano
2014-11-15  0:14   ` John Szakmeister

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1415995993-70879-1-git-send-email-blume.mike@gmail.com \
    --to=blume.mike@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox