Skip to content

Commit af2e8f8

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

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
@@ -1723,6 +1723,12 @@ case $uname_s in
17231723
test_set_prereq GREP_STRIPS_CR
17241724
test_set_prereq WINDOWS
17251725
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1726+
if ! type iconv >/dev/null 2>&1
1727+
then
1728+
iconv () {
1729+
test-tool iconv "$@"
1730+
}
1731+
fi
17261732
;;
17271733
*CYGWIN*)
17281734
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)