Skip to content

Commit 487e42a

Browse files
dschoGit for Windows Build Agent
authored andcommitted
tests(mingw): if iconv is unavailable, use test-helper --iconv
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 96a3805 commit 487e42a

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
@@ -1667,6 +1667,12 @@ Darwin)
16671667
test_set_prereq GREP_STRIPS_CR
16681668
test_set_prereq WINDOWS
16691669
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1670+
if ! type iconv >/dev/null 2>&1
1671+
then
1672+
iconv () {
1673+
test-tool iconv "$@"
1674+
}
1675+
fi
16701676
;;
16711677
*CYGWIN*)
16721678
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)