Skip to content

Commit d58b6bd

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

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
@@ -1657,6 +1657,12 @@ case $uname_s in
16571657
test_set_prereq GREP_STRIPS_CR
16581658
test_set_prereq WINDOWS
16591659
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1660+
if ! type iconv >/dev/null 2>&1
1661+
then
1662+
iconv () {
1663+
test-tool iconv "$@"
1664+
}
1665+
fi
16601666
;;
16611667
*CYGWIN*)
16621668
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)