threads / patch / 42901

patchtest-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

Subject: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

## tl;dr

5 messages between Jul 21, 2016 and Jan 27, 2017. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Johannes Schindelin· Jul 21, 2016, 16:02 UTC · lore

From: Johannes Schindelin <Johannes.Schindelin@gmx.de>

Eric Wong reported that while FreeBSD has a /usr/bin/unzip, it uses different semantics from those that are needed by Git's tests: When passing the -a option to Info-Zip, it heeds the text attribute of the .zip file's central directory, while FreeBSD's unzip ignores that attribute.

The common work-around is to install Info-Zip on FreeBSD, into /usr/local/bin/.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Published-As: https://github.com/dscho/git/releases/tag/freebsd-unzip-v1
 t/test-lib.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Show changes to t/test-lib.sh +3 −1

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 11201e9..dd2f70c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -929,7 +929,8 @@ yes () {
 }
 
 # Fix some commands on Windows
-case $(uname -s) in
+uname_s=$(uname -s)
+case $uname_s in
 *MINGW*)
 	# Windows has its own (incompatible) sort and find
 	sort () {
@@ -1100,6 +1101,7 @@ test_lazy_prereq SANITY '
 	return $status
 '
 
+test FreeBSD != $uname_s || GIT_UNZIP=${GIT_UNZIP:-/usr/local/bin/unzip}
 GIT_UNZIP=${GIT_UNZIP:-unzip}
 test_lazy_prereq UNZIP '
 	"$GIT_UNZIP" -v

-- 
2.9.0.281.g286a8d9

base-commit: 29493589e97a2de0c4c1c314f61ccafaee3b5caf

Eric Wong· Jul 21, 2016, 17:10 UTC · re: Johannes Schindelin · lore

Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

Johannes Schindelin <johannes.schindelin@gmx.de> wrote:

> The common work-around is to install Info-Zip on FreeBSD, into
> /usr/local/bin/.
> 
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Thanks, t5003 now works out-of-the-box. Tested with Info-ZIP unzip installed and uninstalled.

Tested-by: Eric Wong <e@80x24.org>

Johannes Schindelin· Jan 27, 2017, 14:03 UTC · re: Eric Wong · lore

Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

Hi Junio,

On Thu, 21 Jul 2016, Eric Wong wrote:

Show 10 quoted lines

> Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
> > The common work-around is to install Info-Zip on FreeBSD, into
> > /usr/local/bin/.
> > 
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> Thanks, t5003 now works out-of-the-box.
> Tested with Info-ZIP unzip installed and uninstalled.
> 
> Tested-by: Eric Wong <e@80x24.org>

Did you forget about this?

Ciao, Johannes

Junio C Hamano· Jan 27, 2017, 18:44 UTC · re: Johannes Schindelin · lore

Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 16 quoted lines

> Hi Junio,
>
> On Thu, 21 Jul 2016, Eric Wong wrote:
>
>> Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
>> > The common work-around is to install Info-Zip on FreeBSD, into
>> > /usr/local/bin/.
>> > 
>> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>> 
>> Thanks, t5003 now works out-of-the-box.
>> Tested with Info-ZIP unzip installed and uninstalled.
>> 
>> Tested-by: Eric Wong <e@80x24.org>
>
> Did you forget about this?

This fell off the radar.

You could have resent with Eric's Tested-by: added, to make it easier to apply. I'll see if I can find the original but it won't happen until later this afternoon.

Junio C Hamano· Jan 27, 2017, 20:47 UTC · re: Junio C Hamano · lore

Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/

Junio C Hamano <gitster@pobox.com> writes:

Show 15 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> On Thu, 21 Jul 2016, Eric Wong wrote:
>>
>>> Thanks, t5003 now works out-of-the-box.
>>> Tested with Info-ZIP unzip installed and uninstalled.
>>> 
>>> Tested-by: Eric Wong <e@80x24.org>
>>
>> Did you forget about this?
>
> This fell off the radar.  
>
> You could have resent with Eric's Tested-by: added, to make it
> easier to apply.  I'll see if I can find the original but it won't
> happen until later this afternoon.

The errand I needed to run earlier in the day turned out to be not so time consuming---I found the exchange and the patch is now queued, and will be part of today's pushout.

Thanks, both.