From: Bruno Haible <bruno@clisp.org>
Date: Sun, 25 Sep 2022 19:51:45 +0000 (+0200)
Subject: Fix an MSVC/clang test failure.
X-Git-Tag: v0.21.1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bb9595280e3a0532e1485dbc55c5631864630cd;p=thirdparty%2Fgettext.git

Fix an MSVC/clang test failure.

* gettext-tools/tests/lang-objc: On native Windows, ignore different end-of-line
convention in the output.
---

diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index bc2578cc1..43eac4517 100755
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -145,18 +145,26 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= ./prog $LOCALE_FR 2 > prog.out
+  LANGUAGE= ./prog $LOCALE_FR 2 > prog.tmp
   case $? in
-    0) ${DIFF} prog.ok prog.out || Exit 1;;
+    0) case "$host_os" in
+         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         *) cp prog.tmp prog.out || Exit 1 ;;
+       esac
+       ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
     *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.out
+  LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.tmp
   case $? in
-    0) ${DIFF} prog.oku prog.out || Exit 1;;
+    0) case "$host_os" in
+         mingw*) LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1 ;;
+         *) cp prog.tmp prog.out || Exit 1 ;;
+       esac
+       ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
     *) Exit 1;;
   esac