Skip to content

Commit 8018825

Browse files
committed
tests(mingw): if iconv is unavailable, use test-helper --iconv
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 8b20fb4 commit 8018825

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

t/test-lib.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,6 +1642,12 @@ case $uname_s in
16421642
test_set_prereq GREP_STRIPS_CR
16431643
test_set_prereq WINDOWS
16441644
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1645+
if ! type iconv >/dev/null 2>&1
1646+
then
1647+
iconv () {
1648+
test-tool iconv "$@"
1649+
}
1650+
fi
16451651
;;
16461652
*CYGWIN*)
16471653
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)