From: Bruno Haible <bruno@clisp.org>
Date: Sun, 28 Apr 2019 09:13:30 +0000 (+0200)
Subject: Fix lang-csharp test failure on DragonFly BSD.
X-Git-Tag: v0.20~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fe3cab6a407014c79b5cc9bf854781a3a415e33;p=thirdparty%2Fgettext.git

Fix lang-csharp test failure on DragonFly BSD.

Reported by Nelson H. F. Beebe.

* gettext-tools/tests/lang-csharp: For the locale with ISO-8859-1 encoding,
allow an expected result in UTF-8 encoding.
---

diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp
index 42dd440c6..3ccdd5257 100755
--- a/gettext-tools/tests/lang-csharp
+++ b/gettext-tools/tests/lang-csharp
@@ -191,16 +191,11 @@ if test $LOCALE_FR != none; then
   # in the fr_FR.ISO8859-1 locale. System.Text.Encoding.Default is defined
   # through InternalCodePage(), which uses g_get_charset(), which uses either
   # locale_charset() or nl_langinfo(CODESET) [which is "ISO8859-1" in this case]
-  # or "UTF-8" - depending on platform or build configuration. So, skip this
-  # test on Mac OS X.
-  case "$host_os" in
-    darwin*) ;;
-    *)
-      prepare_locale_ fr $LOCALE_FR
-      LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || Exit 1
-      ${DIFF} prog.ok prog.out || Exit 1
-      ;;
-  esac
+  # or "UTF-8" - depending on platform or build configuration. So, allow the
+  # expected result in UTF-8 encoding here too.
+  prepare_locale_ fr $LOCALE_FR
+  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out >/dev/null || ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8