From: Bruno Haible <bruno@clisp.org>
Date: Sat, 27 Jan 2007 15:46:21 +0000 (+0000)
Subject: Avoid a test failure with GNU smalltalk 2.3.
X-Git-Tag: v0.17~494
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=159fb615c3490f327db8463bdd0dc1a3853931a9;p=thirdparty%2Fgettext.git

Avoid a test failure with GNU smalltalk 2.3.
---

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 85e5e7a1b..0a5590eb2 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-27  Bruno Haible  <bruno@clisp.org>
+
+	* lang-smalltalk: Update expected result so that it works with GNU
+	smalltalk 2.3 as well.
+
 2007-01-07  Bruno Haible  <bruno@clisp.org>
 
 	* msgmerge-20: New file.
diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index 7308428e5..bc34a5f2f 100755
--- a/gettext-tools/tests/lang-smalltalk
+++ b/gettext-tools/tests/lang-smalltalk
@@ -101,30 +101,35 @@ case `gst --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'` in
     echo "Skipping test: gst version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
-tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
+tmpfiles="$tmpfiles prog.ok prog.oku prog.ok2 prog.oku2 prog.out"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
-Loading package I18N
 «Votre commande, s'il vous plait», dit le garçon.
 2 morceaux de gateau
 EUR remplace FF.
 EOF
 cat <<\EOF > prog.oku
-Loading package I18N
 «Votre commande, s'il vous plait», dit le garçon.
 2 morceaux de gateau
 EUR remplace FF.
 EOF
+# gst versions older than 2.3 also print "Loading package I18N".
+{ echo 'Loading package I18N'; cat prog.ok; } > prog.ok2
+{ echo 'Loading package I18N'; cat prog.oku; } > prog.oku2
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR gst -Q prog.st > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  ${DIFF} prog.ok prog.out > /dev/null ||
+    ${DIFF} prog.ok2 prog.out > /dev/null ||
+      { ${DIFF} prog.ok prog.out; exit 1; }
 fi
 if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gst -Q prog.st > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  ${DIFF} prog.oku prog.out > /dev/null ||
+    ${DIFF} prog.oku2 prog.out > /dev/null ||
+      { ${DIFF} prog.oku prog.out; exit 1; }
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then