From c1bc594bd7945f8de6178cc508a5e36dd57a5991 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 20 Jul 2017 22:25:21 +0200
Subject: [PATCH] tests(mingw): if `iconv` is unavailable, use `test-helper
--iconv`
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/test-lib.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index e3d010ff487a7f..4363a3663c0f7d 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1645,6 +1645,12 @@ case $uname_s in
test_set_prereq GREP_STRIPS_CR
test_set_prereq WINDOWS
GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --"
+ if ! type iconv >/dev/null 2>&1
+ then
+ iconv () {
+ test-tool iconv "$@"
+ }
+ fi
;;
*CYGWIN*)
test_set_prereq POSIXPERM