Skip to content

Commit d7c058b

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

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
@@ -1243,6 +1243,12 @@ case $uname_s in
12431243
test_set_prereq SED_STRIPS_CR
12441244
test_set_prereq GREP_STRIPS_CR
12451245
GIT_TEST_CMP="test-tool cmp"
1246+
if ! type iconv >/dev/null 2>&1
1247+
then
1248+
iconv () {
1249+
test-tool iconv "$@"
1250+
}
1251+
fi
12461252
;;
12471253
*CYGWIN*)
12481254
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)