* [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/
@ 2016-07-21 16:02 Johannes Schindelin
2016-07-21 17:10 ` Eric Wong
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin @ 2016-07-21 16:02 UTC (permalink / raw)
To: git; +Cc: Johannes Schindelin, Junio C Hamano, Eric Wong
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/
2016-07-21 16:02 [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/ Johannes Schindelin
@ 2016-07-21 17:10 ` Eric Wong
2017-01-27 14:03 ` Johannes Schindelin
0 siblings, 1 reply; 5+ messages in thread
From: Eric Wong @ 2016-07-21 17:10 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, Junio C Hamano
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/
2016-07-21 17:10 ` Eric Wong
@ 2017-01-27 14:03 ` Johannes Schindelin
2017-01-27 18:44 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin @ 2017-01-27 14:03 UTC (permalink / raw)
To: Eric Wong; +Cc: git, Junio C Hamano
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?
Ciao,
Johannes
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/
2017-01-27 14:03 ` Johannes Schindelin
@ 2017-01-27 18:44 ` Junio C Hamano
2017-01-27 20:47 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2017-01-27 18:44 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Eric Wong, git
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/
2017-01-27 18:44 ` Junio C Hamano
@ 2017-01-27 20:47 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2017-01-27 20:47 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Eric Wong, git
Junio C Hamano <gitster@pobox.com> writes:
> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-27 20:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-21 16:02 [PATCH] test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/ Johannes Schindelin
2016-07-21 17:10 ` Eric Wong
2017-01-27 14:03 ` Johannes Schindelin
2017-01-27 18:44 ` Junio C Hamano
2017-01-27 20:47 ` Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.