From: Eric Wong <e@80x24.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jeff King" <peff@peff.net>, "René Scharfe" <l.s.r@web.de>,
git@vger.kernel.org
Subject: [PATCH] test-lib: stricter unzip(1) check
Date: Mon, 18 Jul 2016 06:44:31 +0000 [thread overview]
Message-ID: <20160718064431.GA10819@starla> (raw)
On FreeBSD 10.3 (but presumably any FreeBSD 8+), /usr/bin/unzip
exists, but is insufficient for t5003 due to its non-standard
handling of the -a option[1]. This version of unzip exits
with "1" when given the "-v" flag.
However, the common Info-ZIP version may be installed at
/usr/local/bin/unzip (via "pkg install unzip") to pass t5003.
This Info-ZIP version exits with "0" when given "-v",
so limit the prereq to only versions which return 0 on "-v".
[1] https://www.freebsd.org/cgi/man.cgi?query=unzip&sektion=1&manpath=FreeBSD+10.3-RELEASE
Signed-off-by: Eric Wong <e@80x24.org>
---
t/test-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 11201e9..938f788 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1103,7 +1103,7 @@ test_lazy_prereq SANITY '
GIT_UNZIP=${GIT_UNZIP:-unzip}
test_lazy_prereq UNZIP '
"$GIT_UNZIP" -v
- test $? -ne 127
+ test $? -eq 0
'
run_with_limited_cmdline () {
--
EW
next reply other threads:[~2016-07-18 6:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-18 6:44 Eric Wong [this message]
2016-07-18 13:04 ` [PATCH] test-lib: stricter unzip(1) check Jeff King
2016-07-18 13:52 ` Johannes Schindelin
2016-07-18 18:20 ` Junio C Hamano
2016-07-18 18:56 ` Jeff King
2016-07-18 19:17 ` Junio C Hamano
2016-07-19 11:27 ` Johannes Schindelin
2016-07-19 17:26 ` Junio C Hamano
2016-07-18 19:43 ` Junio C Hamano
2016-07-18 20:03 ` Eric Wong
2016-07-18 20:19 ` Junio C Hamano
2016-07-18 21:19 ` Eric Wong
2016-07-18 21:27 ` Junio C Hamano
2016-07-18 23:41 ` Jeff King
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=20160718064431.GA10819@starla \
--to=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).