Skip to content

Commit 7b68371

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 5a52cf0 commit 7b68371

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
@@ -1672,6 +1672,12 @@ Darwin)
16721672
test_set_prereq GREP_STRIPS_CR
16731673
test_set_prereq WINDOWS
16741674
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
1675+
if ! type iconv >/dev/null 2>&1
1676+
then
1677+
iconv () {
1678+
test-tool iconv "$@"
1679+
}
1680+
fi
16751681
;;
16761682
*CYGWIN*)
16771683
test_set_prereq POSIXPERM

0 commit comments

Comments
 (0)