Three new tests from Karl Eichwalder.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 956ced6231d577e0b05d7ce4aeae106e5d0464c9..6dd22799d2d966759072867807935f8814a2e038 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-27  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (TESTS): Add msgmerge-14, msgmerge-15, msgmerge-16.
+
+2001-11-25  Karl Eichwalder <ke@gnu.franken.de>
+
+       * msgmerge-14: New file.
+       * msgmerge-15: New file.
+       * msgmerge-16: New file.
+
 2001-11-25  Bruno Haible  <bruno@clisp.org>
 
        * lang-c: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 22dadd7d142a00e1b27ecc83f3c7863f4ef0e70d..0f07ba630f9b2e268ccc6bc82732094c9df88e00 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,7 +30,7 @@ TESTS = gettext-1 gettext-2 \
        msgfmt-8 msgfmt-9 \
        msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \
        msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \
-       msgmerge-13 \
+       msgmerge-13 msgmerge-14 msgmerge-15 msgmerge-16 \
        msgunfmt-1 \
        msguniq-1 msguniq-2 msguniq-3 \
        xgettext-1 xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 \

diff --git a/tests/msgmerge-14 b/tests/msgmerge-14
new file mode 100755 (executable)
index 0000000..b55b144
--- /dev/null
+++ b/tests/msgmerge-14
@@ -0,0 +1,74 @@
+#! /bin/sh
+
+# Test --update: nothing changed; don't normalize second message
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test14.in1"
+cat <<EOF > mm-test14.in1
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cog_training 1.0\n"
+"POT-Creation-Date: 2001-04-29 22:40+0200\n"
+"PO-Revision-Date: 2001-04-29 21:19+02:00\n"
+"Last-Translator: Felix N. <xyz@zyx.uucp>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cogarithmetic.cc:12
+msgid "white"
+msgstr "weiß"
+
+# stay away from normalizing
+#: cogarithmetic.cc:12
+msgid "black"
+msgstr ""
+"schwarz"
+EOF
+
+tmpfiles="$tmpfiles mm-test14.pot"
+cat <<EOF > mm-test14.pot
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2001-04-29 22:40+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cogarithmetic.cc:12
+msgid "white"
+msgstr ""
+
+#: cogarithmetic.cc:12
+msgid "black"
+msgstr ""
+EOF
+
+tmpfiles="$tmpfiles mm-test14.bak"
+cp mm-test14.in1 mm-test14.bak
+
+: ${MSGMERGE=msgmerge}
+${MSGMERGE} -q --update mm-test14.in1 mm-test14.pot
+
+: ${DIFF=diff}
+${DIFF} mm-test14.bak mm-test14.in1
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result

diff --git a/tests/msgmerge-15 b/tests/msgmerge-15
new file mode 100755 (executable)
index 0000000..99735fb
--- /dev/null
+++ b/tests/msgmerge-15
@@ -0,0 +1,86 @@
+#! /bin/sh
+
+# Test --update: location changed, and xgettext comment added. Both changes
+# must be reflected in the resulting PO file.
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test15.po"
+cat <<EOF > mm-test15.po
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cog_training 1.0\n"
+"POT-Creation-Date: 2001-04-29 22:40+0200\n"
+"PO-Revision-Date: 2001-04-29 21:19+02:00\n"
+"Last-Translator: Felix N. <xyz@zyx.uucp>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cogarithmetic.cc:12
+msgid "white"
+msgstr "weiß"
+EOF
+
+tmpfiles="$tmpfiles mm-test15.pot"
+cat <<EOF > mm-test15.pot
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2001-04-29 22:40+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. location changed
+#: cogarithmetic.cc:33
+msgid "white"
+msgstr ""
+EOF
+
+: ${MSGMERGE=msgmerge}
+${MSGMERGE} -q --update mm-test15.po mm-test15.pot
+
+tmpfiles="$tmpfiles mm-test15.ok"
+cat <<EOF > mm-test15.ok
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cog_training 1.0\n"
+"POT-Creation-Date: 2001-04-29 22:40+0200\n"
+"PO-Revision-Date: 2001-04-29 21:19+02:00\n"
+"Last-Translator: Felix N. <xyz@zyx.uucp>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. location changed
+#: cogarithmetic.cc:33
+msgid "white"
+msgstr "weiß"
+EOF
+
+: ${DIFF=diff}
+${DIFF} mm-test15.ok mm-test15.po
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result

diff --git a/tests/msgmerge-16 b/tests/msgmerge-16
new file mode 100755 (executable)
index 0000000..2d3f7c5
--- /dev/null
+++ b/tests/msgmerge-16
@@ -0,0 +1,84 @@
+#! /bin/sh
+
+# Test --update: POT-Creation-Date changed. This change must be reflected
+# in the resulting PO file.
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mm-test16.po"
+cat <<EOF > mm-test16.po
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cog_training 1.0\n"
+"POT-Creation-Date: 2001-04-29 22:40+0200\n"
+"PO-Revision-Date: 2001-04-29 21:19+02:00\n"
+"Last-Translator: Felix N. <xyz@zyx.uucp>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cogarithmetic.cc:12 cogidmarkup.cc:288 cogroman.cc:14
+msgid "white"
+msgstr "weiß"
+EOF
+
+tmpfiles="$tmpfiles mm-test16.pot"
+cat <<EOF > mm-test16.pot
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2001-04-30 18:51+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cogarithmetic.cc:12 cogidmarkup.cc:288 cogroman.cc:14
+msgid "white"
+msgstr ""
+EOF
+
+: ${MSGMERGE=msgmerge}
+${MSGMERGE} -q --update mm-test16.po mm-test16.pot
+
+tmpfiles="$tmpfiles mm-test16.ok"
+cat <<EOF > mm-test16.ok
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cog_training 1.0\n"
+"POT-Creation-Date: 2001-04-30 18:51+0200\n"
+"PO-Revision-Date: 2001-04-29 21:19+02:00\n"
+"Last-Translator: Felix N. <xyz@zyx.uucp>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cogarithmetic.cc:12 cogidmarkup.cc:288 cogroman.cc:14
+msgid "white"
+msgstr "weiß"
+EOF
+
+: ${DIFF=diff}
+${DIFF} mm-test16.ok mm-test16.po
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result