tests: Reorganize msgmerge tests.

* gettext-tools/tests/msgmerge-6: Renamed from gettext-tools/tests/msgmerge-9.
* gettext-tools/tests/msgmerge-7: Renamed from gettext-tools/tests/msgmerge-15.
* gettext-tools/tests/msgmerge-8: Renamed from gettext-tools/tests/msgmerge-17.
* gettext-tools/tests/Makefile.am (TESTS): Update.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index b9e29a4ecec7c0f543d3bae6ab4417af16169ce5..ed10d8b1df6307531ea874e7f08aa534a6b89dcb 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -61,9 +61,9 @@ TESTS = gettext-1 gettext-2 \
        msggrep-1 msggrep-2 msggrep-3 msggrep-4 msggrep-5 msggrep-6 msggrep-7 \
        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-9 \
-       msgmerge-15 msgmerge-17 msgmerge-18 msgmerge-19 msgmerge-20 \
-       msgmerge-25 msgmerge-26 msgmerge-27 msgmerge-29 \
+       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-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 \

diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-6
similarity index 61%
rename from gettext-tools/tests/msgmerge-9
rename to gettext-tools/tests/msgmerge-6
index a6e18840a7b2bbd463557b2cfdca7631a510be11..ea22f52634c2bbffbd1e26fe1cb6d34ffe53af4d 100755 (executable)
--- a/gettext-tools/tests/msgmerge-9
+++ b/gettext-tools/tests/msgmerge-6
@@ -3,7 +3,7 @@
 
 # Duplicates are also fatal in obsolete marked entries (cf. msgmerge-3).
 
-cat <<\EOF > mm-test9.in1
+cat <<\EOF > mm-test6.in1
 msgid "2" msgstr "2"
 msgid "3" msgstr "3"
 #~ msgid
@@ -12,7 +12,7 @@ msgid "3" msgstr "3"
 #~ "ha ha"
 EOF
 
-cat <<\EOF > mm-test9.in2
+cat <<\EOF > mm-test6.in2
 msgid "1" msgstr ""
 msgid "2" msgstr ""
 msgid "3" msgstr ""
@@ -20,17 +20,17 @@ EOF
 
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q -o /dev/null mm-test9.in1 mm-test9.in2 \
-    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' -e 's|^msgmerge\.exe|msgmerge|' -e 's|^/cygdrive/[^ ]*/msgmerge|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test9.err
+${MSGMERGE} -q -o /dev/null mm-test6.in1 mm-test6.in2 \
+    2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' -e 's|^msgmerge\.exe|msgmerge|' -e 's|^/cygdrive/[^ ]*/msgmerge|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test6.err
 
-cat << EOF > mm-test9.ok
-mm-test9.in1:3: duplicate message definition...
-mm-test9.in1:1: ...this is the location of the first definition
+cat << EOF > mm-test6.ok
+mm-test6.in1:3: duplicate message definition...
+mm-test6.in1:1: ...this is the location of the first definition
 msgmerge: found 1 fatal error
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test9.ok mm-test9.err
+${DIFF} mm-test6.ok mm-test6.err
 result=$?
 
 exit $result

diff --git a/gettext-tools/tests/msgmerge-15 b/gettext-tools/tests/msgmerge-7
similarity index 81%
rename from gettext-tools/tests/msgmerge-15
rename to gettext-tools/tests/msgmerge-7
index 30dca36fe2e07c07e54d1417d879b504ef0b147c..2fe78a323c04e5107b519554bbb085703b8fbba4 100755 (executable)
--- a/gettext-tools/tests/msgmerge-15
+++ b/gettext-tools/tests/msgmerge-7
@@ -3,7 +3,7 @@
 
 # Test pseudo-comments containing filenames that start with a digit.
 
-cat <<\EOF > mm-test15.pot
+cat <<\EOF > mm-test7.pot
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.5\n"
@@ -19,7 +19,7 @@ msgid "invalid argument `%s' for `%s'"
 msgstr "ungültiges Argument »%s« für »%s«"
 EOF
 
-cat <<\EOF > mm-test15.po
+cat <<\EOF > mm-test7.po
 #: 123.c:134
 #, c-format
 msgid "invalid argument `%s' for `%s'"
@@ -27,10 +27,10 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test15.tmp mm-test15.pot mm-test15.po || Exit 1
-LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out || Exit 1
+${MSGMERGE} -q -o mm-test7.tmp mm-test7.pot mm-test7.po || Exit 1
+LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out || Exit 1
 
-cat <<\EOF > mm-test15.ok
+cat <<\EOF > mm-test7.ok
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.11.5\n"
@@ -47,7 +47,7 @@ msgstr "ungültiges Argument »%s« für »%s«"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test15.ok mm-test15.out
+${DIFF} mm-test7.ok mm-test7.out
 result=$?
 
 exit $result

diff --git a/gettext-tools/tests/msgmerge-17 b/gettext-tools/tests/msgmerge-8
similarity index 86%
rename from gettext-tools/tests/msgmerge-17
rename to gettext-tools/tests/msgmerge-8
index 6b64fcd01a3a64728cbcf07ba8ab2781bf46f178..3eaaf906624f6cbcdb8bb4756b177c90c0eb1305 100755 (executable)
--- a/gettext-tools/tests/msgmerge-17
+++ b/gettext-tools/tests/msgmerge-8
@@ -4,7 +4,7 @@
 # Test that untranslated messages that are brought over from the .pot file
 # get the right number of msgstrs.
 
-cat <<\EOF > mm-test17.po
+cat <<\EOF > mm-test8.po
 # Irish translations.
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgid "'Your command, please?', asked the waiter."
 msgstr ""
 EOF
 
-cat <<\EOF > mm-test17.pot
+cat <<\EOF > mm-test8.pot
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -51,10 +51,10 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test17.tmp.po mm-test17.po mm-test17.pot || Exit 1
-LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po || Exit 1
+${MSGMERGE} -q -o mm-test8.tmp.po mm-test8.po mm-test8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test8.tmp.po > mm-test8.new.po || Exit 1
 
-cat <<\EOF > mm-test17.ok
+cat <<\EOF > mm-test8.ok
 # Irish translations.
 msgid ""
 msgstr ""
@@ -80,7 +80,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test17.ok mm-test17.new.po
+${DIFF} mm-test8.ok mm-test8.new.po
 result=$?
 
 exit $result