summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2008-06-01 14:27:01 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:15:44 +0200
commita2d661c9418826bbab6a34f7a36385b4e008086d (patch)
treede5ee11dcd9efb66cdbfdb528141a3960f02ccba
parentf0f7e541e4cc9d0209cea02fe0f745772bbef0ad (diff)
downloadexternal_gettext-a2d661c9418826bbab6a34f7a36385b4e008086d.zip
external_gettext-a2d661c9418826bbab6a34f7a36385b4e008086d.tar.gz
external_gettext-a2d661c9418826bbab6a34f7a36385b4e008086d.tar.bz2
Avoid test failure on MacOS X with gst-3.0.3.
-rw-r--r--gettext-tools/tests/ChangeLog4
-rwxr-xr-xgettext-tools/tests/lang-smalltalk10
2 files changed, 12 insertions, 2 deletions
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index b9c3c66..b53c78e 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-01 Bruno Haible <bruno@clisp.org>
+
+ * lang-smalltalk: Avoid test failure with gst-3.0.3 on MacOS X.
+
2008-05-26 Bruno Haible <bruno@clisp.org>
* gettext-8: New file.
diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index ea01239..e114239 100755
--- a/gettext-tools/tests/lang-smalltalk
+++ b/gettext-tools/tests/lang-smalltalk
@@ -122,6 +122,10 @@ 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
+# gst version 3.0.3 also prints "Loading package Iconv" and
+# "Loading package I18N".
+{ echo 'Loading package Iconv'; echo 'Loading package I18N'; cat prog.ok; } > prog.ok3
+{ echo 'Loading package Iconv'; echo 'Loading package I18N'; cat prog.oku; } > prog.oku3
: ${LOCALE_FR=fr_FR}
: ${LOCALE_FR_UTF8=fr_FR.UTF-8}
@@ -129,13 +133,15 @@ if test $LOCALE_FR != none; then
LANGUAGE= LC_ALL=$LOCALE_FR gst -Q prog.st > 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; }
+ ${DIFF} prog.ok3 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 > /dev/null ||
${DIFF} prog.oku2 prog.out > /dev/null ||
- { ${DIFF} prog.oku prog.out; exit 1; }
+ ${DIFF} prog.oku3 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