* gettext-tools/tests/msgmerge-9: Renamed from gettext-tools/tests/msgmerge-18.
* gettext-tools/tests/msgmerge-10: Renamed from gettext-tools/tests/msgmerge-19.
* gettext-tools/tests/msgmerge-11: Renamed from gettext-tools/tests/msgmerge-20.
* gettext-tools/tests/msgmerge-12: Renamed from gettext-tools/tests/msgmerge-25.
* gettext-tools/tests/msgmerge-13: Renamed from gettext-tools/tests/msgmerge-26.
* gettext-tools/tests/msgmerge-14: Renamed from gettext-tools/tests/msgmerge-27.
* gettext-tools/tests/msgmerge-15: Renamed from gettext-tools/tests/msgmerge-29.
* gettext-tools/tests/Makefile.am (TESTS): Update.
msggrep-8 msggrep-9 msggrep-10 msggrep-11 \
msginit-1 msginit-2 msginit-3 msginit-4 \
msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \
- msgmerge-7 msgmerge-8 msgmerge-18 msgmerge-19 msgmerge-20 msgmerge-25 \
- msgmerge-26 msgmerge-27 msgmerge-29 \
+ msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \
+ msgmerge-13 msgmerge-14 msgmerge-15 \
msgmerge-charset-1 msgmerge-charset-2 msgmerge-charset-3 \
msgmerge-compendium-1 msgmerge-compendium-2 msgmerge-compendium-3 \
msgmerge-compendium-4 msgmerge-compendium-5 msgmerge-compendium-6 \
# Test msgmerge --previous option.
-cat <<\EOF > mm-test19.po
+cat <<\EOF > mm-test10.po
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
msgstr "%s: ungültige Option -- %c\n"
EOF
-cat <<\EOF > mm-test19.pot
+cat <<\EOF > mm-test10.pot
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.po mm-test19.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po || Exit 1
+${MSGMERGE} -q --previous -o mm-test10.tmp.po mm-test10.po mm-test10.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test10.tmp.po > mm-test10.new1.po || Exit 1
-cat <<\EOF > mm-test19.ok1
+cat <<\EOF > mm-test10.ok1
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
EOF
: ${DIFF=diff}
-${DIFF} mm-test19.ok1 mm-test19.new1.po || Exit 1
+${DIFF} mm-test10.ok1 mm-test10.new1.po || Exit 1
-cat <<\EOF > mm-test19.pot
+cat <<\EOF > mm-test10.pot
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.new1.po mm-test19.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po || Exit 1
+${MSGMERGE} -q --previous -o mm-test10.tmp.po mm-test10.new1.po mm-test10.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test10.tmp.po > mm-test10.new2.po || Exit 1
-cat <<\EOF > mm-test19.ok2
+cat <<\EOF > mm-test10.ok2
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
EOF
: ${DIFF=diff}
-${DIFF} mm-test19.ok2 mm-test19.new2.po || Exit 1
+${DIFF} mm-test10.ok2 mm-test10.new2.po || Exit 1
Exit 0
# Test msgmerge when the second argument is a PO file with obsolete messages
# (e.g. the result of an earlier msgmerge operation).
-cat <<\EOF > mm-test20.po
+cat <<\EOF > mm-test11.po
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
msgstr "Dieses Programm läuft mit der Prozeß-Nummer {pid}."
EOF
-cat <<\EOF > mm-test20.pot
+cat <<\EOF > mm-test11.pot
#, fuzzy
msgid ""
msgstr ""
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test20.tmp.po mm-test20.po mm-test20.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po || Exit 1
+${MSGMERGE} -q -o mm-test11.tmp.po mm-test11.po mm-test11.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test11.tmp.po > mm-test11.new.po || Exit 1
-cat <<\EOF > mm-test20.ok
+cat <<\EOF > mm-test11.ok
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
EOF
: ${DIFF=diff}
-${DIFF} mm-test20.ok mm-test20.new.po || Exit 1
+${DIFF} mm-test11.ok mm-test11.new.po || Exit 1
Exit 0
# Test --add-location=file option.
-cat <<\EOF > mm-test25.in1
+cat <<\EOF > mm-test12.in1
# first
#. this should be discarded
msgid "1"
msgstr "3z"
EOF
-cat <<\EOF > mm-test25.in2
+cat <<\EOF > mm-test12.in2
#. this is the first
#: snark.c:345
msgid "1"
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} --add-location=file -q -o mm-test25.tmp mm-test25.in1 mm-test25.in2 \
+${MSGMERGE} --add-location=file -q -o mm-test12.tmp mm-test12.in1 mm-test12.in2 \
|| Exit 1
-LC_ALL=C tr -d '\r' < mm-test25.tmp > mm-test25.out || Exit 1
+LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out || Exit 1
-cat << EOF > mm-test25.ok
+cat << EOF > mm-test12.ok
# first
#. this is the first
#: snark.c
EOF
: ${DIFF=diff}
-${DIFF} mm-test25.ok mm-test25.out
+${DIFF} mm-test12.ok mm-test12.out
result=$?
exit $result
# Test --for-msgfmt option.
-cat <<\EOF > mm-test26.in1
+cat <<\EOF > mm-test13.in1
#: fruits.c:14
msgid "cherry"
msgstr "cerise"
msgstr "pommes"
EOF
-cat <<\EOF > mm-test26.in2
+cat <<\EOF > mm-test13.in2
# Fuzzy already in the PO file.
#: fruits.c:10
msgid "apple"
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} --for-msgfmt -o mm-test26.tmp mm-test26.in1 mm-test26.in2 \
+${MSGMERGE} --for-msgfmt -o mm-test13.tmp mm-test13.in1 mm-test13.in2 \
|| Exit 1
-LC_ALL=C tr -d '\r' < mm-test26.tmp > mm-test26.out || Exit 1
+LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out || Exit 1
-cat << EOF > mm-test26.ok
+cat << EOF > mm-test13.ok
msgid "pear"
msgstr "poire"
EOF
: ${DIFF=diff}
-${DIFF} mm-test26.ok mm-test26.out || Exit 1
+${DIFF} mm-test13.ok mm-test13.out || Exit 1
# Test with a PO file that has no translated messages.
-cat <<\EOF > mm-test26a.in1
+cat <<\EOF > mm-test13a.in1
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
msgstr "Hallo Welt"
EOF
-cat <<\EOF > mm-test26a.in2
+cat <<\EOF > mm-test13a.in2
msgid ""
msgstr ""
"Content-Type: text/plain; charset=ASCII\n"
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \
+${MSGMERGE} --for-msgfmt -o mm-test13a.tmp mm-test13a.in1 mm-test13a.in2 \
|| Exit 1
-LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1
+LC_ALL=C tr -d '\r' < mm-test13a.tmp > mm-test13a.out || Exit 1
-cat <<\EOF > mm-test26a.ok
+cat <<\EOF > mm-test13a.ok
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
EOF
: ${DIFF=diff}
-${DIFF} mm-test26a.ok mm-test26a.out || Exit 1
+${DIFF} mm-test13a.ok mm-test13a.out || Exit 1
# Test that the msgmerge output is stable under an 'msgcat' invocation.
# Also test what happens with the 'no-wrap' flag during msgmerge.
-cat <<\EOF > mm-test27.po
+cat <<\EOF > mm-test14.po
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
msgstr "Dies ist ein weiterer langer Abschnitt, der nicht in mehrere Zeilen umgebrochen wird, weil er als 'no-wrap' markiert ist."
EOF
-cat <<\EOF > mm-test27-1.pot
+cat <<\EOF > mm-test14-1.pot
#, fuzzy
msgid ""
msgstr ""
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test27.tmp.po mm-test27.po mm-test27-1.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test27.tmp.po > mm-test27.new.po || Exit 1
+${MSGMERGE} -q -o mm-test14.tmp.po mm-test14.po mm-test14-1.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test14.tmp.po > mm-test14.new.po || Exit 1
: ${MSGCAT=msgcat}
-${MSGCAT} mm-test27.new.po > mm-test27.tmp.po || Exit 1
-LC_ALL=C tr -d '\r' < mm-test27.tmp.po > mm-test27.cat.po || Exit 1
+${MSGCAT} mm-test14.new.po > mm-test14.tmp.po || Exit 1
+LC_ALL=C tr -d '\r' < mm-test14.tmp.po > mm-test14.cat.po || Exit 1
: ${DIFF=diff}
-${DIFF} mm-test27.new.po mm-test27.cat.po || Exit 1
+${DIFF} mm-test14.new.po mm-test14.cat.po || Exit 1
-cat <<\EOF > mm-test27-1.ok
+cat <<\EOF > mm-test14-1.ok
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
EOF
: ${DIFF=diff}
-${DIFF} mm-test27-1.ok mm-test27.new.po || Exit 1
+${DIFF} mm-test14-1.ok mm-test14.new.po || Exit 1
# Now test what happens with the 'no-wrap' flag when merging with a POT file
# where the 'no-wrap' flag is set.
-cat <<\EOF > mm-test27-2.pot
+cat <<\EOF > mm-test14-2.pot
#, fuzzy
msgid ""
msgstr ""
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test27.tmp.po mm-test27.new.po mm-test27-2.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test27.tmp.po > mm-test27-2.po || Exit 1
+${MSGMERGE} -q -o mm-test14.tmp.po mm-test14.new.po mm-test14-2.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test14.tmp.po > mm-test14-2.po || Exit 1
-cat <<\EOF > mm-test27-2.ok
+cat <<\EOF > mm-test14-2.ok
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
EOF
: ${DIFF=diff}
-${DIFF} mm-test27-2.ok mm-test27-2.po || Exit 1
+${DIFF} mm-test14-2.ok mm-test14-2.po || Exit 1
# Now test what happens with the 'no-wrap' flag when merging with a POT file
# where the 'no-wrap' flag is absent.
-cat <<\EOF > mm-test27-3.pot
+cat <<\EOF > mm-test14-3.pot
#, fuzzy
msgid ""
msgstr ""
EOF
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test27.tmp.po mm-test27.new.po mm-test27-3.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test27.tmp.po > mm-test27-3.po || Exit 1
+${MSGMERGE} -q -o mm-test14.tmp.po mm-test14.new.po mm-test14-3.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test14.tmp.po > mm-test14-3.po || Exit 1
-cat <<\EOF > mm-test27-3.ok
+cat <<\EOF > mm-test14-3.ok
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
EOF
: ${DIFF=diff}
-${DIFF} mm-test27-3.ok mm-test27-3.po || Exit 1
+${DIFF} mm-test14-3.ok mm-test14-3.po || Exit 1
Exit 0
--- /dev/null
+#! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
+
+# Test --sort-by-file option, when no file positions are present.
+
+cat <<\EOF > mm-test15.po
+msgid "a"
+msgstr "a"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "b"
+#~ msgstr "b"
+EOF
+
+cat <<\EOF > mm-test15.pot
+msgid "a"
+msgstr ""
+EOF
+
+: ${MSGMERGE=msgmerge}
+${MSGMERGE} -q --sort-by-file -o mm-test15.tmp mm-test15.po mm-test15.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.po2 || Exit 1
+${MSGMERGE} -q --sort-by-file -o mm-test15.tmp mm-test15.po2 mm-test15.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.po3 || Exit 1
+
+cat <<\EOF > mm-test15.ok
+msgid "a"
+msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+EOF
+
+: ${DIFF=diff}
+${DIFF} mm-test15.ok mm-test15.po2 || Exit 1
+${DIFF} mm-test15.ok mm-test15.po3 || Exit 1
+
+Exit 0
+++ /dev/null
-#! /bin/sh
-. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-
-# Test --sort-by-file option, when no file positions are present.
-
-cat <<\EOF > mm-test29.po
-msgid "a"
-msgstr "a"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "b"
-#~ msgstr "b"
-EOF
-
-cat <<\EOF > mm-test29.pot
-msgid "a"
-msgstr ""
-EOF
-
-: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --sort-by-file -o mm-test29.tmp mm-test29.po mm-test29.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test29.tmp > mm-test29.po2 || Exit 1
-${MSGMERGE} -q --sort-by-file -o mm-test29.tmp mm-test29.po2 mm-test29.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test29.tmp > mm-test29.po3 || Exit 1
-
-cat <<\EOF > mm-test29.ok
-msgid "a"
-msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
-
-#~ msgid "d"
-#~ msgstr "d"
-EOF
-
-: ${DIFF=diff}
-${DIFF} mm-test29.ok mm-test29.po2 || Exit 1
-${DIFF} mm-test29.ok mm-test29.po3 || Exit 1
-
-Exit 0
# Test msgmerge and msgcmp on a PO file with contexts.
-cat <<\EOF > mm-test18.po
+cat <<\EOF > mm-test9.po
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
msgstr "photocopieur"
EOF
-cat <<\EOF > mm-test18.pot
+cat <<\EOF > mm-test9.pot
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
EOF
: ${MSGCMP=msgcmp}
-${MSGCMP} --use-fuzzy --use-untranslated mm-test18.po mm-test18.pot 2>/dev/null
+${MSGCMP} --use-fuzzy --use-untranslated mm-test9.po mm-test9.pot 2>/dev/null
test $? = 1 || { Exit 1; }
: ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test18.tmp.po mm-test18.po mm-test18.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po || Exit 1
+${MSGMERGE} -q -o mm-test9.tmp.po mm-test9.po mm-test9.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test9.tmp.po > mm-test9.new.po || Exit 1
# Note that the fuzzy guess for "Open" in context "Door state" could be either
# "Ouvrir" (from context "File|") or "Ouvert" (from context "Lock state").
-cat <<\EOF > mm-test18.ok
+cat <<\EOF > mm-test9.ok
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
EOF
: ${DIFF=diff}
-${DIFF} mm-test18.ok mm-test18.new.po || Exit 1
+${DIFF} mm-test9.ok mm-test9.new.po || Exit 1
: ${MSGCMP=msgcmp}
-${MSGCMP} --use-fuzzy --use-untranslated mm-test18.new.po mm-test18.pot || Exit 1
+${MSGCMP} --use-fuzzy --use-untranslated mm-test9.new.po mm-test9.pot || Exit 1
Exit 0
projects / thirdparty / gettext.git / commitdiff
