[PATCH] test-lib: stricter unzip(1) check
- From
- Eric Wong <e@80x24.org>
- Date
- Jul 18, 2016, 06:44 UTC
- Message-ID
- <20160718064431.GA10819@starla>
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