New compendium test.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 65a7c108cd16914cca171af9394b69dcf1e9ea74..dc9977c65948dbb6d769fbe2bd96b3729bbf7df4 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-08  Bruno Haible  <haible@clisp.cons.org>
+
+       * msgmerge-12: New file, from Karl Eichwalder.
+       * Makefile.am (TESTS): Add it.
+
 2001-08-02  Bruno Haible  <haible@clisp.cons.org>
 
        * tstngettext.c (usage): Change bug report address to

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c22d7855540fbf433ee45cc45b456e676dae217a..d2545cc5c54486beb845d35b9167b126d6f916e1 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,7 +28,7 @@ TESTS = gettext-1 gettext-2 \
        msgcomm-20 msgcomm-21 msgcomm-22 msgcomm-23 \
        msgfmt-1 msgfmt-2 msgfmt-3 msgfmt-4 msgfmt-5 \
        msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \
-       msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 \
+       msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \
        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-12 b/tests/msgmerge-12
new file mode 100755 (executable)
index 0000000..6a981c2
--- /dev/null
+++ b/tests/msgmerge-12
@@ -0,0 +1,58 @@
+#! /bin/sh
+
+# Test compendium option.  Use it there was no "old" PO file at all
+# (merely use /dev/null).
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="mm-test12.com mm-test12.pot"
+
+cat <<EOF > mm-test12.com
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: file.c:345
+msgid "5"
+msgstr "fünf"
+EOF
+
+cat <<EOF > mm-test12.pot
+#: file.c:123
+msgid "1"
+msgstr ""
+
+#: file.c:345
+msgid "5"
+msgstr ""
+EOF
+
+tmpfiles="$tmpfiles mm-test12.out"
+: ${MSGMERGE=msgmerge}
+${MSGMERGE} -q --compendium mm-test12.com /dev/null mm-test12.pot -o mm-test12.out
+
+tmpfiles="$tmpfiles mm-test12.ok"
+cat << EOF > mm-test12.ok
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: file.c:123
+msgid "1"
+msgstr ""
+
+#: file.c:345
+msgid "5"
+msgstr "fünf"
+EOF
+
+: ${DIFF=diff}
+${DIFF} mm-test12.ok mm-test12.out
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result