Skip to content

Commit 38ad181

Browse files
dschomjcheetham
authored andcommitted
tests(mingw): if iconv is unavailable, use test-helper --iconv
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 32bae6f commit 38ad181

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

0 commit comments

Comments
 (0)