threads / patch / 37957

patchallow TTY tests to run under recent Mac OS

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

## tl;dr

4 messages between Nov 13, 2014 and Nov 14, 2014. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Mike Blume· Nov 13, 2014, 22:01 UTC · lore

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(-)

Show changes to t/lib-terminal.sh +4 −1

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 ]] &&
 
 	perl "$TEST_DIRECTORY"/test-terminal.perl \
 		sh -c "test -t 1 && test -t 2"

-- 
2.2.0.rc1.197.g60bf093

Junio C Hamano· Nov 13, 2014, 22:21 UTC · re: Mike Blume · lore

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

Mike Blume <blume.mike@gmail.com> writes:

Show 21 quoted lines

> 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"

Michael Blume· Nov 13, 2014, 22:40 UTC · re: Junio C Hamano · lore

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

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"

Torsten Bögershausen· Nov 14, 2014, 05:24 UTC · re: Mike Blume · lore

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

On 11/13/2014 11:01 PM, Mike Blume wrote:

Show 21 quoted lines

> 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 seems to be bash syntax (the "[[" can (and should) be easily avoided)

Another question: Is this related to perl or Mac OS ? The commit message is indicating that the combination of Mac OS 10.10.1 and perl 5.18.2 is working, but the code does not reflect this. Does it make sense to test for the perl version in the code? Or is it OK to mention

  Under Mac OS X 10.10.1 which ships with Perl 5.18.2, this problem....

>   
>   	perl "$TEST_DIRECTORY"/test-terminal.perl \
>   		sh -c "test -t 1 && test -t 2"