When the tests work in a pure POSIX environment.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 500e82b2929b23af3e7b6412529130b84d9f7911..443925cec577f9f1cdd4a9709f0ff11487474e78 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,128 @@
+2005-11-21  Bruno Haible  <bruno@clisp.org>
+
+       * format-c-3: Put all non-option arguments after all option arguments,
+       so that the test works 1. when POSIXLY_CORRECT is set, 2. on platforms
+       whose getopt facility is POSIX compliant but not GNU libc compatible,
+       such as Cygwin.
+       * format-c-4: Likewise.
+       * format-c-5: Likewise.
+       * msgattrib-1: Likewise.
+       * msgattrib-2: Likewise.
+       * msgattrib-3: Likewise.
+       * msgattrib-4: Likewise.
+       * msgattrib-5: Likewise.
+       * msgattrib-6: Likewise.
+       * msgattrib-7: Likewise.
+       * msgattrib-8: Likewise.
+       * msgattrib-9: Likewise.
+       * msgattrib-10: Likewise.
+       * msgattrib-11: Likewise.
+       * msgattrib-12: Likewise.
+       * msgattrib-13: Likewise.
+       * msgattrib-14: Likewise.
+       * msgattrib-15: Likewise.
+       * msgattrib-properties-1: Likewise.
+       * msgcat-1: Likewise.
+       * msgcat-11: Likewise.
+       * msgcat-properties-1: Likewise.
+       * msgcat-properties-2: Likewise.
+       * msgcat-stringtable-1: Likewise.
+       * msgcomm-17: Likewise.
+       * msgcomm-18: Likewise.
+       * msgcomm-19: Likewise.
+       * msgcomm-21: Likewise.
+       * msgcomm-23: Likewise.
+       * msgconv-1: Likewise.
+       * msgconv-2: Likewise.
+       * msgconv-4: Likewise.
+       * msgconv-5: Likewise.
+       * msgen-1: Likewise.
+       * msgen-2: Likewise.
+       * msgen-3: Likewise.
+       * msgfmt-1: Likewise.
+       * msgfmt-2: Likewise.
+       * msgfmt-3: Likewise.
+       * msgfmt-4: Likewise.
+       * msgfmt-5: Likewise.
+       * msgfmt-10: Likewise.
+       * msgfmt-12: Likewise.
+       * msgfmt-14: Likewise.
+       * msgfmt-15: Likewise.
+       * msgfmt-properties-1: Likewise.
+       * msgfmt-qt-1: Likewise.
+       * msggrep-1: Likewise.
+       * msggrep-2: Likewise.
+       * msggrep-3: Likewise.
+       * msggrep-4: Likewise.
+       * msggrep-5: Likewise.
+       * msggrep-6: Likewise.
+       * msggrep-7: Likewise.
+       * msgmerge-1: Likewise.
+       * msgmerge-2: Likewise.
+       * msgmerge-3: Likewise.
+       * msgmerge-4: Likewise.
+       * msgmerge-5: Likewise.
+       * msgmerge-6: Likewise.
+       * msgmerge-7: Likewise.
+       * msgmerge-8: Likewise.
+       * msgmerge-9: Likewise.
+       * msgmerge-10: Likewise.
+       * msgmerge-11: Likewise.
+       * msgmerge-12: Likewise.
+       * msgmerge-13: Likewise.
+       * msgmerge-14: Likewise.
+       * msgmerge-15: Likewise.
+       * msgmerge-16: Likewise.
+       * msgmerge-17: Likewise.
+       * msgmerge-18: Likewise.
+       * msgmerge-compendium-1: Likewise.
+       * msgmerge-compendium-2: Likewise.
+       * msgmerge-compendium-3: Likewise.
+       * msgmerge-compendium-4: Likewise.
+       * msgmerge-properties-1: Likewise.
+       * msgunfmt-1: Likewise.
+       * msgunfmt-csharp-1: Likewise.
+       * msgunfmt-java-1: Likewise.
+       * msgunfmt-properties-1: Likewise.
+       * msguniq-1: Likewise.
+       * msguniq-2: Likewise.
+       * msguniq-3: Likewise.
+       * msguniq-4: Likewise.
+       * msguniq-5: Likewise.
+       * plural-1: Likewise.
+       * xgettext-awk-1: Likewise.
+       * xgettext-c-3: Likewise.
+       * xgettext-c-4: Likewise.
+       * xgettext-c-5: Likewise.
+       * xgettext-c-6: Likewise.
+       * xgettext-c-9: Likewise.
+       * xgettext-c-10: Likewise.
+       * xgettext-c-11: Likewise.
+       * xgettext-csharp-5: Likewise.
+       * xgettext-elisp-1: Likewise.
+       * xgettext-java-5: Likewise.
+       * xgettext-librep-1: Likewise.
+       * xgettext-lisp-1: Likewise.
+       * xgettext-objc-1: Likewise.
+       * xgettext-objc-2: Likewise.
+       * xgettext-perl-1: Likewise.
+       * xgettext-perl-5: Likewise.
+       * xgettext-php-1: Likewise.
+       * xgettext-po-1: Likewise.
+       * xgettext-properties-1: Likewise.
+       * xgettext-python-2: Likewise.
+       * xgettext-python-3: Likewise.
+       * xgettext-scheme-1: Likewise.
+       * xgettext-sh-1: Likewise.
+       * xgettext-sh-2: Likewise.
+       * xgettext-sh-3: Likewise.
+       * xgettext-sh-4: Likewise.
+       * xgettext-smalltalk-1: Likewise.
+       * xgettext-stringtable-1: Likewise.
+       * xgettext-tcl-2: Likewise.
+       * xgettext-ycp-2: Likewise.
+       Reported by Charles Wilson <cygwin@cwilson.fastmail.fm>.
+
 2005-11-21  Bruno Haible  <bruno@clisp.org>
 
        * gettext-4: Skip the test if there is no de_DE.ISO-8859-1 locale.

diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3
index 4d705b0049bd3ba11ecb061531fc49dc11524231..5aa21c3d6342361aa63dc7fc1ea383d7540c730a 100755 (executable)
--- a/gettext-tools/tests/format-c-3
+++ b/gettext-tools/tests/format-c-3
@@ -35,7 +35,7 @@ ${MSGFMT} -o de/LC_MESSAGES/fc3.mo de.po
 
 tmpfiles="$tmpfiles de.po.tmp"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} de/LC_MESSAGES/fc3.mo -o de.po.tmp
+${MSGUNFMT} -o de.po.tmp de/LC_MESSAGES/fc3.mo
 
 tmpfiles="$tmpfiles de.po.strip"
 sed 1d < de.po > de.po.strip

diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4
index 78fa50a0785dd9e29f25601daefa1020c7983451..068b8d5347c899595a1a2c0e06192d55b1aaeb51 100755 (executable)
--- a/gettext-tools/tests/format-c-4
+++ b/gettext-tools/tests/format-c-4
@@ -39,7 +39,7 @@ ${MSGFMT} -o de/LC_MESSAGES/fc4.mo de.po
 
 tmpfiles="$tmpfiles de.po.tmp"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} de/LC_MESSAGES/fc4.mo -o de.po.tmp
+${MSGUNFMT} -o de.po.tmp de/LC_MESSAGES/fc4.mo
 
 tmpfiles="$tmpfiles de.po.strip"
 sed 1d < de.po > de.po.strip

diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 7430ac34c16123086e9fc70d68d2abfc653c76ce..8b9b252e01343bb02e8710a4f0b24f913644d3ac 100755 (executable)
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -36,7 +36,7 @@ ${MSGFMT} -o fa/LC_MESSAGES/fc5.mo fa.po
 
 tmpfiles="$tmpfiles fa.po.tmp"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} fa/LC_MESSAGES/fc5.mo -o fa.po.tmp
+${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo
 
 tmpfiles="$tmpfiles fa.po.strip"
 sed 1d < fa.po > fa.po.strip

diff --git a/gettext-tools/tests/msgattrib-1 b/gettext-tools/tests/msgattrib-1
index b95888f43fb3c07b35c8adca7f34dc359ba063b8..9e1fa8dfc00e40f2863df017610d3697ab2a1652 100755 (executable)
--- a/gettext-tools/tests/msgattrib-1
+++ b/gettext-tools/tests/msgattrib-1
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test1.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated ma-test1.po -o ma-test1.out
+${MSGATTRIB} --translated -o ma-test1.out ma-test1.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test1.ok"

diff --git a/gettext-tools/tests/msgattrib-10 b/gettext-tools/tests/msgattrib-10
index 60949365c8ac7db71a7271bf967ada13f80a2004..e982ce96fa347328e4d4fe04cd9be044dcac3a04 100755 (executable)
--- a/gettext-tools/tests/msgattrib-10
+++ b/gettext-tools/tests/msgattrib-10
@@ -59,7 +59,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test10.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --set-obsolete ma-test10.po -o ma-test10.out
+${MSGATTRIB} --set-obsolete -o ma-test10.out ma-test10.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test10.ok"

diff --git a/gettext-tools/tests/msgattrib-11 b/gettext-tools/tests/msgattrib-11
index e89b63622dfd61c89d120a08c82b196090d3500f..7d980071bbfb0f69648263405454173ebc78e65a 100755 (executable)
--- a/gettext-tools/tests/msgattrib-11
+++ b/gettext-tools/tests/msgattrib-11
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test11.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-obsolete ma-test11.po -o ma-test11.out
+${MSGATTRIB} --clear-obsolete -o ma-test11.out ma-test11.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test11.ok"

diff --git a/gettext-tools/tests/msgattrib-12 b/gettext-tools/tests/msgattrib-12
index 75f2917548b825424a3460925034988ed4213510..cefc5d44f89375945f86d4b524f60c9e744f3379 100755 (executable)
--- a/gettext-tools/tests/msgattrib-12
+++ b/gettext-tools/tests/msgattrib-12
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test12.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --fuzzy ma-test12.po -o ma-test12.out
+${MSGATTRIB} --fuzzy -o ma-test12.out ma-test12.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test12.ok"

diff --git a/gettext-tools/tests/msgattrib-13 b/gettext-tools/tests/msgattrib-13
index 2fd98be08b413f26a0473214ffa3ac0b89bdc00c..52343d7413f536de5227b2e6c66136d08174ab88 100755 (executable)
--- a/gettext-tools/tests/msgattrib-13
+++ b/gettext-tools/tests/msgattrib-13
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test13.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --obsolete ma-test13.po -o ma-test13.out
+${MSGATTRIB} --obsolete -o ma-test13.out ma-test13.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test13.ok"

diff --git a/gettext-tools/tests/msgattrib-14 b/gettext-tools/tests/msgattrib-14
index e43d5c923e67501cbc01b3618a1860779ecf2c7b..e4349998da694d1b2c93d838828b045d50747545 100755 (executable)
--- a/gettext-tools/tests/msgattrib-14
+++ b/gettext-tools/tests/msgattrib-14
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test14.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --obsolete --no-fuzzy ma-test14.po -o ma-test14.out
+${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.out ma-test14.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test14.ok"

diff --git a/gettext-tools/tests/msgattrib-15 b/gettext-tools/tests/msgattrib-15
index 1f54513f8d63295e87b49d9394ef469f165c1423..c0eb80f510c68d8538bf223860a8b11a6618908d 100755 (executable)
--- a/gettext-tools/tests/msgattrib-15
+++ b/gettext-tools/tests/msgattrib-15
@@ -53,7 +53,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test15.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-fuzzy ma-test15.po -o ma-test15.out
+${MSGATTRIB} --clear-fuzzy -o ma-test15.out ma-test15.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msgattrib-2 b/gettext-tools/tests/msgattrib-2
index 9beb8bd0dd89b8fa7b4ccd5beddeb0f90c42a892..25a57759a96cda9aea7533b2d0bffd4f3a270e58 100755 (executable)
--- a/gettext-tools/tests/msgattrib-2
+++ b/gettext-tools/tests/msgattrib-2
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test2.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --untranslated ma-test2.po -o ma-test2.out
+${MSGATTRIB} --untranslated -o ma-test2.out ma-test2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test2.ok"

diff --git a/gettext-tools/tests/msgattrib-3 b/gettext-tools/tests/msgattrib-3
index 1c21a17fe7d693de0f511c5762b16b01f3514467..65e29cb3669e19c2a11a5e538c041218688357d0 100755 (executable)
--- a/gettext-tools/tests/msgattrib-3
+++ b/gettext-tools/tests/msgattrib-3
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test3.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --no-fuzzy ma-test3.po -o ma-test3.out
+${MSGATTRIB} --no-fuzzy -o ma-test3.out ma-test3.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test3.ok"

diff --git a/gettext-tools/tests/msgattrib-4 b/gettext-tools/tests/msgattrib-4
index 66d7c22de3880c3c343600c8b0cf56436c440d57..8880b2c03c03491df093ff408892ebb99aa5bf25 100755 (executable)
--- a/gettext-tools/tests/msgattrib-4
+++ b/gettext-tools/tests/msgattrib-4
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test4.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --only-fuzzy ma-test4.po -o ma-test4.out
+${MSGATTRIB} --only-fuzzy -o ma-test4.out ma-test4.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test4.ok"

diff --git a/gettext-tools/tests/msgattrib-5 b/gettext-tools/tests/msgattrib-5
index 4a5040c11c784e052128971c394c159ad5e98e34..adf4ebe5bdc7e422b24d2824a77dd379ee0cae11 100755 (executable)
--- a/gettext-tools/tests/msgattrib-5
+++ b/gettext-tools/tests/msgattrib-5
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test5.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --no-obsolete ma-test5.po -o ma-test5.out
+${MSGATTRIB} --no-obsolete -o ma-test5.out ma-test5.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test5.ok"

diff --git a/gettext-tools/tests/msgattrib-6 b/gettext-tools/tests/msgattrib-6
index 67b85302b4070f7f6e99f9ed8cc4be93ae3c9232..02c516f0013cb5c3d1dc12e8e2273610e66bfe06 100755 (executable)
--- a/gettext-tools/tests/msgattrib-6
+++ b/gettext-tools/tests/msgattrib-6
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test6.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --only-obsolete ma-test6.po -o ma-test6.out
+${MSGATTRIB} --only-obsolete -o ma-test6.out ma-test6.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test6.ok"

diff --git a/gettext-tools/tests/msgattrib-7 b/gettext-tools/tests/msgattrib-7
index 9aa7b0775c899c800e7e8903b9eb09a5aa629ca3..73d26a76b02e153300040e6463c811ababc5e0aa 100755 (executable)
--- a/gettext-tools/tests/msgattrib-7
+++ b/gettext-tools/tests/msgattrib-7
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test7.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --only-obsolete ma-test7.po -o ma-test7.out
+${MSGATTRIB} --translated --only-obsolete -o ma-test7.out ma-test7.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test7.ok"

diff --git a/gettext-tools/tests/msgattrib-8 b/gettext-tools/tests/msgattrib-8
index c79adc28ed81659f4e679797dfaecf18b88d35bb..098582d15d8045004e54ab57910c9be4aa58807b 100755 (executable)
--- a/gettext-tools/tests/msgattrib-8
+++ b/gettext-tools/tests/msgattrib-8
@@ -59,7 +59,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test8.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --set-fuzzy ma-test8.po -o ma-test8.out
+${MSGATTRIB} --set-fuzzy -o ma-test8.out ma-test8.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test8.ok"

diff --git a/gettext-tools/tests/msgattrib-9 b/gettext-tools/tests/msgattrib-9
index 05a912711b33ab002adc6ca874e65f5fb85e4801..6a03577ec4c7611e20badea75ce09b1325f92b75 100755 (executable)
--- a/gettext-tools/tests/msgattrib-9
+++ b/gettext-tools/tests/msgattrib-9
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-test9.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-fuzzy ma-test9.po -o ma-test9.out
+${MSGATTRIB} --clear-fuzzy -o ma-test9.out ma-test9.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test9.ok"

diff --git a/gettext-tools/tests/msgattrib-properties-1 b/gettext-tools/tests/msgattrib-properties-1
index a396452bc61efbf7daf4cbb4ec0660e9f66ef7ab..cb5b260a85782d7a45d44bc241ddc82a4e54f01f 100755 (executable)
--- a/gettext-tools/tests/msgattrib-properties-1
+++ b/gettext-tools/tests/msgattrib-properties-1
@@ -34,7 +34,7 @@ EOF
 
 tmpfiles="$tmpfiles ma-s-1.out"
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --properties-input --properties-output ma-s-1.properties -o ma-s-1.out
+${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.out ma-s-1.properties
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-s-1.ok"

diff --git a/gettext-tools/tests/msgcat-1 b/gettext-tools/tests/msgcat-1
index e10c1c56fc7cf8a654d067a646ec20e2b8bca493..8a4c483fb22a7d1e25f59c5177799dee2f54670e 100755 (executable)
--- a/gettext-tools/tests/msgcat-1
+++ b/gettext-tools/tests/msgcat-1
@@ -43,7 +43,7 @@ EOF
 
 tmpfiles="$tmpfiles mcat-test1.out"
 : ${MSGCAT=msgcat}
-${MSGCAT} mcat-test1.in1 mcat-test1.in2 -o mcat-test1.out
+${MSGCAT} -o mcat-test1.out mcat-test1.in1 mcat-test1.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-test1.ok"

diff --git a/gettext-tools/tests/msgcat-11 b/gettext-tools/tests/msgcat-11
index 29c14f59641774e99e6adf3b869291bf1a300d9d..970205b02b0de222340ce922c3759d69dafc96b1 100755 (executable)
--- a/gettext-tools/tests/msgcat-11
+++ b/gettext-tools/tests/msgcat-11
@@ -35,7 +35,7 @@ EOF
 
 tmpfiles="$tmpfiles mcat-test11.out"
 : ${MSGCAT=msgcat}
-${MSGCAT} mcat-test11.in -o mcat-test11.out
+${MSGCAT} -o mcat-test11.out mcat-test11.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msgcat-properties-1 b/gettext-tools/tests/msgcat-properties-1
index 9662a5ec2cf28419b670a61561c7f6bc2262d5e6..e22ce0a634f2d56c412b6a1b078b956e9fc225a7 100755 (executable)
--- a/gettext-tools/tests/msgcat-properties-1
+++ b/gettext-tools/tests/msgcat-properties-1
@@ -23,7 +23,7 @@ rm -f mcat-p-1.out
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --use-first --more-than=0 --properties-input --properties-output \
-    mcat-p-1.in1 mcat-p-1.in2 -o mcat-p-1.out
+    -o mcat-p-1.out mcat-p-1.in1 mcat-p-1.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-p-1.ok"

diff --git a/gettext-tools/tests/msgcat-properties-2 b/gettext-tools/tests/msgcat-properties-2
index 765e88aaa8ecbe096c41cd04f29f5bad3155b268..4570389e55bd4688ff27862bbb8e06c833578404 100755 (executable)
--- a/gettext-tools/tests/msgcat-properties-2
+++ b/gettext-tools/tests/msgcat-properties-2
@@ -14,7 +14,7 @@ EOF
 
 tmpfiles="$tmpfiles mcat-p-2.out"
 : ${MSGCAT=msgcat}
-${MSGCAT} --properties-input --properties-output -t Big5 mcat-p-2.properties -o mcat-p-2.out
+${MSGCAT} --properties-input --properties-output -t Big5 -o mcat-p-2.out mcat-p-2.properties
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msgcat-stringtable-1 b/gettext-tools/tests/msgcat-stringtable-1
index d15fe1005f0f335a29f58acc6050d7eb801ae3ed..0037452bbabdb3e0fa3467b60f570f023bcd0714 100755 (executable)
--- a/gettext-tools/tests/msgcat-stringtable-1
+++ b/gettext-tools/tests/msgcat-stringtable-1
@@ -31,7 +31,7 @@ tmpfiles="$tmpfiles mcat-s-1.out mcat-s-1.err"
 rm -f mcat-s-1.out
 : ${MSGCAT=msgcat}
 LC_MESSAGES=C LC_ALL= \
-${MSGCAT} --stringtable-input mcat-s-1.in -o mcat-s-1.out >mcat-s-1.err 2>&1
+${MSGCAT} --stringtable-input -o mcat-s-1.out mcat-s-1.in >mcat-s-1.err 2>&1
 result=$?
 cat mcat-s-1.err | grep -v ': internationalized messages'
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/msgcomm-17 b/gettext-tools/tests/msgcomm-17
index f7f9da81e23ad469c5db5870a26dcc120752ad40..3d7916e7d49c5a4bd8715c80991f0715cf487ae0 100755 (executable)
--- a/gettext-tools/tests/msgcomm-17
+++ b/gettext-tools/tests/msgcomm-17
@@ -68,8 +68,9 @@ EOF
 tmpfiles="$tmpfiles mcomm-test17.out"
 : ${MSGCOMM=msgcomm}
 
-${MSGCOMM} -u mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 \
-           -o mcomm-test17.out
+${MSGCOMM} -u \
+           -o mcomm-test17.out \
+           mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test17.ok"

diff --git a/gettext-tools/tests/msgcomm-18 b/gettext-tools/tests/msgcomm-18
index 20b45eb6c698743bf25b0adbf0a27b100f3ce7cb..4cfe17f18391aef9e5dce47a27bcd08ebd8eedf1 100755 (executable)
--- a/gettext-tools/tests/msgcomm-18
+++ b/gettext-tools/tests/msgcomm-18
@@ -22,7 +22,7 @@ EOF
 
 tmpfiles="$tmpfiles mcomm-test18.out"
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 mcomm-test18.in1 mcomm-test18.in2 -o mcomm-test18.out
+${MSGCOMM} --more-than=0 -o mcomm-test18.out mcomm-test18.in1 mcomm-test18.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test18.ok"

diff --git a/gettext-tools/tests/msgcomm-19 b/gettext-tools/tests/msgcomm-19
index df5168d547c9c2bc199b6c0fb9413d8eadda369c..07587daf74345ec682cd283c2babd0ffc8e5a8a3 100755 (executable)
--- a/gettext-tools/tests/msgcomm-19
+++ b/gettext-tools/tests/msgcomm-19
@@ -24,7 +24,7 @@ EOF
 
 tmpfiles="$tmpfiles mcomm-test19.out"
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 mcomm-test19.in1 mcomm-test19.in2 -o mcomm-test19.out
+${MSGCOMM} --more-than=0 -o mcomm-test19.out mcomm-test19.in1 mcomm-test19.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test19.ok"

diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21
index f97ddd5b114c2508904441216934dc5c4021f3d0..561c3701be131762b177b3d8383a33fda1f55f21 100755 (executable)
--- a/gettext-tools/tests/msgcomm-21
+++ b/gettext-tools/tests/msgcomm-21
@@ -25,7 +25,7 @@ EOF
 
 tmpfiles="$tmpfiles mcomm-test21.out"
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 mcomm-test21.in1 mcomm-test21.in2 -o mcomm-test21.out
+${MSGCOMM} --more-than=0 -o mcomm-test21.out mcomm-test21.in1 mcomm-test21.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test21.ok"

diff --git a/gettext-tools/tests/msgcomm-23 b/gettext-tools/tests/msgcomm-23
index 619f1e4eece1388052c28a5952d41eccfca97652..dd75b2fd3d9d46eb1a49e4de7335bd7041832e02 100755 (executable)
--- a/gettext-tools/tests/msgcomm-23
+++ b/gettext-tools/tests/msgcomm-23
@@ -11,7 +11,7 @@ cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in2
 
 tmpfiles="$tmpfiles mcomm-23.out"
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} -w 1000 mcomm-23.in1 mcomm-23.in2 -o mcomm-23.out
+${MSGCOMM} -w 1000 -o mcomm-23.out mcomm-23.in1 mcomm-23.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msgconv-1 b/gettext-tools/tests/msgconv-1
index 960be285a8d07264428804273e510afedcbe7adf..576f9d633ce97faa816cbc60775f9514762eb4f9 100755 (executable)
--- a/gettext-tools/tests/msgconv-1
+++ b/gettext-tools/tests/msgconv-1
@@ -22,7 +22,7 @@ EOF
 
 tmpfiles="$tmpfiles mco-test1.out"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 mco-test1.po -o mco-test1.out
+${MSGCONV} --to-code=UTF-8 -o mco-test1.out mco-test1.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mco-test1.ok"

diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2
index 93f28c8f0482617e962a215bf9f4773975ed7f2c..850a0431a66ac906d4daff3c49620cb381d01022 100755 (executable)
--- a/gettext-tools/tests/msgconv-2
+++ b/gettext-tools/tests/msgconv-2
@@ -23,7 +23,7 @@ EOF
 
 tmpfiles="$tmpfiles mco-test2.out"
 : ${MSGCONV=msgconv}
-${MSGCONV} -t Big5 mco-test2.po -o mco-test2.out
+${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mco-test2.ok"

diff --git a/gettext-tools/tests/msgconv-4 b/gettext-tools/tests/msgconv-4
index 29b82a9f74db07229445f023fcba21096686e117..b41c89fd344a123487ee5c7bbeca2fe7332fbf53 100755 (executable)
--- a/gettext-tools/tests/msgconv-4
+++ b/gettext-tools/tests/msgconv-4
@@ -14,7 +14,7 @@ EOF
 
 tmpfiles="$tmpfiles mco-test4.out"
 : ${MSGCONV=msgconv}
-${MSGCONV} --properties-input --properties-output -t Big5 mco-test4.properties -o mco-test4.out
+${MSGCONV} --properties-input --properties-output -t Big5 -o mco-test4.out mco-test4.properties
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msgconv-5 b/gettext-tools/tests/msgconv-5
index 2fb9e1ed0976f3fce77039116e29ce6f86fa2700..ab352a1080a5886c414aaaf9cd39e7da53c6cd46 100755 (executable)
--- a/gettext-tools/tests/msgconv-5
+++ b/gettext-tools/tests/msgconv-5
@@ -53,7 +53,7 @@ EOF
 
 tmpfiles="$tmpfiles mco-test5.out"
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 mco-test5.po -o mco-test5.out
+${MSGCONV} --to-code=UTF-8 -o mco-test5.out mco-test5.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mco-test5.ok"

diff --git a/gettext-tools/tests/msgen-1 b/gettext-tools/tests/msgen-1
index cf4993c4717d78381a9df23a76c343e828a9e91c..6f57b508f69c59e3dd43b82a01a50a04009096e7 100755 (executable)
--- a/gettext-tools/tests/msgen-1
+++ b/gettext-tools/tests/msgen-1
@@ -31,7 +31,7 @@ EOF
 
 tmpfiles="$tmpfiles men-test1.out"
 : ${MSGEN=msgen}
-${MSGEN} men-test1.po -o men-test1.out
+${MSGEN} -o men-test1.out men-test1.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles men-test1.ok"

diff --git a/gettext-tools/tests/msgen-2 b/gettext-tools/tests/msgen-2
index 634940f8d94f3bfb5cc1b507544b169451b7a1bf..9f07f1db35b59f80b17ccf54d72ec22e3e69569b 100755 (executable)
--- a/gettext-tools/tests/msgen-2
+++ b/gettext-tools/tests/msgen-2
@@ -16,7 +16,7 @@ EOF
 
 tmpfiles="$tmpfiles men-test2.out"
 : ${MSGEN=msgen}
-${MSGEN} --properties-input --properties-output men-test2.properties -o men-test2.out
+${MSGEN} --properties-input --properties-output -o men-test2.out men-test2.properties
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles men-test2.ok"

diff --git a/gettext-tools/tests/msgen-3 b/gettext-tools/tests/msgen-3
index 2da5439c679a0f1e9e65ce96dd3283c59d773728..244b4e585dcfa40bb5668950f868edf273aa4852 100755 (executable)
--- a/gettext-tools/tests/msgen-3
+++ b/gettext-tools/tests/msgen-3
@@ -45,7 +45,7 @@ EOF
 
 tmpfiles="$tmpfiles men-test3.out"
 : ${MSGEN=msgen}
-${MSGEN} men-test3.pot -o men-test3.out
+${MSGEN} -o men-test3.out men-test3.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles men-test3.ok"

diff --git a/gettext-tools/tests/msgfmt-1 b/gettext-tools/tests/msgfmt-1
index 0dc6315e5054fb7b3a78c42cfdbe8f3ac31a0c44..5c07132e148aae7bec1843b8cc48234f7502f4a2 100755 (executable)
--- a/gettext-tools/tests/msgfmt-1
+++ b/gettext-tools/tests/msgfmt-1
@@ -46,7 +46,7 @@ EOF
 
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
-if ${MSGFMT} module1.po module2.po -o LC_MESSAGES/gen.mo 2> /dev/null; then
+if ${MSGFMT} -o LC_MESSAGES/gen.mo module1.po module2.po 2> /dev/null; then
   rm -fr $tmpfiles
   exit 1
 fi
@@ -54,9 +54,9 @@ fi
 # With msgcat, it should work.
 tmpfiles="$tmpfiles modules.po"
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --use-first module1.po module2.po -o modules.po
+${MSGCAT} --use-first -o modules.po module1.po module2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-${MSGFMT} modules.po -o LC_MESSAGES/gen.mo
+${MSGFMT} -o LC_MESSAGES/gen.mo modules.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-test1.out"

diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10
index d95c7ca37e23fdbd2a7b942f4ca19924981683f5..000119aad8a694f61429e194ff42b9e6a0050890 100755 (executable)
--- a/gettext-tools/tests/msgfmt-10
+++ b/gettext-tools/tests/msgfmt-10
@@ -38,7 +38,7 @@ msgstr[1] "%d yarars
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check mf-test10.po1 -o /dev/null
+${MSGFMT} --check -o /dev/null mf-test10.po1
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-test10.po2"
@@ -69,7 +69,7 @@ EOF
 tmpfiles="$tmpfiles mf-test10.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
-${MSGFMT} --check mf-test10.po2 -o /dev/null \
+${MSGFMT} --check -o /dev/null mf-test10.po2 \
     2>&1 | grep -v '^==' > mf-test10.err
 
 tmpfiles="$tmpfiles mf-test10.ok"

diff --git a/gettext-tools/tests/msgfmt-12 b/gettext-tools/tests/msgfmt-12
index 427b83333f0cd64abb19100f833777f51618f440..565a32b87c4e9c4c0a3c66ec99519e44fa6dfc47 100755 (executable)
--- a/gettext-tools/tests/msgfmt-12
+++ b/gettext-tools/tests/msgfmt-12
@@ -29,7 +29,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-12.out"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} mf-12.mo -o mf-12.out
+${MSGUNFMT} -o mf-12.out mf-12.mo
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-12.ok"

diff --git a/gettext-tools/tests/msgfmt-14 b/gettext-tools/tests/msgfmt-14
index 1b8ca529bdf9e2c8c76b8cfe0f2a0a524472c6c5..7b54c8415379f895e7d7f636ce8e3febd1b7feb0 100755 (executable)
--- a/gettext-tools/tests/msgfmt-14
+++ b/gettext-tools/tests/msgfmt-14
@@ -58,7 +58,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-14.out"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} mf-14.mo -o mf-14.out
+${MSGUNFMT} -o mf-14.out mf-14.mo
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-14.ok"

diff --git a/gettext-tools/tests/msgfmt-15 b/gettext-tools/tests/msgfmt-15
index 7ebb1adbb1c8b6e160600653aeb7cc2ee17add5d..bafd49758018d8da08a02403dc6843bfb33e696d 100755 (executable)
--- a/gettext-tools/tests/msgfmt-15
+++ b/gettext-tools/tests/msgfmt-15
@@ -39,7 +39,7 @@ msgstr[2] "%d der unnützen Nichtterminale"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check mf-15.po1 -o /dev/null
+${MSGFMT} --check -o /dev/null mf-15.po1
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-15.po2"
@@ -69,7 +69,7 @@ msgstr[2] "%d der unnützen Nichtterminale"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check mf-15.po2 -o /dev/null 2>/dev/null
+${MSGFMT} --check -o /dev/null mf-15.po2 2>/dev/null
 test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-15.po3"
@@ -99,7 +99,7 @@ msgstr[2] "%d der unnützen Nichtterminale"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check mf-15.po3 -o /dev/null
+${MSGFMT} --check -o /dev/null mf-15.po3
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-15.po4"
@@ -129,7 +129,7 @@ msgstr[2] "der unnützen Nichtterminale"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check mf-15.po4 -o /dev/null 2>/dev/null
+${MSGFMT} --check -o /dev/null mf-15.po4 2>/dev/null
 test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/msgfmt-2 b/gettext-tools/tests/msgfmt-2
index 8491178ae3c018a31e221f5fb0908467043652ee..a5b620232c7aea22d726ac4f7647ed5e3f1b2471 100755 (executable)
--- a/gettext-tools/tests/msgfmt-2
+++ b/gettext-tools/tests/msgfmt-2
@@ -58,7 +58,7 @@ EOF
 
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
-if ${MSGFMT} module1.po module2.po -o LC_MESSAGES/gen.mo 2> /dev/null; then
+if ${MSGFMT} -o LC_MESSAGES/gen.mo module1.po module2.po 2> /dev/null; then
   rm -fr $tmpfiles
   exit 1
 fi
@@ -66,9 +66,9 @@ fi
 # With msgcat, it should work.
 tmpfiles="$tmpfiles modules.po"
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --use-first module1.po module2.po -o modules.po
+${MSGCAT} --use-first -o modules.po module1.po module2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-${MSGFMT} modules.po -o LC_MESSAGES/gen.mo
+${MSGFMT} -o LC_MESSAGES/gen.mo modules.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-test2.out"

diff --git a/gettext-tools/tests/msgfmt-3 b/gettext-tools/tests/msgfmt-3
index a70a7d7d0889720da1f8df478e46fe6716aa381a..49625e35c8b4b026cbf172570665ac8a7d4d11f9 100755 (executable)
--- a/gettext-tools/tests/msgfmt-3
+++ b/gettext-tools/tests/msgfmt-3
@@ -23,7 +23,7 @@ EOF
 tmpfiles="$tmpfiles mftest3.mo mftest3.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
-${MSGFMT} mf-test3.po -o mftest3.mo >mftest3.err 2>&1
+${MSGFMT} -o mftest3.mo mf-test3.po >mftest3.err 2>&1
 result=$?
 cat mftest3.err | grep -v 'warning: Charset' | grep -v '^ '
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/msgfmt-4 b/gettext-tools/tests/msgfmt-4
index f833ed93e968c69360f44949b8f6c187fe757ca8..43de254c175f3ed1abd8888ec31515e0ef6f2ce9 100755 (executable)
--- a/gettext-tools/tests/msgfmt-4
+++ b/gettext-tools/tests/msgfmt-4
@@ -36,7 +36,7 @@ msgstr "...but this $s not"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} mf-test4.po -o /dev/null 2> /dev/null
+${MSGFMT} -o /dev/null mf-test4.po 2> /dev/null
 result=$?
 
 rm -fr $tmpfiles

diff --git a/gettext-tools/tests/msgfmt-5 b/gettext-tools/tests/msgfmt-5
index 4da5bb52b0086b3263ad1892027ce29ed1ed62eb..ccdd3493201a7c33df9ccac25b202cc729749e85 100755 (executable)
--- a/gettext-tools/tests/msgfmt-5
+++ b/gettext-tools/tests/msgfmt-5
@@ -39,9 +39,9 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles foo-de.out foo-fr.out"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} foo-de.mo -o foo-de.out
+${MSGUNFMT} -o foo-de.out foo-de.mo
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-${MSGUNFMT} foo-fr.mo -o foo-fr.out
+${MSGUNFMT} -o foo-fr.out foo-fr.mo
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles foo-de.ok"

diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1
index a3cebb93aa0932d6a7a7ec23e2cbd4528814e3dc..5e2d8e3b32c5b0cfe4539add2daa6f9fa68f51b2 100755 (executable)
--- a/gettext-tools/tests/msgfmt-properties-1
+++ b/gettext-tools/tests/msgfmt-properties-1
@@ -26,7 +26,7 @@ EOF
 
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
-if ${MSGFMT} --properties-input mf-p-1-1.properties mf-p-1-2.properties -o LC_MESSAGES/gen.mo 2> /dev/null; then
+if ${MSGFMT} --properties-input -o LC_MESSAGES/gen.mo mf-p-1-1.properties mf-p-1-2.properties 2> /dev/null; then
   rm -fr $tmpfiles
   exit 1
 fi
@@ -34,9 +34,9 @@ fi
 # With msgcat, it should work.
 tmpfiles="$tmpfiles mf-p-1-s.properties"
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --properties-input --properties-output --use-first mf-p-1-1.properties mf-p-1-2.properties -o mf-p-1-s.properties
+${MSGCAT} --properties-input --properties-output --use-first -o mf-p-1-s.properties mf-p-1-1.properties mf-p-1-2.properties
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-${MSGFMT} --properties-input mf-p-1-s.properties -o LC_MESSAGES/gen.mo
+${MSGFMT} --properties-input -o LC_MESSAGES/gen.mo mf-p-1-s.properties
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-test1.out"

diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1
index 3ade4a98facc1d161ce851df1e3d52eca232887f..26b90a155e2e939ef2ca5e5d1e24550b4613e5b8 100755 (executable)
--- a/gettext-tools/tests/msgfmt-qt-1
+++ b/gettext-tools/tests/msgfmt-qt-1
@@ -7,7 +7,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles mf-qt-1.qm"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt ${top_srcdir}/tests/qttest_pl.po -o mf-qt-1.qm
+${MSGFMT} --qt -o mf-qt-1.qm ${top_srcdir}/tests/qttest_pl.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}

diff --git a/gettext-tools/tests/msggrep-1 b/gettext-tools/tests/msggrep-1
index 5e116d69d97dd270faca93487d66d5190e178d8e..8f235e96a3d161571134098c88f0afd903dc1088 100755 (executable)
--- a/gettext-tools/tests/msggrep-1
+++ b/gettext-tools/tests/msggrep-1
@@ -157,7 +157,7 @@ EOF
 
 tmpfiles="$tmpfiles mg-test1.out"
 : ${MSGGREP=msggrep}
-${MSGGREP} -N pipe-bidi.c mg-test1.po -o mg-test1.out
+${MSGGREP} -N pipe-bidi.c -o mg-test1.out mg-test1.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mg-test1.ok"

diff --git a/gettext-tools/tests/msggrep-2 b/gettext-tools/tests/msggrep-2
index 424455cb74e76d59400b75e2aaffe2f21466b7a9..017a6a47f70d3f549869a886fa48e3c20d0b1dca 100755 (executable)
--- a/gettext-tools/tests/msggrep-2
+++ b/gettext-tools/tests/msggrep-2
@@ -154,7 +154,7 @@ EOF
 
 tmpfiles="$tmpfiles mg-test2.out"
 : ${MSGGREP=msggrep}
-${MSGGREP} -M fr mg-test2.po -o mg-test2.out
+${MSGGREP} -M fr -o mg-test2.out mg-test2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mg-test2.ok"

diff --git a/gettext-tools/tests/msggrep-3 b/gettext-tools/tests/msggrep-3
index 3701b7caa7be79f41f5b758f3310dc9fbacfc64d..87f0fab70a989a6bf1089b7b77ae9c5973769b54 100755 (executable)
--- a/gettext-tools/tests/msggrep-3
+++ b/gettext-tools/tests/msggrep-3
@@ -162,7 +162,7 @@ EOF
 tmpfiles="$tmpfiles mg-test3.out mg-test3.err"
 : ${MSGGREP=msggrep}
 LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -K -e error -T -e Speicher mg-test3.po -o mg-test3.out >mg-test3.err 2>&1
+${MSGGREP} -K -e error -T -e Speicher -o mg-test3.out mg-test3.po >mg-test3.err 2>&1
 result=$?
 cat mg-test3.err | grep -v 'warning: Locale charset' | grep -v '^ '
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/msggrep-4 b/gettext-tools/tests/msggrep-4
index 0d80f56dc2977ad6b434fd64442db8d279ced302..60f75854802157af041806c2ef054bf129b3d4c8 100755 (executable)
--- a/gettext-tools/tests/msggrep-4
+++ b/gettext-tools/tests/msggrep-4
@@ -164,7 +164,7 @@ echo 'illegal' > mg-test4.in2
 tmpfiles="$tmpfiles mg-test4.out mg-test4.err"
 : ${MSGGREP=msggrep}
 LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot mg-test4.po -o mg-test4.out > mg-test4.err 2>&1
+${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot -o mg-test4.out mg-test4.po > mg-test4.err 2>&1
 result=$?
 cat mg-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/msggrep-5 b/gettext-tools/tests/msggrep-5
index c35aa5df0a4f9e7be94da143dc81080b2740028e..3ea8e35ce0d8fcbeaf7ee3a09d5498af2fbab990 100755 (executable)
--- a/gettext-tools/tests/msggrep-5
+++ b/gettext-tools/tests/msggrep-5
@@ -170,7 +170,7 @@ EOF
 tmpfiles="$tmpfiles mg-test5.out mg-test5.err"
 : ${MSGGREP=msggrep}
 LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -C -e @proofread mg-test5.po -o mg-test5.out >mg-test5.err 2>&1
+${MSGGREP} -C -e @proofread -o mg-test5.out mg-test5.po >mg-test5.err 2>&1
 result=$?
 cat mg-test5.err | grep -v 'warning: Locale charset' | grep -v '^ '
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/msggrep-6 b/gettext-tools/tests/msggrep-6
index a7597261e27569b7e049a31e1c777de3c4baf89f..896e50a6153cf84996cb7499f1584150774b495f 100755 (executable)
--- a/gettext-tools/tests/msggrep-6
+++ b/gettext-tools/tests/msggrep-6
@@ -117,7 +117,7 @@ EOF
 tmpfiles="$tmpfiles mg-test6.out"
 : ${MSGGREP=msggrep}
 LC_MESSAGES=C LC_ALL= \
-${MSGGREP} --properties-input --properties-output -K -e error -T -e Speicher mg-test6.properties -o mg-test6.out
+${MSGGREP} --properties-input --properties-output -K -e error -T -e Speicher -o mg-test6.out mg-test6.properties
 result=$?
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 

diff --git a/gettext-tools/tests/msggrep-7 b/gettext-tools/tests/msggrep-7
index 85bcfe632070669a69f1c9b3befdea299beb0ba9..8ed0829dbdb32ee14424c6d83090b1dd1f19a3aa 100755 (executable)
--- a/gettext-tools/tests/msggrep-7
+++ b/gettext-tools/tests/msggrep-7
@@ -54,7 +54,7 @@ EOF
 tmpfiles="$tmpfiles mg-test7.out"
 : ${MSGGREP=msggrep}
 LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -J -e "File|" mg-test7.po -o mg-test7.out
+${MSGGREP} -J -e "File|" -o mg-test7.out mg-test7.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mg-test7.ok"

diff --git a/gettext-tools/tests/msgmerge-1 b/gettext-tools/tests/msgmerge-1
index 66eb3742ebd901bb0a61bd0791a02e8ad59ff5cb..bb3ea57c85e4d6442e60772b42d2263b8ccd8586 100755 (executable)
--- a/gettext-tools/tests/msgmerge-1
+++ b/gettext-tools/tests/msgmerge-1
@@ -40,7 +40,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test1.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test1.in1 mm-test1.in2 -o mm-test1.out
+${MSGMERGE} -q -o mm-test1.out mm-test1.in1 mm-test1.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test1.ok"

diff --git a/gettext-tools/tests/msgmerge-10 b/gettext-tools/tests/msgmerge-10
index 8def4e26db025fd0b5f5be37c20632dadbe1d44f..be5777b709c1810acc55d073bf825939cf6b1617 100755 (executable)
--- a/gettext-tools/tests/msgmerge-10
+++ b/gettext-tools/tests/msgmerge-10
@@ -56,7 +56,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test10.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test10.po mm-test10.pot -o mm-test10.out
+${MSGMERGE} -q -o mm-test10.out mm-test10.po mm-test10.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test10.ok"

diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11
index 32ca042bb945a6fa021dc505fbc3962bf29ec25a..5a9ad94f4851b0ac189e18cee562567f7e8536d2 100755 (executable)
--- a/gettext-tools/tests/msgmerge-11
+++ b/gettext-tools/tests/msgmerge-11
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test11.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test11.po mm-test11.pot -o mm-test11.out
+${MSGMERGE} -q -o mm-test11.out mm-test11.po mm-test11.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test11.ok"

diff --git a/gettext-tools/tests/msgmerge-12 b/gettext-tools/tests/msgmerge-12
index a7c6fa146f052c3c2ac63a4cdc6dc07128288680..799b22498c6d54cbdbb60fc88fac4d3f60404956 100755 (executable)
--- a/gettext-tools/tests/msgmerge-12
+++ b/gettext-tools/tests/msgmerge-12
@@ -56,7 +56,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test12.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test12.po mm-test12.pot -o mm-test12.out
+${MSGMERGE} -q -o mm-test12.out mm-test12.po mm-test12.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test12.ok"

diff --git a/gettext-tools/tests/msgmerge-13 b/gettext-tools/tests/msgmerge-13
index aae35a7e8d4e8d3d3aaa679ac4cfce8a2dd38cb1..487c879b9ca0e83583b6f0548aaaf16c016b9723 100755 (executable)
--- a/gettext-tools/tests/msgmerge-13
+++ b/gettext-tools/tests/msgmerge-13
@@ -89,7 +89,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test13.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test13.po mm-test13.pot -o mm-test13.out
+${MSGMERGE} -q -o mm-test13.out mm-test13.po mm-test13.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test13.ok"

diff --git a/gettext-tools/tests/msgmerge-14 b/gettext-tools/tests/msgmerge-14
index dc0141c14a3ceaa92dd8870850a6500fbb31c6eb..f70d2862bf92baa32d50d25b66c2b7fea6e415ac 100755 (executable)
--- a/gettext-tools/tests/msgmerge-14
+++ b/gettext-tools/tests/msgmerge-14
@@ -60,7 +60,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test14.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test14-ru.po mm-test14.pot -o mm-test14.out
+${MSGMERGE} -q -o mm-test14.out mm-test14-ru.po mm-test14.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test14.ok"

diff --git a/gettext-tools/tests/msgmerge-15 b/gettext-tools/tests/msgmerge-15
index b047b5e71c608742113276e4c077409538c3e4be..b5167299122e9a5d8ddf6fd9625be43988abdfcb 100755 (executable)
--- a/gettext-tools/tests/msgmerge-15
+++ b/gettext-tools/tests/msgmerge-15
@@ -31,7 +31,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test15.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test15.pot mm-test15.po -o mm-test15.out
+${MSGMERGE} -q -o mm-test15.out mm-test15.pot mm-test15.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test15.ok"

diff --git a/gettext-tools/tests/msgmerge-16 b/gettext-tools/tests/msgmerge-16
index f86893dffb98f7cdeb9d3405737106e69925559e..3bd454bdc510672caa26d384f86ed71e594ecc35 100755 (executable)
--- a/gettext-tools/tests/msgmerge-16
+++ b/gettext-tools/tests/msgmerge-16
@@ -62,7 +62,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test16.new.po"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test16.po mm-test16.pot -o mm-test16.new.po
+${MSGMERGE} -q -o mm-test16.new.po mm-test16.po mm-test16.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test16.ok"

diff --git a/gettext-tools/tests/msgmerge-17 b/gettext-tools/tests/msgmerge-17
index 1f3b7f35654cc289c503ea8461e98215256c6055..f5b101ab27007489ab7a4e0959284eb31e8887c4 100755 (executable)
--- a/gettext-tools/tests/msgmerge-17
+++ b/gettext-tools/tests/msgmerge-17
@@ -56,7 +56,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test17.new.po"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test17.po mm-test17.pot -o mm-test17.new.po
+${MSGMERGE} -q -o mm-test17.new.po mm-test17.po mm-test17.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test17.ok"

diff --git a/gettext-tools/tests/msgmerge-18 b/gettext-tools/tests/msgmerge-18
index 016249fe5f79accc9040b007e6a9a6f0dca707f5..a4b6f946468b122f6c4c1c1901b8b89f0db98c14 100755 (executable)
--- a/gettext-tools/tests/msgmerge-18
+++ b/gettext-tools/tests/msgmerge-18
@@ -122,7 +122,7 @@ test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test18.new.po"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test18.po mm-test18.pot -o mm-test18.new.po
+${MSGMERGE} -q -o mm-test18.new.po mm-test18.po mm-test18.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test18.ok"

diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2
index e79b14599dbb25a090f68af065bb83385f4e68bc..0d7ceb1168e776542a9dd46ac59a9d1c755a7940 100755 (executable)
--- a/gettext-tools/tests/msgmerge-2
+++ b/gettext-tools/tests/msgmerge-2
@@ -21,7 +21,7 @@ EOF
 tmpfiles="$tmpfiles mm-test2.out"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q mm-test2.in1 mm-test2.in2 -o /dev/stdout \
+${MSGMERGE} -q -o /dev/stdout mm-test2.in1 mm-test2.in2 \
   2>&1 | grep -v '^==' > mm-test2.out
 
 tmpfiles="$tmpfiles mm-test2.ok"

diff --git a/gettext-tools/tests/msgmerge-3 b/gettext-tools/tests/msgmerge-3
index 4ca85c2c4f9cb4fe2cb961fcf8a4e04f6df784e9..be903cad50367b57a736f48137ca8b9a787cbbaf 100755 (executable)
--- a/gettext-tools/tests/msgmerge-3
+++ b/gettext-tools/tests/msgmerge-3
@@ -54,7 +54,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test3.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test3.in1 mm-test3.in2 -o mm-test3.out
+${MSGMERGE} -q -o mm-test3.out mm-test3.in1 mm-test3.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test3.ok"

diff --git a/gettext-tools/tests/msgmerge-4 b/gettext-tools/tests/msgmerge-4
index d9cc1e83c6f97ea206404da2208cc4d7224f6007..1489a12e27eda94344e0992f801728edf5486527 100755 (executable)
--- a/gettext-tools/tests/msgmerge-4
+++ b/gettext-tools/tests/msgmerge-4
@@ -29,7 +29,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test4.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test4.in1.po mm-test4.in2.po -o mm-test4.out
+${MSGMERGE} -q -o mm-test4.out mm-test4.in1.po mm-test4.in2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test4.ok"

diff --git a/gettext-tools/tests/msgmerge-5 b/gettext-tools/tests/msgmerge-5
index d7ed4d6daa763c765921882f366b1957a43d22f0..66127f77c9f80a50b89c64e56d2b7cb2f1782633 100755 (executable)
--- a/gettext-tools/tests/msgmerge-5
+++ b/gettext-tools/tests/msgmerge-5
@@ -42,7 +42,7 @@ EOF
 tmpfiles="$tmpfiles mm-test5.out mm-test5.err"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q mm-test5.in1.po mm-test5.in2.po -o mm-test5.out >mm-test5.err 2>&1
+${MSGMERGE} -q -o mm-test5.out mm-test5.in1.po mm-test5.in2.po >mm-test5.err 2>&1
 result=$?
 cat mm-test5.err | grep -v 'warning: Charset' | grep -v '^ '
 test $result = 0 || { rm -fr $tmpfiles; exit 1; }

diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6
index e3e147cc14e5bbe4eed77fda76c06e89bb075bcd..d06e6988cd56179fd9b3cf07c244df2ee8b2a31d 100755 (executable)
--- a/gettext-tools/tests/msgmerge-6
+++ b/gettext-tools/tests/msgmerge-6
@@ -59,7 +59,7 @@ EOF
 tmpfiles="$tmpfiles mm-test6.out"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q mm-test6.in1.po mm-test6.in2.po -o mm-test6.out
+${MSGMERGE} -q -o mm-test6.out mm-test6.in1.po mm-test6.in2.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test6.ok"

diff --git a/gettext-tools/tests/msgmerge-7 b/gettext-tools/tests/msgmerge-7
index 9edbf3d28c728098479ecd536b4df7954d5ab02b..09955ce46545e7b36fee229a94559abb7d3bfb52 100755 (executable)
--- a/gettext-tools/tests/msgmerge-7
+++ b/gettext-tools/tests/msgmerge-7
@@ -44,7 +44,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test7.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test7.po mm-test7.pot -o mm-test7.out
+${MSGMERGE} -q -o mm-test7.out mm-test7.po mm-test7.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test7.ok"

diff --git a/gettext-tools/tests/msgmerge-8 b/gettext-tools/tests/msgmerge-8
index 60f1658ecc1b48a0ff0d6c3766e16ed2c659716e..6eda8efeb51fd29005fbc0b5a999c1defb3179e7 100755 (executable)
--- a/gettext-tools/tests/msgmerge-8
+++ b/gettext-tools/tests/msgmerge-8
@@ -40,7 +40,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-test8.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} --multi-domain -q mm-test8.po mm-test8.pot -o mm-test8.out
+${MSGMERGE} --multi-domain -q -o mm-test8.out mm-test8.po mm-test8.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test8.ok"

diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-9
index c2197e91c053a8e5aa8f0b2549c59e48c7910ac2..3d98c48688ced0ec7388da896c7f5a5349a9cc5e 100755 (executable)
--- a/gettext-tools/tests/msgmerge-9
+++ b/gettext-tools/tests/msgmerge-9
@@ -24,7 +24,7 @@ EOF
 tmpfiles="$tmpfiles mm-test9.err"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q mm-test9.in1 mm-test9.in2 -o /dev/null \
+${MSGMERGE} -q -o /dev/null mm-test9.in1 mm-test9.in2 \
     2>&1 | grep -v '^==' > mm-test9.err
 
 tmpfiles="$tmpfiles mm-test9.ok"

diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1
index a150e1eda22ec10341e42262a97d7d581e8ef230..ce489f54330948ebc2c0dff49e7fd1c4df2a953e 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-1
+++ b/gettext-tools/tests/msgmerge-compendium-1
@@ -30,7 +30,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-c-1.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-1.com mm-c-1.in1 mm-c-1.pot -o mm-c-1.out
+${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.out mm-c-1.in1 mm-c-1.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-c-1.ok"

diff --git a/gettext-tools/tests/msgmerge-compendium-2 b/gettext-tools/tests/msgmerge-compendium-2
index 2a6f0f722e0e973e40783c8da718e9cfcbb0ac36..295a943813cba6ef35a6e34d7a2012b4ed1d622a 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-2
+++ b/gettext-tools/tests/msgmerge-compendium-2
@@ -30,7 +30,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-c-2.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-2.com mm-c-2.in1 mm-c-2.pot -o mm-c-2.out
+${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.out mm-c-2.in1 mm-c-2.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-c-2.ok"

diff --git a/gettext-tools/tests/msgmerge-compendium-3 b/gettext-tools/tests/msgmerge-compendium-3
index e1e814122a2d78facf9e851f39b7f374803eda70..c0174eb7d3d067a8895f8b6a69ae015c60d35baa 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-3
+++ b/gettext-tools/tests/msgmerge-compendium-3
@@ -38,7 +38,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-c-3.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-3.com mm-c-3.in1 mm-c-3.pot -o mm-c-3.out
+${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.out mm-c-3.in1 mm-c-3.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-c-3.ok"

diff --git a/gettext-tools/tests/msgmerge-compendium-4 b/gettext-tools/tests/msgmerge-compendium-4
index 26ccacb6860b823524ba8c186c8b4611403c27cd..397ae6416b34e8267e0fddd3c0651cb3a147f8cf 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-4
+++ b/gettext-tools/tests/msgmerge-compendium-4
@@ -31,7 +31,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-c-4.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --compendium mm-c-4.com /dev/null mm-c-4.pot -o mm-c-4.out
+${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.out /dev/null mm-c-4.pot
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-c-4.ok"

diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1
index 6f56861df0116b404fbce74123bfa14e50a9ce05..8660eb85592cfab053d1d834266083fb4b95833b 100755 (executable)
--- a/gettext-tools/tests/msgmerge-properties-1
+++ b/gettext-tools/tests/msgmerge-properties-1
@@ -39,7 +39,7 @@ EOF
 
 tmpfiles="$tmpfiles mm-p-1.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --properties-input --properties-output mm-p-1.in1 mm-p-1.in2 -o mm-p-1.out
+${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.out mm-p-1.in1 mm-p-1.in2
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-p-1.ok"

diff --git a/gettext-tools/tests/msgunfmt-1 b/gettext-tools/tests/msgunfmt-1
index a707dd837cb60cf5540746ecefc1c9672d72b3d8..2ed457a0692b38b04532ef5752c8369cfdc248ea 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-1
+++ b/gettext-tools/tests/msgunfmt-1
@@ -34,12 +34,12 @@ EOF
 
 tmpfiles="$tmpfiles mu-test1.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} mu-test1.in -o mu-test1.mo
+${MSGFMT} -o mu-test1.mo mu-test1.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mu-test1.out"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} mu-test1.mo -o mu-test1.out
+${MSGUNFMT} -o mu-test1.out mu-test1.mo
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msgunfmt-csharp-1 b/gettext-tools/tests/msgunfmt-csharp-1
index 6829596b055327b06f3c1cc47dc292492770f04c..01a587c5c5dbd7309761c915831cbc8fa0e6b9ff 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-csharp-1
+++ b/gettext-tools/tests/msgunfmt-csharp-1
@@ -44,7 +44,7 @@ ${MSGUNFMT} --csharp -d . -r prog -l fr -o prog.out || exit 1
 
 tmpfiles="$tmpfiles prog.sort"
 : ${MSGCAT=msgcat}
-${MSGCAT} -s prog.out -o prog.sort || exit 1
+${MSGCAT} -s -o prog.sort prog.out || exit 1
 
 tmpfiles="$tmpfiles prog.ok"
 cat <<\EOF > prog.ok

diff --git a/gettext-tools/tests/msgunfmt-java-1 b/gettext-tools/tests/msgunfmt-java-1
index 031c9b9c9f38edd64ee0cee2365a5f5cae12e1ac..c3ea1e9003e00deb0c2a6496912a7624a78537f6 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-java-1
+++ b/gettext-tools/tests/msgunfmt-java-1
@@ -46,7 +46,7 @@ ${MSGUNFMT} --java -d . -r prog -l fr -o prog.out || exit 1
 
 tmpfiles="$tmpfiles prog.sort"
 : ${MSGCAT=msgcat}
-${MSGCAT} -s prog.out -o prog.sort || exit 1
+${MSGCAT} -s -o prog.sort prog.out || exit 1
 
 tmpfiles="$tmpfiles prog.ok"
 cat <<\EOF > prog.ok

diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1
index e67920358a96c2b145fed7bf899399756bc8c3b9..2f25eab89933ae84a71d3dc7c6bf4c41248dd5e5 100755 (executable)
--- a/gettext-tools/tests/msgunfmt-properties-1
+++ b/gettext-tools/tests/msgunfmt-properties-1
@@ -26,12 +26,12 @@ EOF
 
 tmpfiles="$tmpfiles mu-p-1.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} --properties-input mu-p-1.in -o mu-p-1.mo
+${MSGFMT} --properties-input -o mu-p-1.mo mu-p-1.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mu-p-1.out"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} --properties-output mu-p-1.mo -o mu-p-1.out
+${MSGUNFMT} --properties-output -o mu-p-1.out mu-p-1.mo
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1
index 4570ce35c0d8c5c4683aad9199f2c70a0af76422..d2fca45b6419aa283ce095c49a55718b5044f71d 100755 (executable)
--- a/gettext-tools/tests/msguniq-1
+++ b/gettext-tools/tests/msguniq-1
@@ -7,7 +7,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-1.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 ${top_srcdir}/tests/msguniq-a.in -o msguniq-1.out
+${MSGUNIQ} -w 1000 -o msguniq-1.out ${top_srcdir}/tests/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2
index b80c988954cfd1f1f321ffc2d181922ac94135b9..8ebf16f757173c73e087afc623496f124f95ee7e 100755 (executable)
--- a/gettext-tools/tests/msguniq-2
+++ b/gettext-tools/tests/msguniq-2
@@ -7,7 +7,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-2.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -u ${top_srcdir}/tests/msguniq-a.in -o msguniq-2.out
+${MSGUNIQ} -w 1000 -u -o msguniq-2.out ${top_srcdir}/tests/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles msguniq-2.ok"

diff --git a/gettext-tools/tests/msguniq-3 b/gettext-tools/tests/msguniq-3
index ef6cbb4ed9b23b93944fad7eca2c84197d63e822..8a6567f5ec19d7b2d649032071c04b8c5d7d858b 100755 (executable)
--- a/gettext-tools/tests/msguniq-3
+++ b/gettext-tools/tests/msguniq-3
@@ -7,7 +7,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-3.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -d ${top_srcdir}/tests/msguniq-a.in -o msguniq-3.out
+${MSGUNIQ} -w 1000 -d -o msguniq-3.out ${top_srcdir}/tests/msguniq-a.in
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles msguniq-3.ok"

diff --git a/gettext-tools/tests/msguniq-4 b/gettext-tools/tests/msguniq-4
index 352e8cf09593cb2dec533599ac15b96a2212ed4d..844b4bc521326771d1cd070cb10883e995c394c1 100755 (executable)
--- a/gettext-tools/tests/msguniq-4
+++ b/gettext-tools/tests/msguniq-4
@@ -7,12 +7,12 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles msguniq-4.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} --properties-input --properties-output -w 1000 ${top_srcdir}/tests/msguniq-a.inp -o msguniq-4.out
+${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out ${top_srcdir}/tests/msguniq-a.inp
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles msguniq-4.ok"
 : ${MSGCAT-msgcat}
-${MSGCAT} --properties-output -w 1000 ${top_srcdir}/tests/msguniq-a.out -o msguniq-4.ok
+${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok ${top_srcdir}/tests/msguniq-a.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msguniq-5 b/gettext-tools/tests/msguniq-5
index 2735fecdf58ab6b92a6406bdff4658162820888e..79a1a6a18f6ccdeadc9eb1a683d67dae6dc32c8a 100755 (executable)
--- a/gettext-tools/tests/msguniq-5
+++ b/gettext-tools/tests/msguniq-5
@@ -58,7 +58,7 @@ EOF
 
 tmpfiles="$tmpfiles msguniq-5.out"
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} msguniq-5.po -o msguniq-5.out
+${MSGUNIQ} -o msguniq-5.out msguniq-5.po
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles msguniq-5.ok"

diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1
index 23537f2d7e6215b59c2815a3b6a48c13710e74b7..d46b0fae3e2855b050ad154a4742b14cefd7b39b 100755 (executable)
--- a/gettext-tools/tests/plural-1
+++ b/gettext-tools/tests/plural-1
@@ -45,7 +45,7 @@ ${MSGFMT} -o fr/LC_MESSAGES/cake.mo fr.po
 
 tmpfiles="$tmpfiles fr.po.tmp"
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} fr/LC_MESSAGES/cake.mo -o fr.po.tmp
+${MSGUNFMT} -o fr.po.tmp fr/LC_MESSAGES/cake.mo
 
 tmpfiles="$tmpfiles fr.po.strip"
 sed 1,2d < fr.po > fr.po.strip

diff --git a/gettext-tools/tests/xgettext-awk-1 b/gettext-tools/tests/xgettext-awk-1
index c0422b9dfa639704bd777082cdc2fbe68dd42e10..e910632e852a46b77804a418e4b85be9b12f16fb 100755 (executable)
--- a/gettext-tools/tests/xgettext-awk-1
+++ b/gettext-tools/tests/xgettext-awk-1
@@ -21,7 +21,7 @@ EOF
 tmpfiles="$tmpfiles xg-a-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-a-1.awk -d xg-a-1
+  -d xg-a-1 xg-a-1.awk
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-a-1.ok"

diff --git a/gettext-tools/tests/xgettext-c-10 b/gettext-tools/tests/xgettext-c-10
index 9c3d5e17a5324053c5f948badc01de5ecdf12cfe..7f78a20d6c08a11881b4aec074aceef33957d95f 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-10
+++ b/gettext-tools/tests/xgettext-c-10
@@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-c-10.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location \
   --keyword=i18n:1 --keyword=i18n:1c,2 --keyword=tr:1 --keyword=tr:1,2c \
-  xg-c-10.c -d xg-c-10
+  -d xg-c-10 xg-c-10.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-c-10.ok"

diff --git a/gettext-tools/tests/xgettext-c-11 b/gettext-tools/tests/xgettext-c-11
index 5115c46ac5690f7ae5cd164b4d140206e5a15f52..9f2790c92761ab5070923f59f896abcbdcb05b10 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-11
+++ b/gettext-tools/tests/xgettext-c-11
@@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-c-11.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location \
   --keyword=i18n:1 --keyword=i18n:1c,2,2t --keyword=i18n:1,2,3t \
-  xg-c-11.c -d xg-c-11
+  -d xg-c-11 xg-c-11.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-c-11.ok"

diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3
index 182c833c51098a9176a737335110d45600bf115f..36e82e1462ab1e99c69a5ae63351bb461e726651 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-3
+++ b/gettext-tools/tests/xgettext-c-3
@@ -15,7 +15,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-c-3.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-location xg-c-3.in.c -d xg-c-3
+${XGETTEXT} --omit-header --add-location -d xg-c-3 xg-c-3.in.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-c-3.ok"

diff --git a/gettext-tools/tests/xgettext-c-4 b/gettext-tools/tests/xgettext-c-4
index 5dd8c0cb3dc0b7c936c0922e00991d57c0a78362..0f216d4d08a4647af38681f26d19cb1f18ef2024 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-4
+++ b/gettext-tools/tests/xgettext-c-4
@@ -12,7 +12,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-c-4.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --trigraphs xg-c-4.in.c -d xg-c-4
+${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4 xg-c-4.in.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-c-4.ok"

diff --git a/gettext-tools/tests/xgettext-c-5 b/gettext-tools/tests/xgettext-c-5
index a63f50da5b5da235422494a28fe37473ffba3d7a..38e1f2553e497c61019019c53e4947db0c9fcb18 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-5
+++ b/gettext-tools/tests/xgettext-c-5
@@ -12,7 +12,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-c-5.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --add-comments xg-c-5.in.cc -d xg-c-5
+${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5 xg-c-5.in.cc
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-c-5.ok"

diff --git a/gettext-tools/tests/xgettext-c-6 b/gettext-tools/tests/xgettext-c-6
index 757e9c3a802a8625c7a6e6c8e36efe37f47d615b..b31b8c5897808728664dd149d114d50b109ee0f6 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-6
+++ b/gettext-tools/tests/xgettext-c-6
@@ -22,8 +22,8 @@ EOF
 
 tmpfiles="$tmpfiles xg-c-6.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --add-comments=XXX xg-c-6.in.C \
-  -d xg-c-6
+${XGETTEXT} --omit-header --no-location --add-comments=XXX \
+  -d xg-c-6 xg-c-6.in.C
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-c-6.ok"

diff --git a/gettext-tools/tests/xgettext-c-9 b/gettext-tools/tests/xgettext-c-9
index 43e7e5929a488b83f469b9df422b070bad80a029..ebc804b545bed970112ca527fff6d7bcbe22097e 100755 (executable)
--- a/gettext-tools/tests/xgettext-c-9
+++ b/gettext-tools/tests/xgettext-c-9
@@ -26,7 +26,7 @@ EOF
 tmpfiles="$tmpfiles xg-c-9.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-c-9.c -d xg-c-9
+  -d xg-c-9 xg-c-9.c
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-c-9.ok"

diff --git a/gettext-tools/tests/xgettext-csharp-5 b/gettext-tools/tests/xgettext-csharp-5
index 03e4b15272e18106a97a21e91935622c4c1b9109..007b9e61f18d10c66a837bb88d555c9afcb71d58 100755 (executable)
--- a/gettext-tools/tests/xgettext-csharp-5
+++ b/gettext-tools/tests/xgettext-csharp-5
@@ -26,7 +26,7 @@ EOF
 tmpfiles="$tmpfiles xg-cs-5.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-cs-5.cs -d xg-cs-5
+  -d xg-cs-5 xg-cs-5.cs
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-cs-5.ok"

diff --git a/gettext-tools/tests/xgettext-elisp-1 b/gettext-tools/tests/xgettext-elisp-1
index addbdc675e7b6b8a7d996d7b5db08f9543c374a1..a78617f776aa6815a1ec09a9e59e238cda230f87 100755 (executable)
--- a/gettext-tools/tests/xgettext-elisp-1
+++ b/gettext-tools/tests/xgettext-elisp-1
@@ -21,7 +21,7 @@ EOF
 tmpfiles="$tmpfiles xg-el-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-el-1.el -d xg-el-1
+  -d xg-el-1 xg-el-1.el
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-el-1.ok"

diff --git a/gettext-tools/tests/xgettext-java-5 b/gettext-tools/tests/xgettext-java-5
index 6b8307db164ec71b7e4aea6da7d2b573a553fad8..f391223a061d4cf583110c0d7b5054a9e83e7ea0 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-5
+++ b/gettext-tools/tests/xgettext-java-5
@@ -26,7 +26,7 @@ EOF
 tmpfiles="$tmpfiles xg-j-5.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-j-5.java -d xg-j-5
+  -d xg-j-5 xg-j-5.java
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-j-5.ok"

diff --git a/gettext-tools/tests/xgettext-librep-1 b/gettext-tools/tests/xgettext-librep-1
index 0c92cb30733e10ce2f0f144ecc8dc3ba1d7a43cc..25911d4836ca50eed33e2ba3db8f1138cfd7a93e 100755 (executable)
--- a/gettext-tools/tests/xgettext-librep-1
+++ b/gettext-tools/tests/xgettext-librep-1
@@ -22,7 +22,7 @@ EOF
 tmpfiles="$tmpfiles xg-lr-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-lr-1.jl -d xg-lr-1
+  -d xg-lr-1 xg-lr-1.jl
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-lr-1.ok"

diff --git a/gettext-tools/tests/xgettext-lisp-1 b/gettext-tools/tests/xgettext-lisp-1
index 1db3955b697c26b089a679f2c7d75f66340426d6..aab7c2697e2c687b0f2868fa5f78d18e8ea0aad7 100755 (executable)
--- a/gettext-tools/tests/xgettext-lisp-1
+++ b/gettext-tools/tests/xgettext-lisp-1
@@ -22,7 +22,7 @@ EOF
 tmpfiles="$tmpfiles xg-ls-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-ls-1.lisp -d xg-ls-1
+  -d xg-ls-1 xg-ls-1.lisp
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-ls-1.ok"

diff --git a/gettext-tools/tests/xgettext-objc-1 b/gettext-tools/tests/xgettext-objc-1
index 2faf22c490b78da27946009925fbc32648564720..8ed381dcfa6ecd893a739e4f404e2df6b63f2b80 100755 (executable)
--- a/gettext-tools/tests/xgettext-objc-1
+++ b/gettext-tools/tests/xgettext-objc-1
@@ -30,7 +30,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-ob-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -k_ -kNSLocalizedString xg-ob-1.m -d xg-ob-1
+${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1 xg-ob-1.m
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-ob-1.ok"

diff --git a/gettext-tools/tests/xgettext-objc-2 b/gettext-tools/tests/xgettext-objc-2
index a4f6a2020aafb7c53bb2145dbd845bf8134313c5..3d6c7b25000149cd73dd1001bebac7139a84cef1 100755 (executable)
--- a/gettext-tools/tests/xgettext-objc-2
+++ b/gettext-tools/tests/xgettext-objc-2
@@ -30,7 +30,7 @@ EOF
 tmpfiles="$tmpfiles xg-ob-2.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-ob-2.m -d xg-ob-2
+  -d xg-ob-2 xg-ob-2.m
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-ob-2.ok"

diff --git a/gettext-tools/tests/xgettext-perl-1 b/gettext-tools/tests/xgettext-perl-1
index 5afb3258762d02264c8cb95111dc9fbda27e856d..190d231b357a57441a7498bde9257f2eff1b4caa 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-1
+++ b/gettext-tools/tests/xgettext-perl-1
@@ -154,7 +154,7 @@ ${XGETTEXT} --omit-header -n \
   -k_ --flag=_:1:pass-perl-format --flag=_:1:pass-perl-brace-format \
   -k%__ --flag=%__:1:pass-perl-format --flag=%__:1:pass-perl-brace-format \
   -k\$__ --flag=\$__:1:pass-perl-format --flag=\$__:1:pass-perl-brace-format \
-  xg-pl-1.pl -d xg-pl-1
+  -d xg-pl-1 xg-pl-1.pl
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-pl-1.ok"

diff --git a/gettext-tools/tests/xgettext-perl-5 b/gettext-tools/tests/xgettext-perl-5
index de64eecf38994f231f80c558897784febd029a79..c701d76fedaeb385f565e9f6eab8ab7243adb395 100755 (executable)
--- a/gettext-tools/tests/xgettext-perl-5
+++ b/gettext-tools/tests/xgettext-perl-5
@@ -21,7 +21,7 @@ EOF
 tmpfiles="$tmpfiles xg-pl-5.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-pl-5.pl -d xg-pl-5
+  -d xg-pl-5 xg-pl-5.pl
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-pl-5.ok"

diff --git a/gettext-tools/tests/xgettext-php-1 b/gettext-tools/tests/xgettext-php-1
index 2ba6f5a6f86bbc9b969de97d9e58ebce6c98e95c..050f15cf454846a19dee2909dcf4288f2137cabb 100755 (executable)
--- a/gettext-tools/tests/xgettext-php-1
+++ b/gettext-tools/tests/xgettext-php-1
@@ -26,7 +26,7 @@ EOF
 tmpfiles="$tmpfiles xg-ph-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-ph-1.php -d xg-ph-1
+  -d xg-ph-1 xg-ph-1.php
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-ph-1.ok"

diff --git a/gettext-tools/tests/xgettext-po-1 b/gettext-tools/tests/xgettext-po-1
index 5c733e46805abe9881e66dd41373f2ccf7605e10..0b0fc6905f6af16eb66d63c4ce871d1756972f9a 100755 (executable)
--- a/gettext-tools/tests/xgettext-po-1
+++ b/gettext-tools/tests/xgettext-po-1
@@ -47,8 +47,8 @@ EOF
 
 tmpfiles="$tmpfiles xg-po-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -n xg-po-1.in.po \
-  xg-po-1.c xg-po-1.cc -d xg-po-1
+${XGETTEXT} --omit-header -n \
+  -d xg-po-1 xg-po-1.in.po xg-po-1.c xg-po-1.cc
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-po-1.ok"

diff --git a/gettext-tools/tests/xgettext-properties-1 b/gettext-tools/tests/xgettext-properties-1
index 30c22a54f8312b4e683ced60af4547e6397c012a..63a6cd40ee34905af87dfc890baef6d537c3d3fb 100755 (executable)
--- a/gettext-tools/tests/xgettext-properties-1
+++ b/gettext-tools/tests/xgettext-properties-1
@@ -44,8 +44,8 @@ EOF
 
 tmpfiles="$tmpfiles xg-pr-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -n xg-pr-1.in.properties \
-  xg-pr-1.c xg-pr-1.cc -d xg-pr-1
+${XGETTEXT} --omit-header -n \
+  -d xg-pr-1 xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-pr-1.ok"

diff --git a/gettext-tools/tests/xgettext-python-2 b/gettext-tools/tests/xgettext-python-2
index 88d9b9d5b20437c8e2efb85ec9d416d0626456ba..78b3066ea1bb0e6357d658efe822874e1d42abac 100755 (executable)
--- a/gettext-tools/tests/xgettext-python-2
+++ b/gettext-tools/tests/xgettext-python-2
@@ -25,7 +25,7 @@ EOF
 tmpfiles="$tmpfiles xg-py-2.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-py-2.py -d xg-py-2
+  -d xg-py-2 xg-py-2.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-py-2.ok"

diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
index 7acc80641221e90c5d8859ecc1af1466f5ce024e..e50b187df34a5de23bea2be7944a3ed0cdee91b8 100755 (executable)
--- a/gettext-tools/tests/xgettext-python-3
+++ b/gettext-tools/tests/xgettext-python-3
@@ -49,10 +49,10 @@ EOF
 tmpfiles="$tmpfiles xg-py-3a.tmp xg-py-3a.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \
-  xg-py-3a.py -d xg-py-3a > /dev/null 2>&1
+  -d xg-py-3a xg-py-3a.py > /dev/null 2>&1
 test $? = 1 || { rm -fr $tmpfiles; exit 1; }
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=euc-jp \
-  xg-py-3a.py -o xg-py-3a.tmp
+  -o xg-py-3a.tmp xg-py-3a.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 grep -v 'POT-Creation-Date' < xg-py-3a.tmp > xg-py-3a.pot
 
@@ -64,7 +64,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-py-3b.tmp xg-py-3b.pot"
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \
-  xg-py-3b.py -o xg-py-3b.tmp
+  -o xg-py-3b.tmp xg-py-3b.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 grep -v 'POT-Creation-Date' < xg-py-3b.tmp > xg-py-3b.pot
 
@@ -76,7 +76,7 @@ test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-py-3c.tmp xg-py-3c.pot"
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=iso-8859-1 \
-  xg-py-3b.py -o xg-py-3c.tmp
+  -o xg-py-3c.tmp xg-py-3b.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 grep -v 'POT-Creation-Date' < xg-py-3c.tmp > xg-py-3c.pot
 
@@ -96,7 +96,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-py-3d.tmp xg-py-3d.pot"
 ${XGETTEXT} --add-comments=TRANSLATORS: \
-  xg-py-3d.py -o xg-py-3d.tmp
+  -o xg-py-3d.tmp xg-py-3d.py
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 grep -v 'POT-Creation-Date' < xg-py-3d.tmp > xg-py-3d.pot
 

diff --git a/gettext-tools/tests/xgettext-scheme-1 b/gettext-tools/tests/xgettext-scheme-1
index 4bb2fe7844a9b88d122337f7bdb338a02e48ad34..e1795269f12a410869140cb0fb139fa52583be2e 100755 (executable)
--- a/gettext-tools/tests/xgettext-scheme-1
+++ b/gettext-tools/tests/xgettext-scheme-1
@@ -19,7 +19,7 @@ EOF
 tmpfiles="$tmpfiles xg-sc-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-sc-1.scm -d xg-sc-1
+  -d xg-sc-1 xg-sc-1.scm
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-sc-1.ok"

diff --git a/gettext-tools/tests/xgettext-sh-1 b/gettext-tools/tests/xgettext-sh-1
index 87f919966640c0e7f45a0bd1e659c5554df735b9..a1c2863599a3cfd6155509f8a4a350b523ba1f11 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-1
+++ b/gettext-tools/tests/xgettext-sh-1
@@ -468,7 +468,7 @@ tmpfiles="$tmpfiles xg-sh-1.po"
 : ${XGETTEXT=xgettext}
 # Here we use ngettext with two signatures: ngettext:1 and ngettext:1,2.
 ${XGETTEXT} --omit-header --no-location --keyword=ngettext:1 \
-  xg-sh-1.sh -d xg-sh-1
+  -d xg-sh-1 xg-sh-1.sh
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-sh-1.ok"

diff --git a/gettext-tools/tests/xgettext-sh-2 b/gettext-tools/tests/xgettext-sh-2
index 395ed8307dc3ace19968675e382ad780151d222c..fb9cf12bb980f21a5992769b886cbc42d42da1d0 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-2
+++ b/gettext-tools/tests/xgettext-sh-2
@@ -21,7 +21,7 @@ EOF
 tmpfiles="$tmpfiles xg-sh-2.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-sh-2.sh -d xg-sh-2
+  -d xg-sh-2 xg-sh-2.sh
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-sh-2.ok"

diff --git a/gettext-tools/tests/xgettext-sh-3 b/gettext-tools/tests/xgettext-sh-3
index 9345a3538adc85d1e3fd3854548205b752e17fb0..4af390f5d4c125ec893581a42ceeed036af37934 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-3
+++ b/gettext-tools/tests/xgettext-sh-3
@@ -12,7 +12,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-sh-3.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location xg-sh-3.sh -d xg-sh-3
+${XGETTEXT} --omit-header --no-location -d xg-sh-3 xg-sh-3.sh
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-sh-3.ok"

diff --git a/gettext-tools/tests/xgettext-sh-4 b/gettext-tools/tests/xgettext-sh-4
index eda8d43edb88e141e4b5c7e84506d518d24d25c2..1bb467ba51d886aabb6d888965f80fced35bb84e 100755 (executable)
--- a/gettext-tools/tests/xgettext-sh-4
+++ b/gettext-tools/tests/xgettext-sh-4
@@ -118,7 +118,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-sh-4.err xg-sh-4.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location xg-sh-4.sh -d xg-sh-4 2>xg-sh-4.err
+${XGETTEXT} --omit-header --no-location -d xg-sh-4 xg-sh-4.sh 2>xg-sh-4.err
 test $? = 0 || { cat xg-sh-4.err; rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-sh-4.ok"

diff --git a/gettext-tools/tests/xgettext-smalltalk-1 b/gettext-tools/tests/xgettext-smalltalk-1
index 6695590862eb7ff0137434346be26a4efa0b26c4..b2e4bdff70e853227001a4fdeb6feefc3eba533f 100755 (executable)
--- a/gettext-tools/tests/xgettext-smalltalk-1
+++ b/gettext-tools/tests/xgettext-smalltalk-1
@@ -22,7 +22,7 @@ EOF
 tmpfiles="$tmpfiles xg-st-1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-st-1.st -d xg-st-1
+  -d xg-st-1 xg-st-1.st
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-st-1.ok"

diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1
index 85340ff9f9bb930e6d8b09bb8cacdd6b151d453d..a136c43462a72d5ea7bfc00095c3456fdd71c0d8 100755 (executable)
--- a/gettext-tools/tests/xgettext-stringtable-1
+++ b/gettext-tools/tests/xgettext-stringtable-1
@@ -25,7 +25,7 @@ EOF
 
 tmpfiles="$tmpfiles xg-st-1.tmp xg-st-1.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} xg-st-1.strings -o xg-st-1.tmp
+${XGETTEXT} -o xg-st-1.tmp xg-st-1.strings
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 grep -v 'POT-Creation-Date' < xg-st-1.tmp > xg-st-1.po
 

diff --git a/gettext-tools/tests/xgettext-tcl-2 b/gettext-tools/tests/xgettext-tcl-2
index b572b5ee5bfd0608041401b72c10d9839a53271d..a209c919725496b802e33d18ab9a324f3b137580 100755 (executable)
--- a/gettext-tools/tests/xgettext-tcl-2
+++ b/gettext-tools/tests/xgettext-tcl-2
@@ -21,7 +21,7 @@ EOF
 tmpfiles="$tmpfiles xg-t-2.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: -k_ \
-  xg-t-2.tcl -d xg-t-2
+  -d xg-t-2 xg-t-2.tcl
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-t-2.ok"

diff --git a/gettext-tools/tests/xgettext-ycp-2 b/gettext-tools/tests/xgettext-ycp-2
index 08d81121723f12c7d005cc7a4c882374299e8f20..279035cb20ac04994789eb54a131110c69098bce 100755 (executable)
--- a/gettext-tools/tests/xgettext-ycp-2
+++ b/gettext-tools/tests/xgettext-ycp-2
@@ -24,7 +24,7 @@ EOF
 tmpfiles="$tmpfiles xg-y-2.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  xg-y-2.ycp -d xg-y-2
+  -d xg-y-2 xg-y-2.ycp
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-y-2.ok"