Skip to content

Commit 6a86f61

Browse files
committed
tests(mingw): if iconv is unavailable, use test-helper --iconv
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 3643719 commit 6a86f61

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
@@ -1681,6 +1681,12 @@ Darwin)
16811681
test_set_prereq GREP_STRIPS_CR
16821682
test_set_prereq WINDOWS
16831683
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1684+
if ! type iconv >/dev/null 2>&1
1685+
then
1686+
iconv () {
1687+
test-tool iconv "$@"
1688+
}
1689+
fi
16841690
;;
16851691
*CYGWIN*)
16861692
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)