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

From: Michael Blume <blume.mike@gmail.com>
Date: Nov 13, 2014, 22:40 UTC
Message-ID: <CAO2U3QgbCVnF=TFWD5ZFjMSc=ez21KObSdF=v75DfDSJhH8A5Q@mail.gmail.com>
In-Reply-To: <xmqq1tp6zqq1.fsf@gitster.dls.corp.google.com>

ah, sorry, didn't realize those were bash-only

On Thu, Nov 13, 2014 at 2:21 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 30 quoted lines

> Mike Blume <blume.mike@gmail.com> writes:
>
>> 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>
>> ---
>>  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..1311ce0 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 designed to be a plain vanilla POSIX shell script.  Please
> avoid these double brackets.
>
>>
>>       perl "$TEST_DIRECTORY"/test-terminal.perl \
>>               sh -c "test -t 1 && test -t 2"