diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-03 00:36:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-03 00:36:55 +0300 |
| commit | d008809bb5d1f9a669ee89b77b3a4b6bb7905009 (patch) | |
| tree | 63b808e2691b9b41ea4a52e372bbe5c234649ba8 /t | |
| parent | d3a0172a824657640b1ebcb49f18d19b69095423 (diff) | |
| parent | d98b2c5fce0ae4ee3fbe34037798460d59e28432 (diff) | |
Merge branch 'js/unzip-in-usr-bin-workaround'
Test tweak for FreeBSD where /usr/bin/unzip is unsuitable to run
our tests but /usr/local/bin/unzip is usable.
* js/unzip-in-usr-bin-workaround:
test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index cde7fc7fcf..86d77c16dd 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -966,7 +966,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 () { @@ -1141,6 +1142,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 |