Update expected output.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 361642162b22939a547fa1a5ff0a20ddc33b64f7..4de0f61eb87e9cf21606da4b36da235f58727b5f 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-06  Bruno Haible  <bruno@clisp.org>
+
+       * msgfmt-12: Update expected output.
+       * format-c-3: Likewise.
+       * format-c-4: Likewise.
+       * format-c-5: Likewise.
+
 2006-08-28  Bruno Haible  <bruno@clisp.org>
 
        * xgettext-scheme-2: New file.

diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3
index 5aa21c3d6342361aa63dc7fc1ea383d7540c730a..495fa181a0992e4d411cb157eff8aee9b5876530 100755 (executable)
--- a/gettext-tools/tests/format-c-3
+++ b/gettext-tools/tests/format-c-3
@@ -37,11 +37,8 @@ tmpfiles="$tmpfiles de.po.tmp"
 : ${MSGUNFMT=msgunfmt}
 ${MSGUNFMT} -o de.po.tmp de/LC_MESSAGES/fc3.mo
 
-tmpfiles="$tmpfiles de.po.strip"
-sed 1d < de.po > de.po.strip
-
 : ${DIFF=diff}
-${DIFF} de.po.strip de.po.tmp || exit 1
+${DIFF} de.po de.po.tmp || exit 1
 
 LANGUAGE= ./fc3 de_DE
 result=$?

diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4
index 068b8d5347c899595a1a2c0e06192d55b1aaeb51..fcfe2e901f6632794f8fb38a4858dbe15e94ea74 100755 (executable)
--- a/gettext-tools/tests/format-c-4
+++ b/gettext-tools/tests/format-c-4
@@ -41,11 +41,8 @@ tmpfiles="$tmpfiles de.po.tmp"
 : ${MSGUNFMT=msgunfmt}
 ${MSGUNFMT} -o de.po.tmp de/LC_MESSAGES/fc4.mo
 
-tmpfiles="$tmpfiles de.po.strip"
-sed 1d < de.po > de.po.strip
-
 : ${DIFF=diff}
-${DIFF} de.po.strip de.po.tmp || exit 1
+${DIFF} de.po de.po.tmp || exit 1
 
 LANGUAGE= ./fc4 de_DE
 result=$?

diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 00077afa6041778c27aa66c43e3e87f7d92a6e09..469eef7e56837a6757184aae2a8dfbea5d43c5d6 100755 (executable)
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -38,11 +38,8 @@ tmpfiles="$tmpfiles fa.po.tmp"
 : ${MSGUNFMT=msgunfmt}
 ${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo
 
-tmpfiles="$tmpfiles fa.po.strip"
-sed 1d < fa.po > fa.po.strip
-
 : ${DIFF=diff}
-${DIFF} fa.po.strip fa.po.tmp || exit 1
+${DIFF} fa.po fa.po.tmp || exit 1
 
 LANGUAGE= ./fc5 fa_IR
 case $? in

diff --git a/gettext-tools/tests/msgfmt-12 b/gettext-tools/tests/msgfmt-12
index 565a32b87c4e9c4c0a3c66ec99519e44fa6dfc47..23b376f6f29c913fd2f2407e2709232bb34414a2 100755 (executable)
--- a/gettext-tools/tests/msgfmt-12
+++ b/gettext-tools/tests/msgfmt-12
@@ -40,9 +40,11 @@ msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
 msgid "<PRIXFAST16> errors"
 msgstr "<PRIXFAST16> Fehler"
 
+#, c-format
 msgid "File size is: %<PRId64>"
 msgstr "Dateigröße ist: %<PRId64>"
 
+#, c-format
 msgid "File age is %10<PRIdMAX> microseconds"
 msgstr "Datei ist %10<PRIdMAX> Mikrosekunden alt."
 EOF