From: Johannes Sixt <j6t@kdbg•org>
To: Mike Blume <blume.mike@gmail•com>, git@vger•kernel.org
Subject: Re: [PATCH v2] allow TTY tests to run under recent Mac OS
Date: Fri, 14 Nov 2014 20:23:52 +0100 [thread overview]
Message-ID: <546656C8.3070009@kdbg.org> (raw)
In-Reply-To: <1415918419-20807-1-git-send-email-blume.mike@gmail.com>
Am 13.11.2014 um 23:40 schrieb Mike Blume:
> 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 &&
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
next prev parent reply other threads:[~2014-11-14 19:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 22:40 [PATCH v2] allow TTY tests to run under recent Mac OS Mike Blume
2014-11-14 10:43 ` John Szakmeister
2014-11-14 19:23 ` Johannes Sixt [this message]
2014-11-14 19:48 ` Michael Blume
2014-11-14 20:02 ` Jeff King
2014-11-14 20:04 ` Michael Blume
2014-11-14 20:16 ` Junio C Hamano
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=546656C8.3070009@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=blume.mike@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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