Skip to content

Commit 023e1cc

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

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
@@ -1669,6 +1669,12 @@ Darwin)
16691669
test_set_prereq GREP_STRIPS_CR
16701670
test_set_prereq WINDOWS
16711671
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1672+
if ! type iconv >/dev/null 2>&1
1673+
then
1674+
iconv () {
1675+
test-tool iconv "$@"
1676+
}
1677+
fi
16721678
;;
16731679
*CYGWIN*)
16741680
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)