Skip to content

Commit fb511c2

Browse files
dschoGit for Windows Build Agent
authored andcommitted
tests(mingw): if iconv is unavailable, use test-helper --iconv
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 3b52a84 commit fb511c2

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

t/test-lib.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,6 +1722,12 @@ Darwin)
17221722
test_set_prereq GREP_STRIPS_CR
17231723
test_set_prereq WINDOWS
17241724
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1725+
if ! type iconv >/dev/null 2>&1
1726+
then
1727+
iconv () {
1728+
test-tool iconv "$@"
1729+
}
1730+
fi
17251731
;;
17261732
*CYGWIN*)
17271733
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)