Skip to content

Commit e36a6be

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

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

t/test-lib.sh

+6
Original file line numberDiff line numberDiff line change
@@ -1730,6 +1730,12 @@ case $uname_s in
17301730
test_set_prereq GREP_STRIPS_CR
17311731
test_set_prereq WINDOWS
17321732
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1733+
if ! type iconv >/dev/null 2>&1
1734+
then
1735+
iconv () {
1736+
test-tool iconv "$@"
1737+
}
1738+
fi
17331739
;;
17341740
*CYGWIN*)
17351741
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)