diff options
243 files changed, 538 insertions, 291 deletions
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 68016a9..39a4767 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,250 @@ +2008-04-06 Bruno Haible <bruno@clisp.org> + + Avoid testsuite failures on MacOS X 10.5. + * format-c-3: Use "LC_ALL=C tr" instead of "tr". Avoids error with + non-ASCII bytes in UTF-8 locales. + * format-c-4: Likewise. + * format-c-5: Likewise. + * format-perl-mixed-1: Likewise. + * gettext-1: Likewise. + * lang-bash: Likewise. + * lang-c: Likewise. + * lang-c++: Likewise. + * lang-clisp: Likewise. + * lang-csharp: Likewise. + * lang-elisp: Likewise. + * lang-gawk: Likewise. + * lang-guile: Likewise. + * lang-java: Likewise. + * lang-librep: Likewise. + * lang-objc: Likewise. + * lang-pascal: Likewise. + * lang-perl-1: Likewise. + * lang-perl-2: Likewise. + * lang-php: Likewise. + * lang-po: Likewise. + * lang-python-1: Likewise. + * lang-python-2: Likewise. + * lang-rst: Likewise. + * lang-sh: Likewise. + * lang-smalltalk: Likewise. + * lang-tcl: Likewise. + * lang-ycp: Likewise. + * msgattrib-1: Likewise. + * msgattrib-10: Likewise. + * msgattrib-11: Likewise. + * msgattrib-12: Likewise. + * msgattrib-13: Likewise. + * msgattrib-14: Likewise. + * msgattrib-15: Likewise. + * msgattrib-16: Likewise. + * msgattrib-17: 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-properties-1: Likewise. + * msgcat-1: Likewise. + * msgcat-10: Likewise. + * msgcat-11: Likewise. + * msgcat-13: Likewise. + * msgcat-15: Likewise. + * msgcat-16: Likewise. + * msgcat-17: Likewise. + * msgcat-2: Likewise. + * msgcat-3: Likewise. + * msgcat-4: Likewise. + * msgcat-5: Likewise. + * msgcat-6: Likewise. + * msgcat-7: Likewise. + * msgcat-8: Likewise. + * msgcat-9: Likewise. + * msgcat-properties-1: Likewise. + * msgcat-stringtable-1: Likewise. + * msgcmp-2: Likewise. + * msgcmp-3: Likewise. + * msgcomm-1: Likewise. + * msgcomm-10: Likewise. + * msgcomm-11: Likewise. + * msgcomm-12: Likewise. + * msgcomm-13: Likewise. + * msgcomm-14: Likewise. + * msgcomm-16: Likewise. + * msgcomm-17: Likewise. + * msgcomm-18: Likewise. + * msgcomm-19: Likewise. + * msgcomm-2: Likewise. + * msgcomm-20: Likewise. + * msgcomm-21: Likewise. + * msgcomm-22: Likewise. + * msgcomm-23: Likewise. + * msgcomm-24: Likewise. + * msgcomm-25: Likewise. + * msgcomm-26: Likewise. + * msgcomm-3: Likewise. + * msgcomm-4: Likewise. + * msgcomm-5: Likewise. + * msgcomm-6: Likewise. + * msgcomm-7: Likewise. + * msgcomm-8: Likewise. + * msgcomm-9: Likewise. + * msgconv-5: Likewise. + * msgconv-6: Likewise. + * msgen-1: Likewise. + * msgen-2: Likewise. + * msgen-3: Likewise. + * msgfilter-sr-latin-1: Likewise. + * msgfmt-1: Likewise. + * msgfmt-10: Likewise. + * msgfmt-12: Likewise. + * msgfmt-14: Likewise. + * msgfmt-16: Likewise. + * msgfmt-5: Likewise. + * msgfmt-7: Likewise. + * msgfmt-8: Likewise. + * msgfmt-9: Likewise. + * msgfmt-properties-1: Likewise. + * msggrep-1: Likewise. + * msggrep-2: Likewise. + * msggrep-3: Likewise. + * msggrep-4: Likewise. + * msggrep-5: Likewise. + * msggrep-6: Likewise. + * msggrep-7: Likewise. + * msggrep-8: Likewise. + * msginit-1: Likewise. + * msginit-2: Likewise. + * msgmerge-1: 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-19: Likewise. + * msgmerge-2: Likewise. + * msgmerge-20: Likewise. + * msgmerge-21: Likewise. + * msgmerge-22: Likewise. + * msgmerge-23: Likewise. + * msgmerge-3: Likewise. + * msgmerge-4: Likewise. + * msgmerge-5: Likewise. + * msgmerge-6: Likewise. + * msgmerge-7: Likewise. + * msgmerge-8: Likewise. + * msgmerge-9: Likewise. + * msgmerge-compendium-1: Likewise. + * msgmerge-compendium-2: Likewise. + * msgmerge-compendium-3: Likewise. + * msgmerge-compendium-4: Likewise. + * msgmerge-compendium-5: Likewise. + * msgmerge-compendium-6: Likewise. + * msgmerge-properties-1: Likewise. + * msgmerge-properties-2: Likewise. + * msgmerge-update-2: Likewise. + * msgunfmt-1: Likewise. + * msgunfmt-2: Likewise. + * msgunfmt-properties-1: Likewise. + * msguniq-1: Likewise. + * msguniq-2: Likewise. + * msguniq-3: Likewise. + * msguniq-5: Likewise. + * msguniq-6: Likewise. + * plural-1: Likewise. + * xg-c-1.ok.po: Likewise. + * xgettext-2: Likewise. + * xgettext-3: Likewise. + * xgettext-4: Likewise. + * xgettext-5: Likewise. + * xgettext-6: Likewise. + * xgettext-7: Likewise. + * xgettext-8: Likewise. + * xgettext-9: Likewise. + * xgettext-awk-1: Likewise. + * xgettext-awk-2: Likewise. + * xgettext-c-1: Likewise. + * xgettext-c-10: Likewise. + * xgettext-c-11: Likewise. + * xgettext-c-12: Likewise. + * xgettext-c-13: Likewise. + * xgettext-c-14: Likewise. + * xgettext-c-15: Likewise. + * xgettext-c-16: Likewise. + * xgettext-c-17: Likewise. + * xgettext-c-2: Likewise. + * xgettext-c-3: Likewise. + * xgettext-c-4: Likewise. + * xgettext-c-5: Likewise. + * xgettext-c-6: Likewise. + * xgettext-c-7: Likewise. + * xgettext-c-8: Likewise. + * xgettext-c-9: Likewise. + * xgettext-csharp-1: Likewise. + * xgettext-csharp-2: Likewise. + * xgettext-csharp-3: Likewise. + * xgettext-csharp-4: Likewise. + * xgettext-csharp-5: Likewise. + * xgettext-csharp-6: Likewise. + * xgettext-csharp-7: Likewise. + * xgettext-elisp-1: Likewise. + * xgettext-elisp-2: Likewise. + * xgettext-java-1: Likewise. + * xgettext-java-2: Likewise. + * xgettext-java-3: Likewise. + * xgettext-java-4: Likewise. + * xgettext-java-5: Likewise. + * xgettext-java-6: Likewise. + * xgettext-java-7: Likewise. + * xgettext-librep-1: Likewise. + * xgettext-librep-2: Likewise. + * xgettext-lisp-1: Likewise. + * xgettext-lisp-2: Likewise. + * xgettext-objc-1: Likewise. + * xgettext-objc-2: Likewise. + * xgettext-perl-1: Likewise. + * xgettext-perl-2: Likewise. + * xgettext-perl-3: Likewise. + * xgettext-perl-4: Likewise. + * xgettext-perl-5: Likewise. + * xgettext-perl-6: Likewise. + * xgettext-perl-7: Likewise. + * xgettext-php-1: Likewise. + * xgettext-php-2: Likewise. + * xgettext-php-3: Likewise. + * xgettext-php-4: Likewise. + * xgettext-po-1: Likewise. + * xgettext-properties-1: Likewise. + * xgettext-python-1: Likewise. + * xgettext-python-2: Likewise. + * xgettext-python-3: Likewise. + * xgettext-python-4: Likewise. + * xgettext-scheme-1: Likewise. + * xgettext-scheme-3: Likewise. + * xgettext-sh-1: Likewise. + * xgettext-sh-2: Likewise. + * xgettext-sh-3: Likewise. + * xgettext-sh-4: Likewise. + * xgettext-sh-5: Likewise. + * xgettext-sh-6: Likewise. + * xgettext-smalltalk-1: Likewise. + * xgettext-smalltalk-2: Likewise. + * xgettext-stringtable-1: Likewise. + * xgettext-tcl-1: Likewise. + * xgettext-tcl-2: Likewise. + * xgettext-tcl-3: Likewise. + * xgettext-ycp-1: Likewise. + * xgettext-ycp-2: Likewise. + * xgettext-ycp-3: Likewise. + * xgettext-ycp-4: Likewise. + 2008-02-20 Bruno Haible <bruno@clisp.org> * format-gcc-internal-1: Test also %K. diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3 index e42cbdb..3511f6b 100755 --- a/gettext-tools/tests/format-c-3 +++ b/gettext-tools/tests/format-c-3 @@ -9,7 +9,7 @@ tmpfiles="$tmpfiles fc3.tmp fc3.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o fc3.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-3-prg.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fc3.tmp > fc3.pot +LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles fc3.ok" @@ -40,7 +40,7 @@ tmpfiles="$tmpfiles de.po.tmp de.po.un" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o de.po.tmp de/LC_MESSAGES/fc3.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < de.po.tmp > de.po.un +LC_ALL=C tr -d '\r' < de.po.tmp > de.po.un test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4 index 4eef200..5764e0a 100755 --- a/gettext-tools/tests/format-c-4 +++ b/gettext-tools/tests/format-c-4 @@ -9,7 +9,7 @@ tmpfiles="$tmpfiles fc4.tmp fc4.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o fc4.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-4-prg.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fc4.tmp > fc4.pot +LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles fc4.ok" @@ -44,7 +44,7 @@ tmpfiles="$tmpfiles de.po.tmp de.po.un" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o de.po.tmp de/LC_MESSAGES/fc4.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < de.po.tmp > de.po.un +LC_ALL=C tr -d '\r' < de.po.tmp > de.po.un test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5 index 65f92dc..666aea2 100755 --- a/gettext-tools/tests/format-c-5 +++ b/gettext-tools/tests/format-c-5 @@ -9,7 +9,7 @@ tmpfiles="$tmpfiles fc5.tmp fc5.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o fc5.tmp --omit-header --no-location ${top_srcdir}/tests/format-c-5-prg.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fc5.tmp > fc5.pot +LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles fc5.ok" @@ -41,7 +41,7 @@ tmpfiles="$tmpfiles fa.po.tmp fa.po.un" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fa.po.tmp > fa.po.un +LC_ALL=C tr -d '\r' < fa.po.tmp > fa.po.un test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/format-perl-mixed-1 b/gettext-tools/tests/format-perl-mixed-1 index 6f12104..8914708 100755 --- a/gettext-tools/tests/format-perl-mixed-1 +++ b/gettext-tools/tests/format-perl-mixed-1 @@ -44,7 +44,7 @@ EOF fail= if test -n "${formats}"; then # Verify that the first line contains the expected #, comment. - if sed 1q < f-pm-1-$n.po | tr -d '\r' | grep '^'"${formats}"'$' > /dev/null; then + if sed 1q < f-pm-1-$n.po | LC_ALL=C tr -d '\r' | grep '^'"${formats}"'$' > /dev/null; then : else fail=yes diff --git a/gettext-tools/tests/gettext-1 b/gettext-tools/tests/gettext-1 index a8c4764..9d57bbb 100755 --- a/gettext-tools/tests/gettext-1 +++ b/gettext-tools/tests/gettext-1 @@ -13,7 +13,7 @@ cp $top_srcdir/tests/test.mo LC_MESSAGES tmpfiles="$tmpfiles gt-test1.out" : ${GETTEXT=gettext} TEXTDOMAINDIR=.. LANGUAGE=tests \ -${GETTEXT} --env LC_ALL=en -e test 'SYS_(C)\n' | tr -d '\r' > gt-test1.out +${GETTEXT} --env LC_ALL=en -e test 'SYS_(C)\n' | LC_ALL=C tr -d '\r' > gt-test1.out # Create correct file. tmpfile="$tmpfiles gtmf-test1.ok" diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash index 83a3bd0..d2f8f7a 100755 --- a/gettext-tools/tests/lang-bash +++ b/gettext-tools/tests/lang-bash @@ -33,7 +33,7 @@ ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh \ result=$? cat prog.err | grep -v 'warning: the syntax \$"\.\.\." is deprecated due to security reasons' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -73,7 +73,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c index 0f87ef4..42eca3c 100755 --- a/gettext-tools/tests/lang-c +++ b/gettext-tools/tests/lang-c @@ -56,7 +56,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -107,7 +107,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++ index 7bc9da1..a959ca7 100755 --- a/gettext-tools/tests/lang-c++ +++ b/gettext-tools/tests/lang-c++ @@ -77,7 +77,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.cc test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -126,7 +126,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp index 6e685f7..3ea01a8 100755 --- a/gettext-tools/tests/lang-clisp +++ b/gettext-tools/tests/lang-clisp @@ -25,7 +25,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lisp test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -74,7 +74,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp index 354eace..256f635 100755 --- a/gettext-tools/tests/lang-csharp +++ b/gettext-tools/tests/lang-csharp @@ -57,7 +57,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location program.cs test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -132,7 +132,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-elisp b/gettext-tools/tests/lang-elisp index d63c349..5ddb4b3 100755 --- a/gettext-tools/tests/lang-elisp +++ b/gettext-tools/tests/lang-elisp @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.el test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -56,7 +56,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk index 0b41894..f3af46f 100755 --- a/gettext-tools/tests/lang-gawk +++ b/gettext-tools/tests/lang-gawk @@ -29,7 +29,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.awk test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -78,7 +78,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile index 5a4dc98..ba7a65c 100755 --- a/gettext-tools/tests/lang-guile +++ b/gettext-tools/tests/lang-guile @@ -28,7 +28,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.scm test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -77,7 +77,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java index b89d891..f6cecb6 100755 --- a/gettext-tools/tests/lang-java +++ b/gettext-tools/tests/lang-java @@ -82,7 +82,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location Program.java test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -157,7 +157,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep index ddec7bb..ec58469 100755 --- a/gettext-tools/tests/lang-librep +++ b/gettext-tools/tests/lang-librep @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.jl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc index 4e49c6b..343078a 100755 --- a/gettext-tools/tests/lang-objc +++ b/gettext-tools/tests/lang-objc @@ -72,7 +72,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.m test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -123,7 +123,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal index 933e341..418767d 100755 --- a/gettext-tools/tests/lang-pascal +++ b/gettext-tools/tests/lang-pascal @@ -39,7 +39,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -77,7 +77,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1 index d4514a0..df89d88 100755 --- a/gettext-tools/tests/lang-perl-1 +++ b/gettext-tools/tests/lang-perl-1 @@ -30,7 +30,7 @@ ${XGETTEXT} \ -k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \ -o prog.tmp --omit-header --no-location program.pl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -79,7 +79,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2 index 65ba222..69e0c52 100755 --- a/gettext-tools/tests/lang-perl-2 +++ b/gettext-tools/tests/lang-perl-2 @@ -29,7 +29,7 @@ ${XGETTEXT} \ -k__x --flag=__x:1:perl-brace-format \ -o prog.tmp --omit-header --no-location program.pl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -78,7 +78,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php index affc72d..1bdea63 100755 --- a/gettext-tools/tests/lang-php +++ b/gettext-tools/tests/lang-php @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.php test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -58,7 +58,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-po b/gettext-tools/tests/lang-po index ea7f292..68c2197 100755 --- a/gettext-tools/tests/lang-po +++ b/gettext-tools/tests/lang-po @@ -27,7 +27,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --add-location prog-in.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} @@ -62,7 +62,7 @@ tmpfiles="$tmpfiles prog.tmp.po prog.po" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp.po --omit-header --add-location prog-in.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp.po > prog.po +LC_ALL=C tr -d '\r' < prog.tmp.po > prog.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1 index 9f5224a..2c49743 100755 --- a/gettext-tools/tests/lang-python-1 +++ b/gettext-tools/tests/lang-python-1 @@ -25,7 +25,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.py test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -61,7 +61,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2 index 5c1cbd9..b738337 100755 --- a/gettext-tools/tests/lang-python-2 +++ b/gettext-tools/tests/lang-python-2 @@ -31,7 +31,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.py test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -80,7 +80,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-rst b/gettext-tools/tests/lang-rst index b92b0ed..2fe484f 100755 --- a/gettext-tools/tests/lang-rst +++ b/gettext-tools/tests/lang-rst @@ -26,7 +26,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh index 95a6633..639123a 100755 --- a/gettext-tools/tests/lang-sh +++ b/gettext-tools/tests/lang-sh @@ -32,7 +32,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -72,7 +72,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk index c538710..ea01239 100755 --- a/gettext-tools/tests/lang-smalltalk +++ b/gettext-tools/tests/lang-smalltalk @@ -37,7 +37,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.st test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -86,7 +86,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl index 2095411..c2b7981 100755 --- a/gettext-tools/tests/lang-tcl +++ b/gettext-tools/tests/lang-tcl @@ -25,7 +25,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header -k_ program.tcl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -63,7 +63,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/lang-ycp b/gettext-tools/tests/lang-ycp index 7bae853..c01c045 100755 --- a/gettext-tools/tests/lang-ycp +++ b/gettext-tools/tests/lang-ycp @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles prog.tmp prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.ycp test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < prog.tmp > prog.pot +LC_ALL=C tr -d '\r' < prog.tmp > prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles prog.ok" @@ -69,7 +69,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msgattrib-1 b/gettext-tools/tests/msgattrib-1 index b87020c..5fec17b 100755 --- a/gettext-tools/tests/msgattrib-1 +++ b/gettext-tools/tests/msgattrib-1 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test1.tmp ma-test1.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --translated -o ma-test1.tmp ma-test1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test1.tmp > ma-test1.out +LC_ALL=C tr -d '\r' < ma-test1.tmp > ma-test1.out 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 83ddad6..3408f37 100755 --- a/gettext-tools/tests/msgattrib-10 +++ b/gettext-tools/tests/msgattrib-10 @@ -61,7 +61,7 @@ tmpfiles="$tmpfiles ma-test10.tmp ma-test10.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --set-obsolete -o ma-test10.tmp ma-test10.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test10.tmp > ma-test10.out +LC_ALL=C tr -d '\r' < ma-test10.tmp > ma-test10.out 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 66fa3b4..a4c3a22 100755 --- a/gettext-tools/tests/msgattrib-11 +++ b/gettext-tools/tests/msgattrib-11 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test11.tmp ma-test11.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --clear-obsolete -o ma-test11.tmp ma-test11.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test11.tmp > ma-test11.out +LC_ALL=C tr -d '\r' < ma-test11.tmp > ma-test11.out 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 74d2179..681c468 100755 --- a/gettext-tools/tests/msgattrib-12 +++ b/gettext-tools/tests/msgattrib-12 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test12.tmp ma-test12.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --fuzzy -o ma-test12.tmp ma-test12.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test12.tmp > ma-test12.out +LC_ALL=C tr -d '\r' < ma-test12.tmp > ma-test12.out 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 7c6e615..ec362a9 100755 --- a/gettext-tools/tests/msgattrib-13 +++ b/gettext-tools/tests/msgattrib-13 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test13.tmp ma-test13.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --obsolete -o ma-test13.tmp ma-test13.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test13.tmp > ma-test13.out +LC_ALL=C tr -d '\r' < ma-test13.tmp > ma-test13.out 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 5d872a3..0de21ba 100755 --- a/gettext-tools/tests/msgattrib-14 +++ b/gettext-tools/tests/msgattrib-14 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test14.tmp ma-test14.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.tmp ma-test14.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test14.tmp > ma-test14.out +LC_ALL=C tr -d '\r' < ma-test14.tmp > ma-test14.out 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 b0d59d6..d65fc4e 100755 --- a/gettext-tools/tests/msgattrib-15 +++ b/gettext-tools/tests/msgattrib-15 @@ -55,7 +55,7 @@ tmpfiles="$tmpfiles ma-test15.tmp ma-test15.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --clear-fuzzy -o ma-test15.tmp ma-test15.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test15.tmp > ma-test15.out +LC_ALL=C tr -d '\r' < ma-test15.tmp > ma-test15.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msgattrib-16 b/gettext-tools/tests/msgattrib-16 index 710db4d..ff8dfdc 100755 --- a/gettext-tools/tests/msgattrib-16 +++ b/gettext-tools/tests/msgattrib-16 @@ -48,7 +48,7 @@ tmpfiles="$tmpfiles ma-test16.tmp ma-test16.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --fuzzy -o ma-test16.tmp ma-test16.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test16.tmp > ma-test16.out +LC_ALL=C tr -d '\r' < ma-test16.tmp > ma-test16.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles ma-test16.ok" diff --git a/gettext-tools/tests/msgattrib-17 b/gettext-tools/tests/msgattrib-17 index 3d30aef..0409c3a 100755 --- a/gettext-tools/tests/msgattrib-17 +++ b/gettext-tools/tests/msgattrib-17 @@ -48,7 +48,7 @@ tmpfiles="$tmpfiles ma-test17.tmp ma-test17.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --clear-previous -o ma-test17.tmp ma-test17.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test17.tmp > ma-test17.out +LC_ALL=C tr -d '\r' < ma-test17.tmp > ma-test17.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles ma-test17.ok" diff --git a/gettext-tools/tests/msgattrib-2 b/gettext-tools/tests/msgattrib-2 index 408bb44..aaced02 100755 --- a/gettext-tools/tests/msgattrib-2 +++ b/gettext-tools/tests/msgattrib-2 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test2.tmp ma-test2.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --untranslated -o ma-test2.tmp ma-test2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test2.tmp > ma-test2.out +LC_ALL=C tr -d '\r' < ma-test2.tmp > ma-test2.out 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 8766e5c..2d6ca7f 100755 --- a/gettext-tools/tests/msgattrib-3 +++ b/gettext-tools/tests/msgattrib-3 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test3.tmp ma-test3.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --no-fuzzy -o ma-test3.tmp ma-test3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test3.tmp > ma-test3.out +LC_ALL=C tr -d '\r' < ma-test3.tmp > ma-test3.out 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 5e7e144..641d5a6 100755 --- a/gettext-tools/tests/msgattrib-4 +++ b/gettext-tools/tests/msgattrib-4 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test4.tmp ma-test4.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --only-fuzzy -o ma-test4.tmp ma-test4.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test4.tmp > ma-test4.out +LC_ALL=C tr -d '\r' < ma-test4.tmp > ma-test4.out 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 dc0f584..f872866 100755 --- a/gettext-tools/tests/msgattrib-5 +++ b/gettext-tools/tests/msgattrib-5 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test5.tmp ma-test5.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --no-obsolete -o ma-test5.tmp ma-test5.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test5.tmp > ma-test5.out +LC_ALL=C tr -d '\r' < ma-test5.tmp > ma-test5.out 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 f353679..08f41f6 100755 --- a/gettext-tools/tests/msgattrib-6 +++ b/gettext-tools/tests/msgattrib-6 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test6.tmp ma-test6.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --only-obsolete -o ma-test6.tmp ma-test6.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test6.tmp > ma-test6.out +LC_ALL=C tr -d '\r' < ma-test6.tmp > ma-test6.out 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 fd72d2c..e0c3ce3 100755 --- a/gettext-tools/tests/msgattrib-7 +++ b/gettext-tools/tests/msgattrib-7 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test7.tmp ma-test7.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --translated --only-obsolete -o ma-test7.tmp ma-test7.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test7.tmp > ma-test7.out +LC_ALL=C tr -d '\r' < ma-test7.tmp > ma-test7.out 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 c66c4bf..83a0ca7 100755 --- a/gettext-tools/tests/msgattrib-8 +++ b/gettext-tools/tests/msgattrib-8 @@ -61,7 +61,7 @@ tmpfiles="$tmpfiles ma-test8.tmp ma-test8.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --set-fuzzy -o ma-test8.tmp ma-test8.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test8.tmp > ma-test8.out +LC_ALL=C tr -d '\r' < ma-test8.tmp > ma-test8.out 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 d3d4c6f..909bad3 100755 --- a/gettext-tools/tests/msgattrib-9 +++ b/gettext-tools/tests/msgattrib-9 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles ma-test9.tmp ma-test9.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --clear-fuzzy -o ma-test9.tmp ma-test9.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-test9.tmp > ma-test9.out +LC_ALL=C tr -d '\r' < ma-test9.tmp > ma-test9.out 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 e027a1f..fc42200 100755 --- a/gettext-tools/tests/msgattrib-properties-1 +++ b/gettext-tools/tests/msgattrib-properties-1 @@ -36,7 +36,7 @@ tmpfiles="$tmpfiles ma-s-1.tmp ma-s-1.out" : ${MSGATTRIB=msgattrib} ${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.tmp ma-s-1.properties test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < ma-s-1.tmp > ma-s-1.out +LC_ALL=C tr -d '\r' < ma-s-1.tmp > ma-s-1.out 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 2ccaab1..0a0da98 100755 --- a/gettext-tools/tests/msgcat-1 +++ b/gettext-tools/tests/msgcat-1 @@ -45,7 +45,7 @@ tmpfiles="$tmpfiles mcat-test1.tmp mcat-test1.out" : ${MSGCAT=msgcat} ${MSGCAT} -o mcat-test1.tmp mcat-test1.in1 mcat-test1.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test1.tmp > mcat-test1.out +LC_ALL=C tr -d '\r' < mcat-test1.tmp > mcat-test1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test1.ok" diff --git a/gettext-tools/tests/msgcat-10 b/gettext-tools/tests/msgcat-10 index 10aee3a..4af252b 100755 --- a/gettext-tools/tests/msgcat-10 +++ b/gettext-tools/tests/msgcat-10 @@ -66,7 +66,7 @@ rm -f mcat-test10.tmp ${MSGCAT} --more-than=0 -o mcat-test10.tmp \ mcat-test10.in1 mcat-test10.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test10.tmp > mcat-test10.out +LC_ALL=C tr -d '\r' < mcat-test10.tmp > mcat-test10.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test10.ok" diff --git a/gettext-tools/tests/msgcat-11 b/gettext-tools/tests/msgcat-11 index 3d1b88d..f86b4df 100755 --- a/gettext-tools/tests/msgcat-11 +++ b/gettext-tools/tests/msgcat-11 @@ -37,7 +37,7 @@ tmpfiles="$tmpfiles mcat-test11.tmp mcat-test11.out" : ${MSGCAT=msgcat} ${MSGCAT} -o mcat-test11.tmp mcat-test11.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test11.tmp > mcat-test11.out +LC_ALL=C tr -d '\r' < mcat-test11.tmp > mcat-test11.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msgcat-13 b/gettext-tools/tests/msgcat-13 index 08be9ec..b7104c0 100755 --- a/gettext-tools/tests/msgcat-13 +++ b/gettext-tools/tests/msgcat-13 @@ -73,7 +73,7 @@ rm -f mcat-test13.tmp : ${MSGCAT=msgcat} ${MSGCAT} -o mcat-test13.tmp mcat-test13.in1 mcat-test13.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test13.tmp > mcat-test13.out +LC_ALL=C tr -d '\r' < mcat-test13.tmp > mcat-test13.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test13.ok" diff --git a/gettext-tools/tests/msgcat-15 b/gettext-tools/tests/msgcat-15 index e9d1e0f..b89ad8d 100755 --- a/gettext-tools/tests/msgcat-15 +++ b/gettext-tools/tests/msgcat-15 @@ -49,7 +49,7 @@ rm -f mcat-test15.tmp1 : ${MSGCAT=msgcat} ${MSGCAT} -o mcat-test15.tmp1 mcat-test15.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1 +LC_ALL=C tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1 test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} @@ -61,7 +61,7 @@ rm -f mcat-test15.tmp2 : ${MSGCAT=msgcat} ${MSGCAT} --indent -o mcat-test15.tmp2 mcat-test15.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2 +LC_ALL=C tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test15.ok" diff --git a/gettext-tools/tests/msgcat-16 b/gettext-tools/tests/msgcat-16 index b433f05..017b249 100755 --- a/gettext-tools/tests/msgcat-16 +++ b/gettext-tools/tests/msgcat-16 @@ -50,7 +50,7 @@ rm -f mcat-test16.tmp : ${MSGCAT=msgcat} ${MSGCAT} -o mcat-test16.tmp mcat-test16.in1 mcat-test16.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test16.tmp > mcat-test16.out +LC_ALL=C tr -d '\r' < mcat-test16.tmp > mcat-test16.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test16.ok" diff --git a/gettext-tools/tests/msgcat-17 b/gettext-tools/tests/msgcat-17 index 1bc47b3..6e4c9a9 100755 --- a/gettext-tools/tests/msgcat-17 +++ b/gettext-tools/tests/msgcat-17 @@ -26,7 +26,7 @@ rm -f mcat-test17.tmp : ${MSGCAT=msgcat} ${MSGCAT} -o mcat-test17.tmp --width=80 mcat-test17.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test17.tmp > mcat-test17.out +LC_ALL=C tr -d '\r' < mcat-test17.tmp > mcat-test17.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test17.ok" diff --git a/gettext-tools/tests/msgcat-2 b/gettext-tools/tests/msgcat-2 index 072eddd..ec48d20 100755 --- a/gettext-tools/tests/msgcat-2 +++ b/gettext-tools/tests/msgcat-2 @@ -63,7 +63,7 @@ ${MSGCAT} --more-than=0 -o mcat-test2.tmp \ result=$? cat mcat-test2.err | grep -v 'warning: .* encodings' | grep -v '^ ' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test2.tmp > mcat-test2.out +LC_ALL=C tr -d '\r' < mcat-test2.tmp > mcat-test2.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test2.ok" diff --git a/gettext-tools/tests/msgcat-3 b/gettext-tools/tests/msgcat-3 index 030cc72..f947d02 100755 --- a/gettext-tools/tests/msgcat-3 +++ b/gettext-tools/tests/msgcat-3 @@ -64,7 +64,7 @@ ${MSGCAT} --use-first --more-than=0 -o mcat-test3.tmp \ result=$? cat mcat-test3.err | grep -v 'warning: .* encodings' | grep -v '^ ' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test3.tmp > mcat-test3.out +LC_ALL=C tr -d '\r' < mcat-test3.tmp > mcat-test3.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test3.ok" diff --git a/gettext-tools/tests/msgcat-4 b/gettext-tools/tests/msgcat-4 index 8f5600c..16da2db 100755 --- a/gettext-tools/tests/msgcat-4 +++ b/gettext-tools/tests/msgcat-4 @@ -64,7 +64,7 @@ ${MSGCAT} --use-first --more-than=0 -o mcat-test4.tmp \ result=$? cat mcat-test4.err | grep -v 'warning: .* encodings' | grep -v '^ ' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test4.tmp > mcat-test4.out +LC_ALL=C tr -d '\r' < mcat-test4.tmp > mcat-test4.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test4.ok" diff --git a/gettext-tools/tests/msgcat-5 b/gettext-tools/tests/msgcat-5 index 8225474..745c2f5 100755 --- a/gettext-tools/tests/msgcat-5 +++ b/gettext-tools/tests/msgcat-5 @@ -62,7 +62,7 @@ rm -f mcat-test5.tmp ${MSGCAT} --use-first --more-than=0 -o mcat-test5.tmp \ mcat-test5.in1 mcat-test5.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test5.tmp > mcat-test5.out +LC_ALL=C tr -d '\r' < mcat-test5.tmp > mcat-test5.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test5.ok" diff --git a/gettext-tools/tests/msgcat-6 b/gettext-tools/tests/msgcat-6 index 4ed8d44..16a096e 100755 --- a/gettext-tools/tests/msgcat-6 +++ b/gettext-tools/tests/msgcat-6 @@ -62,7 +62,7 @@ rm -f mcat-test6.tmp ${MSGCAT} --more-than=0 -o mcat-test6.tmp \ mcat-test6.in1 mcat-test6.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test6.tmp > mcat-test6.out +LC_ALL=C tr -d '\r' < mcat-test6.tmp > mcat-test6.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test6.ok" diff --git a/gettext-tools/tests/msgcat-7 b/gettext-tools/tests/msgcat-7 index d8008be..2d2b469 100755 --- a/gettext-tools/tests/msgcat-7 +++ b/gettext-tools/tests/msgcat-7 @@ -23,7 +23,7 @@ rm -f mcat-test7.tmp : ${MSGCAT=msgcat} ${MSGCAT} --sort-output -o mcat-test7.tmp mcat-test7.in1 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test7.tmp > mcat-test7.out +LC_ALL=C tr -d '\r' < mcat-test7.tmp > mcat-test7.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test7.ok" diff --git a/gettext-tools/tests/msgcat-8 b/gettext-tools/tests/msgcat-8 index 21b2c22..889440f 100755 --- a/gettext-tools/tests/msgcat-8 +++ b/gettext-tools/tests/msgcat-8 @@ -63,7 +63,7 @@ rm -f mcat-test8.tmp ${MSGCAT} --more-than=0 -o mcat-test8.tmp \ mcat-test8.in1 mcat-test8.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test8.tmp > mcat-test8.out +LC_ALL=C tr -d '\r' < mcat-test8.tmp > mcat-test8.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test8.ok" diff --git a/gettext-tools/tests/msgcat-9 b/gettext-tools/tests/msgcat-9 index e1d6e4c..6eb2c92 100755 --- a/gettext-tools/tests/msgcat-9 +++ b/gettext-tools/tests/msgcat-9 @@ -62,7 +62,7 @@ rm -f mcat-test9.tmp ${MSGCAT} --more-than=0 -o mcat-test9.tmp \ mcat-test9.in1 mcat-test9.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-test9.tmp > mcat-test9.out +LC_ALL=C tr -d '\r' < mcat-test9.tmp > mcat-test9.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-test9.ok" diff --git a/gettext-tools/tests/msgcat-properties-1 b/gettext-tools/tests/msgcat-properties-1 index 931bec5..4788306 100755 --- a/gettext-tools/tests/msgcat-properties-1 +++ b/gettext-tools/tests/msgcat-properties-1 @@ -25,7 +25,7 @@ rm -f mcat-p-1.tmp ${MSGCAT} --use-first --more-than=0 --properties-input --properties-output \ -o mcat-p-1.tmp mcat-p-1.in1 mcat-p-1.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out +LC_ALL=C tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-p-1.ok" diff --git a/gettext-tools/tests/msgcat-stringtable-1 b/gettext-tools/tests/msgcat-stringtable-1 index f8ef7de..ff066fe 100755 --- a/gettext-tools/tests/msgcat-stringtable-1 +++ b/gettext-tools/tests/msgcat-stringtable-1 @@ -35,7 +35,7 @@ ${MSGCAT} --stringtable-input -o mcat-s-1.tmp 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; } -tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out +LC_ALL=C tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcat-s-1.ok" diff --git a/gettext-tools/tests/msgcmp-2 b/gettext-tools/tests/msgcmp-2 index d865585..0b5ad1e 100755 --- a/gettext-tools/tests/msgcmp-2 +++ b/gettext-tools/tests/msgcmp-2 @@ -22,7 +22,7 @@ EOF tmpfiles="$tmpfiles mc-test2.out" : ${MSGCMP=msgcmp} LC_MESSAGES=C LC_ALL= \ -${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' | tr -d '\r' > mc-test2.out +${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test2.out tmpfiles="$tmpfiles mc-test2.ok" cat <<EOF > mc-test2.ok diff --git a/gettext-tools/tests/msgcmp-3 b/gettext-tools/tests/msgcmp-3 index 3801ebd..063a64a 100755 --- a/gettext-tools/tests/msgcmp-3 +++ b/gettext-tools/tests/msgcmp-3 @@ -22,7 +22,7 @@ EOF tmpfiles="$tmpfiles mc-test3.out" : ${MSGCMP=msgcmp} LC_MESSAGES=C LC_ALL= \ -${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' | tr -d '\r' > mc-test3.out +${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test3.out tmpfiles="$tmpfiles mc-test3.ok" cat <<EOF > mc-test3.ok diff --git a/gettext-tools/tests/msgcomm-1 b/gettext-tools/tests/msgcomm-1 index 76561bc..a7e483c 100755 --- a/gettext-tools/tests/msgcomm-1 +++ b/gettext-tools/tests/msgcomm-1 @@ -22,7 +22,7 @@ tmpfiles="$tmpfiles mcomm-test1.tmp mcomm-test1.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 -o mcomm-test1.tmp mcomm-test1.in1 mcomm-test1.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out +LC_ALL=C tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test1.ok" diff --git a/gettext-tools/tests/msgcomm-10 b/gettext-tools/tests/msgcomm-10 index 17949e5..7f6a085 100755 --- a/gettext-tools/tests/msgcomm-10 +++ b/gettext-tools/tests/msgcomm-10 @@ -45,7 +45,7 @@ tmpfiles="$tmpfiles mcomm-test10.tmp mcomm-test10.out" ${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test10.tmp \ mcomm-test10.in1 mcomm-test10.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out +LC_ALL=C tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test10.ok" diff --git a/gettext-tools/tests/msgcomm-11 b/gettext-tools/tests/msgcomm-11 index ed2cafc..58af444 100755 --- a/gettext-tools/tests/msgcomm-11 +++ b/gettext-tools/tests/msgcomm-11 @@ -49,7 +49,7 @@ tmpfiles="$tmpfiles mcomm-test11.tmp mcomm-test11.out" ${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test11.tmp \ mcomm-test11.in1 mcomm-test11.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out +LC_ALL=C tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test11.ok" diff --git a/gettext-tools/tests/msgcomm-12 b/gettext-tools/tests/msgcomm-12 index 0dd24ff..75df966 100755 --- a/gettext-tools/tests/msgcomm-12 +++ b/gettext-tools/tests/msgcomm-12 @@ -71,7 +71,7 @@ tmpfiles="$tmpfiles mcomm-test12.tmp mcomm-test12.out" ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test12.tmp \ mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out +LC_ALL=C tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test12.ok" diff --git a/gettext-tools/tests/msgcomm-13 b/gettext-tools/tests/msgcomm-13 index a5ddc5b..d8a08db 100755 --- a/gettext-tools/tests/msgcomm-13 +++ b/gettext-tools/tests/msgcomm-13 @@ -74,7 +74,7 @@ tmpfiles="$tmpfiles mcomm-test13.tmp mcomm-test13.out" ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test13.tmp \ mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out +LC_ALL=C tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test13.ok" diff --git a/gettext-tools/tests/msgcomm-14 b/gettext-tools/tests/msgcomm-14 index e001415..253ec32 100755 --- a/gettext-tools/tests/msgcomm-14 +++ b/gettext-tools/tests/msgcomm-14 @@ -69,7 +69,7 @@ tmpfiles="$tmpfiles mcomm-test14.tmp mcomm-test14.out" ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test14.tmp \ mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out +LC_ALL=C tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test14.ok" diff --git a/gettext-tools/tests/msgcomm-16 b/gettext-tools/tests/msgcomm-16 index 42be7a5..13fb95a 100755 --- a/gettext-tools/tests/msgcomm-16 +++ b/gettext-tools/tests/msgcomm-16 @@ -63,7 +63,7 @@ ${MSGCOMM} --more-than=0 -o mcomm-test16.tmp \ result=$? cat mcomm-test16.err | grep -v 'warning: .* encodings' | grep -v '^ ' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out +LC_ALL=C tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test16.ok" diff --git a/gettext-tools/tests/msgcomm-17 b/gettext-tools/tests/msgcomm-17 index 20ad450..d4186b8 100755 --- a/gettext-tools/tests/msgcomm-17 +++ b/gettext-tools/tests/msgcomm-17 @@ -72,7 +72,7 @@ ${MSGCOMM} -u \ -o mcomm-test17.tmp \ mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out +LC_ALL=C tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out 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 fd9d95c..ff8c23e 100755 --- a/gettext-tools/tests/msgcomm-18 +++ b/gettext-tools/tests/msgcomm-18 @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles mcomm-test18.tmp mcomm-test18.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 -o mcomm-test18.tmp mcomm-test18.in1 mcomm-test18.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out +LC_ALL=C tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out 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 599dda2..596c24b 100755 --- a/gettext-tools/tests/msgcomm-19 +++ b/gettext-tools/tests/msgcomm-19 @@ -26,7 +26,7 @@ tmpfiles="$tmpfiles mcomm-test19.tmp mcomm-test19.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 -o mcomm-test19.tmp mcomm-test19.in1 mcomm-test19.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out +LC_ALL=C tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test19.ok" diff --git a/gettext-tools/tests/msgcomm-2 b/gettext-tools/tests/msgcomm-2 index 86810f7..8c3c266 100755 --- a/gettext-tools/tests/msgcomm-2 +++ b/gettext-tools/tests/msgcomm-2 @@ -23,7 +23,7 @@ tmpfiles="$tmpfiles mcomm-test2.tmp mcomm-test2.out" ${MSGCOMM} --more-than=0 --no-location -o mcomm-test2.tmp \ mcomm-test2.in1 mcomm-test2.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out +LC_ALL=C tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test2.ok" diff --git a/gettext-tools/tests/msgcomm-20 b/gettext-tools/tests/msgcomm-20 index a68064b..30a8c27 100755 --- a/gettext-tools/tests/msgcomm-20 +++ b/gettext-tools/tests/msgcomm-20 @@ -27,7 +27,7 @@ tmpfiles="$tmpfiles mcomm-test20.tmp mcomm-test20.out" ${MSGCOMM} --more-than=0 -o mcomm-test20.tmp \ mcomm-test20.in1 mcomm-test20.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out +LC_ALL=C tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test20.ok" diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21 index 84bbfe5..2be54e3 100755 --- a/gettext-tools/tests/msgcomm-21 +++ b/gettext-tools/tests/msgcomm-21 @@ -27,7 +27,7 @@ tmpfiles="$tmpfiles mcomm-test21.tmp mcomm-test21.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out +LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test21.ok" diff --git a/gettext-tools/tests/msgcomm-22 b/gettext-tools/tests/msgcomm-22 index 3f90605..42b28d3 100755 --- a/gettext-tools/tests/msgcomm-22 +++ b/gettext-tools/tests/msgcomm-22 @@ -70,7 +70,7 @@ rm -f mcomm-test22.tmp ${MSGCOMM} --less-than=2 -o mcomm-test22.tmp \ mcomm-test22.in1 mcomm-test22.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out +LC_ALL=C tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test22.ok" diff --git a/gettext-tools/tests/msgcomm-23 b/gettext-tools/tests/msgcomm-23 index 818c44e..c7aefa3 100755 --- a/gettext-tools/tests/msgcomm-23 +++ b/gettext-tools/tests/msgcomm-23 @@ -13,7 +13,7 @@ tmpfiles="$tmpfiles mcomm-23.tmp mcomm-23.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} -w 1000 -o mcomm-23.tmp mcomm-23.in1 mcomm-23.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-23.tmp > mcomm-23.out +LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msgcomm-24 b/gettext-tools/tests/msgcomm-24 index 652d201..dd40dfb 100755 --- a/gettext-tools/tests/msgcomm-24 +++ b/gettext-tools/tests/msgcomm-24 @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles mcomm-test24.tmp mcomm-test24.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 --properties-input --properties-output -o mcomm-test24.tmp mcomm-test24.in1 mcomm-test24.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out +LC_ALL=C tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test24.ok" diff --git a/gettext-tools/tests/msgcomm-25 b/gettext-tools/tests/msgcomm-25 index 049caf2..8ec3fe8 100755 --- a/gettext-tools/tests/msgcomm-25 +++ b/gettext-tools/tests/msgcomm-25 @@ -72,7 +72,7 @@ tmpfiles="$tmpfiles mcomm-test25.tmp mcomm-test25.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 -o mcomm-test25.tmp mcomm-test25.in1 mcomm-test25.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out +LC_ALL=C tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test25.ok" diff --git a/gettext-tools/tests/msgcomm-26 b/gettext-tools/tests/msgcomm-26 index ee48094..0e79f8a 100755 --- a/gettext-tools/tests/msgcomm-26 +++ b/gettext-tools/tests/msgcomm-26 @@ -75,7 +75,7 @@ tmpfiles="$tmpfiles mcomm-test26.tmp mcomm-test26.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} -o mcomm-test26.tmp mcomm-test26.in1 mcomm-test26.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out +LC_ALL=C tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test26.ok" diff --git a/gettext-tools/tests/msgcomm-3 b/gettext-tools/tests/msgcomm-3 index 9ccc510..66539cc 100755 --- a/gettext-tools/tests/msgcomm-3 +++ b/gettext-tools/tests/msgcomm-3 @@ -23,7 +23,7 @@ tmpfiles="$tmpfiles mcomm-test3.tmp mcomm-test3.out" ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test3.tmp \ mcomm-test3.in1 mcomm-test3.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out +LC_ALL=C tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test3.ok" diff --git a/gettext-tools/tests/msgcomm-4 b/gettext-tools/tests/msgcomm-4 index 551ac17..e3579af 100755 --- a/gettext-tools/tests/msgcomm-4 +++ b/gettext-tools/tests/msgcomm-4 @@ -34,7 +34,7 @@ tmpfiles="$tmpfiles mcomm-test4.tmp mcomm-test4.out" ${MSGCOMM} --more-than=0 -o mcomm-test4.tmp \ mcomm-test4.in1 mcomm-test4.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out +LC_ALL=C tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test4.ok" diff --git a/gettext-tools/tests/msgcomm-5 b/gettext-tools/tests/msgcomm-5 index 72bb18a..8442a5d 100755 --- a/gettext-tools/tests/msgcomm-5 +++ b/gettext-tools/tests/msgcomm-5 @@ -34,7 +34,7 @@ tmpfiles="$tmpfiles mcomm-test5.tmp mcomm-test5.out" ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test5.tmp \ mcomm-test5.in1 mcomm-test5.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out +LC_ALL=C tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test5.ok" diff --git a/gettext-tools/tests/msgcomm-6 b/gettext-tools/tests/msgcomm-6 index 29bf24c..6dca10b 100755 --- a/gettext-tools/tests/msgcomm-6 +++ b/gettext-tools/tests/msgcomm-6 @@ -34,7 +34,7 @@ tmpfiles="$tmpfiles mcomm-test6.tmp mcomm-test6.out" ${MSGCOMM} --more-than=0 --no-location -o mcomm-test6.tmp \ mcomm-test6.in1 mcomm-test6.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out +LC_ALL=C tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test6.ok" diff --git a/gettext-tools/tests/msgcomm-7 b/gettext-tools/tests/msgcomm-7 index dff5165..529cf73 100755 --- a/gettext-tools/tests/msgcomm-7 +++ b/gettext-tools/tests/msgcomm-7 @@ -34,7 +34,7 @@ tmpfiles="$tmpfiles mcomm-test7.tmp mcomm-test7.out" ${MSGCOMM} --more-than=0 --no-location --omit-header -o mcomm-test7.tmp \ mcomm-test7.in1 mcomm-test7.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out +LC_ALL=C tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test7.ok" diff --git a/gettext-tools/tests/msgcomm-8 b/gettext-tools/tests/msgcomm-8 index 19c71a4..76170fc 100755 --- a/gettext-tools/tests/msgcomm-8 +++ b/gettext-tools/tests/msgcomm-8 @@ -45,7 +45,7 @@ tmpfiles="$tmpfiles mcomm-test8.tmp mcomm-test8.out" ${MSGCOMM} --more-than=1 -o mcomm-test8.tmp \ mcomm-test8.in1 mcomm-test8.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out +LC_ALL=C tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test8.ok" diff --git a/gettext-tools/tests/msgcomm-9 b/gettext-tools/tests/msgcomm-9 index 6ed9d84..fac2851 100755 --- a/gettext-tools/tests/msgcomm-9 +++ b/gettext-tools/tests/msgcomm-9 @@ -45,7 +45,7 @@ tmpfiles="$tmpfiles mcomm-test9.tmp mcomm-test9.out" ${MSGCOMM} --more-than=1 --no-location -o mcomm-test9.tmp \ mcomm-test9.in1 mcomm-test9.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out +LC_ALL=C tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mcomm-test9.ok" diff --git a/gettext-tools/tests/msgconv-5 b/gettext-tools/tests/msgconv-5 index fd448d0..3850c43 100755 --- a/gettext-tools/tests/msgconv-5 +++ b/gettext-tools/tests/msgconv-5 @@ -55,7 +55,7 @@ tmpfiles="$tmpfiles mco-test5.tmp mco-test5.out" : ${MSGCONV=msgconv} ${MSGCONV} --to-code=UTF-8 -o mco-test5.tmp mco-test5.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mco-test5.tmp > mco-test5.out +LC_ALL=C tr -d '\r' < mco-test5.tmp > mco-test5.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mco-test5.ok" diff --git a/gettext-tools/tests/msgconv-6 b/gettext-tools/tests/msgconv-6 index 3982e0c..e6adc65 100755 --- a/gettext-tools/tests/msgconv-6 +++ b/gettext-tools/tests/msgconv-6 @@ -28,7 +28,7 @@ tmpfiles="$tmpfiles mco-test6.tmp mco-test6.out" : ${MSGCONV=msgconv} ${MSGCONV} --to-code=ISO-8859-1 -o mco-test6.tmp mco-test6.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mco-test6.tmp > mco-test6.out +LC_ALL=C tr -d '\r' < mco-test6.tmp > mco-test6.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mco-test6.ok" diff --git a/gettext-tools/tests/msgen-1 b/gettext-tools/tests/msgen-1 index 2f54fe8..fc3983c 100755 --- a/gettext-tools/tests/msgen-1 +++ b/gettext-tools/tests/msgen-1 @@ -33,7 +33,7 @@ tmpfiles="$tmpfiles men-test1.tmp men-test1.out" : ${MSGEN=msgen} ${MSGEN} -o men-test1.tmp men-test1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < men-test1.tmp > men-test1.out +LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out 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 7d51ad3..12525d2 100755 --- a/gettext-tools/tests/msgen-2 +++ b/gettext-tools/tests/msgen-2 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles men-test2.tmp men-test2.out" : ${MSGEN=msgen} ${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < men-test2.tmp > men-test2.out +LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out 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 e1b442c..9ff5fdb 100755 --- a/gettext-tools/tests/msgen-3 +++ b/gettext-tools/tests/msgen-3 @@ -47,7 +47,7 @@ tmpfiles="$tmpfiles men-test3.tmp men-test3.out" : ${MSGEN=msgen} ${MSGEN} -o men-test3.tmp men-test3.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < men-test3.tmp > men-test3.out +LC_ALL=C tr -d '\r' < men-test3.tmp > men-test3.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles men-test3.ok" diff --git a/gettext-tools/tests/msgfilter-sr-latin-1 b/gettext-tools/tests/msgfilter-sr-latin-1 index c98ca61..1a5d5fb 100755 --- a/gettext-tools/tests/msgfilter-sr-latin-1 +++ b/gettext-tools/tests/msgfilter-sr-latin-1 @@ -312,7 +312,7 @@ tmpfiles="$tmpfiles mfi-srl-1.tmp mfi-srl-1.out" : ${MSGFILTER=msgfilter} ${MSGFILTER} -i mfi-srl-1.po -o mfi-srl-1.tmp recode-sr-latin test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out +LC_ALL=C tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mfi-srl-1.ok" diff --git a/gettext-tools/tests/msgfmt-1 b/gettext-tools/tests/msgfmt-1 index a22ee7d..bd2da31 100755 --- a/gettext-tools/tests/msgfmt-1 +++ b/gettext-tools/tests/msgfmt-1 @@ -63,7 +63,7 @@ tmpfiles="$tmpfiles mf-test1.out" : ${GETTEXT=gettext} TEXTDOMAINDIR=.. LANGUAGE=tests \ ${GETTEXT} --env LC_ALL=en gen 'SYS_(C) -' | tr -d '\r' > mf-test1.out +' | LC_ALL=C tr -d '\r' > mf-test1.out tmpfiles="$tmpfiles gtmf-test1.ok" cat <<EOF > gtmf-test1.ok diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10 index e2c93b0..6d1202e 100755 --- a/gettext-tools/tests/msgfmt-10 +++ b/gettext-tools/tests/msgfmt-10 @@ -70,7 +70,7 @@ tmpfiles="$tmpfiles mf-test10.err" : ${MSGFMT=msgfmt} LC_MESSAGES=C LC_ALL= \ ${MSGFMT} --check -o /dev/null mf-test10.po2 \ - 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | tr -d '\r' > mf-test10.err + 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test10.err tmpfiles="$tmpfiles mf-test10.ok" cat << EOF > mf-test10.ok diff --git a/gettext-tools/tests/msgfmt-12 b/gettext-tools/tests/msgfmt-12 index fe763f2..1c2f6fa 100755 --- a/gettext-tools/tests/msgfmt-12 +++ b/gettext-tools/tests/msgfmt-12 @@ -31,7 +31,7 @@ tmpfiles="$tmpfiles mf-12.tmp mf-12.out" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o mf-12.tmp mf-12.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mf-12.tmp > mf-12.out +LC_ALL=C tr -d '\r' < mf-12.tmp > mf-12.out 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 c3a3379..7b7d3d2 100755 --- a/gettext-tools/tests/msgfmt-14 +++ b/gettext-tools/tests/msgfmt-14 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles mf-14.tmp mf-14.out" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o mf-14.tmp mf-14.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mf-14.tmp > mf-14.out +LC_ALL=C tr -d '\r' < mf-14.tmp > mf-14.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mf-14.ok" diff --git a/gettext-tools/tests/msgfmt-16 b/gettext-tools/tests/msgfmt-16 index 0f15177..4404351 100755 --- a/gettext-tools/tests/msgfmt-16 +++ b/gettext-tools/tests/msgfmt-16 @@ -53,7 +53,7 @@ tmpfiles="$tmpfiles mf-16.tmp mf-16.out" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o mf-16.tmp mf-16.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mf-16.tmp > mf-16.out +LC_ALL=C tr -d '\r' < mf-16.tmp > mf-16.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mf-16.ok" diff --git a/gettext-tools/tests/msgfmt-5 b/gettext-tools/tests/msgfmt-5 index d0f87a7..0eee91a 100755 --- a/gettext-tools/tests/msgfmt-5 +++ b/gettext-tools/tests/msgfmt-5 @@ -41,11 +41,11 @@ tmpfiles="$tmpfiles foo-de.tmp foo-de.out foo-fr.tmp foo-fr.out" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o foo-de.tmp foo-de.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < foo-de.tmp > foo-de.out +LC_ALL=C tr -d '\r' < foo-de.tmp > foo-de.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } ${MSGUNFMT} -o foo-fr.tmp foo-fr.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < foo-fr.tmp > foo-fr.out +LC_ALL=C tr -d '\r' < foo-fr.tmp > foo-fr.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles foo-de.ok" diff --git a/gettext-tools/tests/msgfmt-7 b/gettext-tools/tests/msgfmt-7 index a628050..2e78c8f 100755 --- a/gettext-tools/tests/msgfmt-7 +++ b/gettext-tools/tests/msgfmt-7 @@ -30,7 +30,7 @@ tmpfiles="$tmpfiles mf-test7.err" : ${MSGFMT=msgfmt} LC_MESSAGES=C LC_ALL= \ ${MSGFMT} --verbose --check mf-test7.in1 -o /dev/null \ - 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | tr -d '\r' > mf-test7.err + 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test7.err tmpfiles="$tmpfiles mf-test7.ok" cat << EOF > mf-test7.ok diff --git a/gettext-tools/tests/msgfmt-8 b/gettext-tools/tests/msgfmt-8 index 2694f23..d08360e 100755 --- a/gettext-tools/tests/msgfmt-8 +++ b/gettext-tools/tests/msgfmt-8 @@ -30,7 +30,7 @@ tmpfiles="$tmpfiles mf-test8.err" : ${MSGFMT=msgfmt} LC_MESSAGES=C LC_ALL= \ ${MSGFMT} --verbose --check mf-test8.in1 -o /dev/null \ - 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | tr -d '\r' > mf-test8.err + 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test8.err tmpfiles="$tmpfiles mf-test8.ok" cat << EOF > mf-test8.ok diff --git a/gettext-tools/tests/msgfmt-9 b/gettext-tools/tests/msgfmt-9 index 94b2985..ae3aca3 100755 --- a/gettext-tools/tests/msgfmt-9 +++ b/gettext-tools/tests/msgfmt-9 @@ -33,7 +33,7 @@ tmpfiles="$tmpfiles mf-test9.err" : ${MSGFMT=msgfmt} LC_MESSAGES=C LC_ALL= \ ${MSGFMT} --verbose --check mf-test9.in1 -o /dev/null \ - 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | tr -d '\r' > mf-test9.err + 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test9.err tmpfiles="$tmpfiles mf-test9.ok" cat << EOF > mf-test9.ok diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1 index 94657b2..22d899f 100755 --- a/gettext-tools/tests/msgfmt-properties-1 +++ b/gettext-tools/tests/msgfmt-properties-1 @@ -43,7 +43,7 @@ tmpfiles="$tmpfiles mf-test1.out" : ${GETTEXT=gettext} TEXTDOMAINDIR=.. LANGUAGE=tests \ ${GETTEXT} --env LC_ALL=en gen 'SYS_(C) -' | tr -d '\r' > mf-test1.out +' | LC_ALL=C tr -d '\r' > mf-test1.out tmpfiles="$tmpfiles gtmf-test1.ok" cat <<EOF > gtmf-test1.ok diff --git a/gettext-tools/tests/msggrep-1 b/gettext-tools/tests/msggrep-1 index a6b0cba..25b291a 100755 --- a/gettext-tools/tests/msggrep-1 +++ b/gettext-tools/tests/msggrep-1 @@ -159,7 +159,7 @@ tmpfiles="$tmpfiles mg-test1.tmp mg-test1.out" : ${MSGGREP=msggrep} ${MSGGREP} -N pipe-bidi.c -o mg-test1.tmp mg-test1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mg-test1.tmp > mg-test1.out +LC_ALL=C tr -d '\r' < mg-test1.tmp > mg-test1.out 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 fdb4709..51ef181 100755 --- a/gettext-tools/tests/msggrep-2 +++ b/gettext-tools/tests/msggrep-2 @@ -156,7 +156,7 @@ tmpfiles="$tmpfiles mg-test2.tmp mg-test2.out" : ${MSGGREP=msggrep} ${MSGGREP} -M fr -o mg-test2.tmp mg-test2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mg-test2.tmp > mg-test2.out +LC_ALL=C tr -d '\r' < mg-test2.tmp > mg-test2.out 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 ad698b2..83f2e61 100755 --- a/gettext-tools/tests/msggrep-3 +++ b/gettext-tools/tests/msggrep-3 @@ -166,7 +166,7 @@ ${MSGGREP} -K -e error -T -e Speicher -o mg-test3.tmp mg-test3.po >mg-test3.err result=$? cat mg-test3.err | grep -v 'warning: Locale charset' | grep -v '^ ' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mg-test3.tmp > mg-test3.out +LC_ALL=C tr -d '\r' < mg-test3.tmp > mg-test3.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mg-test3.ok" diff --git a/gettext-tools/tests/msggrep-4 b/gettext-tools/tests/msggrep-4 index 65be819..8e92d5f 100755 --- a/gettext-tools/tests/msggrep-4 +++ b/gettext-tools/tests/msggrep-4 @@ -168,7 +168,7 @@ ${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot -o mg-test4.tmp result=$? cat mg-test4.err | grep -v 'warning: Locale charset' | grep -v '^ ' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mg-test4.tmp > mg-test4.out +LC_ALL=C tr -d '\r' < mg-test4.tmp > mg-test4.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mg-test4.ok" diff --git a/gettext-tools/tests/msggrep-5 b/gettext-tools/tests/msggrep-5 index 60e6462..e2583e1 100755 --- a/gettext-tools/tests/msggrep-5 +++ b/gettext-tools/tests/msggrep-5 @@ -174,7 +174,7 @@ ${MSGGREP} -C -e @proofread -o mg-test5.tmp 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; } -tr -d '\r' < mg-test5.tmp > mg-test5.out +LC_ALL=C tr -d '\r' < mg-test5.tmp > mg-test5.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mg-test5.ok" diff --git a/gettext-tools/tests/msggrep-6 b/gettext-tools/tests/msggrep-6 index 7f30d5f..c57b52a 100755 --- a/gettext-tools/tests/msggrep-6 +++ b/gettext-tools/tests/msggrep-6 @@ -120,7 +120,7 @@ LC_MESSAGES=C LC_ALL= \ ${MSGGREP} --properties-input --properties-output -K -e error -T -e Speicher -o mg-test6.tmp mg-test6.properties result=$? test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mg-test6.tmp > mg-test6.out +LC_ALL=C tr -d '\r' < mg-test6.tmp > mg-test6.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mg-test6.ok" diff --git a/gettext-tools/tests/msggrep-7 b/gettext-tools/tests/msggrep-7 index 3e4fb01..2809beb 100755 --- a/gettext-tools/tests/msggrep-7 +++ b/gettext-tools/tests/msggrep-7 @@ -56,7 +56,7 @@ tmpfiles="$tmpfiles mg-test7.tmp mg-test7.out" LC_MESSAGES=C LC_ALL= \ ${MSGGREP} -J -e "File|" -o mg-test7.tmp mg-test7.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mg-test7.tmp > mg-test7.out +LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mg-test7.ok" diff --git a/gettext-tools/tests/msggrep-8 b/gettext-tools/tests/msggrep-8 index d0994c6..adc6cd3 100755 --- a/gettext-tools/tests/msggrep-8 +++ b/gettext-tools/tests/msggrep-8 @@ -42,7 +42,7 @@ ${MSGGREP} -X -e c-form -o mg-test8.tmp mg-test8.po >mg-test8.err 2>&1 result=$? cat mg-test8.err | grep -v 'warning: Locale charset' | grep -v '^ ' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mg-test8.tmp > mg-test8.out +LC_ALL=C tr -d '\r' < mg-test8.tmp > mg-test8.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mg-test8.ok" diff --git a/gettext-tools/tests/msginit-1 b/gettext-tools/tests/msginit-1 index d0cce87..ac96164 100755 --- a/gettext-tools/tests/msginit-1 +++ b/gettext-tools/tests/msginit-1 @@ -44,7 +44,7 @@ tmpfiles="$tmpfiles mi-test1.tmp mi-test1.out mi-test1.err" : ${MSGINIT=msginit} ${MSGINIT} -i mi-test1.pot -l ga_IE --no-translator -o mi-test1.tmp 2>mi-test1.err test $? = 0 || { cat mi-test1.err 1>&2; rm -fr $tmpfiles; exit 1; } -sed -e '1,10d' < mi-test1.tmp | tr -d '\r' > mi-test1.out +sed -e '1,10d' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mi-test1.ok" diff --git a/gettext-tools/tests/msginit-2 b/gettext-tools/tests/msginit-2 index 73303da..63edb6c 100755 --- a/gettext-tools/tests/msginit-2 +++ b/gettext-tools/tests/msginit-2 @@ -68,7 +68,7 @@ tmpfiles="$tmpfiles mi-test2.tmp mi-test2.out mi-test2.err" : ${MSGINIT=msginit} ${MSGINIT} -i mi-test2.pot -l ga_IE --no-translator -o mi-test2.tmp 2>mi-test2.err test $? = 0 || { cat mi-test2.err 1>&2; rm -fr $tmpfiles; exit 1; } -sed -e '1,10d' < mi-test2.tmp | tr -d '\r' > mi-test2.out +sed -e '1,10d' < mi-test2.tmp | LC_ALL=C tr -d '\r' > mi-test2.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mi-test2.ok" diff --git a/gettext-tools/tests/msgmerge-1 b/gettext-tools/tests/msgmerge-1 index 2331eb3..b122928 100755 --- a/gettext-tools/tests/msgmerge-1 +++ b/gettext-tools/tests/msgmerge-1 @@ -42,7 +42,7 @@ tmpfiles="$tmpfiles mm-test1.tmp mm-test1.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test1.tmp mm-test1.in1 mm-test1.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test1.tmp > mm-test1.out +LC_ALL=C tr -d '\r' < mm-test1.tmp > mm-test1.out 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 e1f1ebf..e8ef11f 100755 --- a/gettext-tools/tests/msgmerge-10 +++ b/gettext-tools/tests/msgmerge-10 @@ -58,7 +58,7 @@ tmpfiles="$tmpfiles mm-test10.tmp mm-test10.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test10.tmp mm-test10.po mm-test10.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test10.tmp > mm-test10.out +LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out 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 4cc034a..8902f44 100755 --- a/gettext-tools/tests/msgmerge-11 +++ b/gettext-tools/tests/msgmerge-11 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles mm-test11.tmp mm-test11.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test11.tmp mm-test11.po mm-test11.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test11.tmp > mm-test11.out +LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out 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 39995c4..158a118 100755 --- a/gettext-tools/tests/msgmerge-12 +++ b/gettext-tools/tests/msgmerge-12 @@ -58,7 +58,7 @@ tmpfiles="$tmpfiles mm-test12.tmp mm-test12.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test12.tmp mm-test12.po mm-test12.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test12.tmp > mm-test12.out +LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out 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 292a1f0..dea83f2 100755 --- a/gettext-tools/tests/msgmerge-13 +++ b/gettext-tools/tests/msgmerge-13 @@ -91,7 +91,7 @@ tmpfiles="$tmpfiles mm-test13.tmp mm-test13.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test13.tmp mm-test13.po mm-test13.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test13.tmp > mm-test13.out +LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out 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 ee95c6a..2087a66 100755 --- a/gettext-tools/tests/msgmerge-14 +++ b/gettext-tools/tests/msgmerge-14 @@ -62,7 +62,7 @@ tmpfiles="$tmpfiles mm-test14.tmp mm-test14.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test14.tmp mm-test14-ru.po mm-test14.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test14.tmp > mm-test14.out +LC_ALL=C tr -d '\r' < mm-test14.tmp > mm-test14.out 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 336c9b5..a743e1c 100755 --- a/gettext-tools/tests/msgmerge-15 +++ b/gettext-tools/tests/msgmerge-15 @@ -33,7 +33,7 @@ tmpfiles="$tmpfiles mm-test15.tmp mm-test15.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test15.tmp mm-test15.pot mm-test15.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test15.tmp > mm-test15.out +LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out 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 4bcb6d2..e5e5900 100755 --- a/gettext-tools/tests/msgmerge-16 +++ b/gettext-tools/tests/msgmerge-16 @@ -64,7 +64,7 @@ tmpfiles="$tmpfiles mm-test16.tmp.po mm-test16.new.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test16.tmp.po mm-test16.po mm-test16.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po +LC_ALL=C tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po 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 1864079..bc1bc6d 100755 --- a/gettext-tools/tests/msgmerge-17 +++ b/gettext-tools/tests/msgmerge-17 @@ -58,7 +58,7 @@ tmpfiles="$tmpfiles mm-test17.tmp.po mm-test17.new.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test17.tmp.po mm-test17.po mm-test17.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po +LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po 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 5bc7b93..f5d3813 100755 --- a/gettext-tools/tests/msgmerge-18 +++ b/gettext-tools/tests/msgmerge-18 @@ -124,7 +124,7 @@ tmpfiles="$tmpfiles mm-test18.tmp.po mm-test18.new.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test18.tmp.po mm-test18.po mm-test18.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po +LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-test18.ok" diff --git a/gettext-tools/tests/msgmerge-19 b/gettext-tools/tests/msgmerge-19 index 88b294b..e3e3c27 100755 --- a/gettext-tools/tests/msgmerge-19 +++ b/gettext-tools/tests/msgmerge-19 @@ -84,7 +84,7 @@ tmpfiles="$tmpfiles mm-test19.tmp.po mm-test19.new1.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.po mm-test19.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po +LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-test19.ok1" @@ -174,7 +174,7 @@ tmpfiles="$tmpfiles mm-test19.tmp.po mm-test19.new2.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.new1.po mm-test19.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po +LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-test19.ok2" diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2 index 7e7a926..88d60b3 100755 --- a/gettext-tools/tests/msgmerge-2 +++ b/gettext-tools/tests/msgmerge-2 @@ -22,7 +22,7 @@ tmpfiles="$tmpfiles mm-test2.out" : ${MSGMERGE=msgmerge} LC_MESSAGES=C LC_ALL= \ ${MSGMERGE} -q -o /dev/stdout mm-test2.in1 mm-test2.in2 \ - 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' | tr -d '\r' > mm-test2.out + 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test2.out tmpfiles="$tmpfiles mm-test2.ok" cat << EOF > mm-test2.ok diff --git a/gettext-tools/tests/msgmerge-20 b/gettext-tools/tests/msgmerge-20 index 45545f9..09ce9cf 100755 --- a/gettext-tools/tests/msgmerge-20 +++ b/gettext-tools/tests/msgmerge-20 @@ -79,7 +79,7 @@ tmpfiles="$tmpfiles mm-test20.tmp.po mm-test20.new.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test20.tmp.po mm-test20.po mm-test20.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po +LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-test20.ok" diff --git a/gettext-tools/tests/msgmerge-21 b/gettext-tools/tests/msgmerge-21 index ba53911..ca3544d 100755 --- a/gettext-tools/tests/msgmerge-21 +++ b/gettext-tools/tests/msgmerge-21 @@ -53,7 +53,7 @@ tmpfiles="$tmpfiles mm-test21.tmp.po mm-test21.new.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test21.tmp.po mm-test21.po mm-test21.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po +LC_ALL=C tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-test21.ok" diff --git a/gettext-tools/tests/msgmerge-22 b/gettext-tools/tests/msgmerge-22 index d37afc5..4b60cf8 100644 --- a/gettext-tools/tests/msgmerge-22 +++ b/gettext-tools/tests/msgmerge-22 @@ -51,7 +51,7 @@ tmpfiles="$tmpfiles mm-test22.tmp.po mm-test22.new.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test22.tmp.po mm-test22.po mm-test22.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po +LC_ALL=C tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-test22.ok" diff --git a/gettext-tools/tests/msgmerge-23 b/gettext-tools/tests/msgmerge-23 index eca985f..073270d 100755 --- a/gettext-tools/tests/msgmerge-23 +++ b/gettext-tools/tests/msgmerge-23 @@ -84,7 +84,7 @@ tmpfiles="$tmpfiles mm-test23.tmp.po mm-test23.new.po" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q --previous -o mm-test23.tmp.po mm-test23.po mm-test23.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po +LC_ALL=C tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-test23.ok" diff --git a/gettext-tools/tests/msgmerge-3 b/gettext-tools/tests/msgmerge-3 index e77100f..0f8fd2d 100755 --- a/gettext-tools/tests/msgmerge-3 +++ b/gettext-tools/tests/msgmerge-3 @@ -56,7 +56,7 @@ tmpfiles="$tmpfiles mm-test3.tmp mm-test3.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test3.tmp mm-test3.in1 mm-test3.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test3.tmp > mm-test3.out +LC_ALL=C tr -d '\r' < mm-test3.tmp > mm-test3.out 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 9f076b4..904a4c6 100755 --- a/gettext-tools/tests/msgmerge-4 +++ b/gettext-tools/tests/msgmerge-4 @@ -31,7 +31,7 @@ tmpfiles="$tmpfiles mm-test4.tmp mm-test4.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test4.tmp mm-test4.in1.po mm-test4.in2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test4.tmp > mm-test4.out +LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out 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 12c3736..69886f1 100755 --- a/gettext-tools/tests/msgmerge-5 +++ b/gettext-tools/tests/msgmerge-5 @@ -46,7 +46,7 @@ ${MSGMERGE} -q -o mm-test5.tmp mm-test5.in1.po mm-test5.in2.po >mm-test5.err 2>& result=$? cat mm-test5.err | grep -v 'warning: Charset' | grep -v '^ ' test $result = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test5.tmp > mm-test5.out +LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-test5.ok" diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6 index c6f9e3e..e8ffc71 100755 --- a/gettext-tools/tests/msgmerge-6 +++ b/gettext-tools/tests/msgmerge-6 @@ -61,7 +61,7 @@ tmpfiles="$tmpfiles mm-test6.tmp mm-test6.out" LC_MESSAGES=C LC_ALL= \ ${MSGMERGE} -q -o mm-test6.tmp mm-test6.in1.po mm-test6.in2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test6.tmp > mm-test6.out +LC_ALL=C tr -d '\r' < mm-test6.tmp > mm-test6.out 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 ae3ffff..a64111b 100755 --- a/gettext-tools/tests/msgmerge-7 +++ b/gettext-tools/tests/msgmerge-7 @@ -46,7 +46,7 @@ tmpfiles="$tmpfiles mm-test7.tmp mm-test7.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-test7.tmp mm-test7.po mm-test7.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test7.tmp > mm-test7.out +LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out 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 912e308..9381977 100755 --- a/gettext-tools/tests/msgmerge-8 +++ b/gettext-tools/tests/msgmerge-8 @@ -42,7 +42,7 @@ tmpfiles="$tmpfiles mm-test8.tmp mm-test8.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} --multi-domain -q -o mm-test8.tmp mm-test8.po mm-test8.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-test8.tmp > mm-test8.out +LC_ALL=C tr -d '\r' < mm-test8.tmp > mm-test8.out 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 744c389..9cb66d2 100755 --- a/gettext-tools/tests/msgmerge-9 +++ b/gettext-tools/tests/msgmerge-9 @@ -25,7 +25,7 @@ tmpfiles="$tmpfiles mm-test9.err" : ${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|' | tr -d '\r' > mm-test9.err + 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgmerge\.exe|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test9.err tmpfiles="$tmpfiles mm-test9.ok" cat << EOF > mm-test9.ok diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1 index b695529..c8f3dbb 100755 --- a/gettext-tools/tests/msgmerge-compendium-1 +++ b/gettext-tools/tests/msgmerge-compendium-1 @@ -32,7 +32,7 @@ tmpfiles="$tmpfiles mm-c-1.tmp mm-c-1.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.tmp mm-c-1.in1 mm-c-1.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-1.tmp > mm-c-1.out +LC_ALL=C tr -d '\r' < mm-c-1.tmp > mm-c-1.out 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 65ad975..3613d0a 100755 --- a/gettext-tools/tests/msgmerge-compendium-2 +++ b/gettext-tools/tests/msgmerge-compendium-2 @@ -32,7 +32,7 @@ tmpfiles="$tmpfiles mm-c-2.tmp mm-c-2.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.tmp mm-c-2.in1 mm-c-2.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-2.tmp > mm-c-2.out +LC_ALL=C tr -d '\r' < mm-c-2.tmp > mm-c-2.out 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 0660213..743633c 100755 --- a/gettext-tools/tests/msgmerge-compendium-3 +++ b/gettext-tools/tests/msgmerge-compendium-3 @@ -40,7 +40,7 @@ tmpfiles="$tmpfiles mm-c-3.tmp mm-c-3.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.tmp mm-c-3.in1 mm-c-3.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-3.tmp > mm-c-3.out +LC_ALL=C tr -d '\r' < mm-c-3.tmp > mm-c-3.out 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 307876a..42b8546 100755 --- a/gettext-tools/tests/msgmerge-compendium-4 +++ b/gettext-tools/tests/msgmerge-compendium-4 @@ -33,7 +33,7 @@ tmpfiles="$tmpfiles mm-c-4.tmp mm-c-4.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.tmp /dev/null mm-c-4.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-4.tmp > mm-c-4.out +LC_ALL=C tr -d '\r' < mm-c-4.tmp > mm-c-4.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-4.ok" diff --git a/gettext-tools/tests/msgmerge-compendium-5 b/gettext-tools/tests/msgmerge-compendium-5 index 7bf8666..4e7327a 100755 --- a/gettext-tools/tests/msgmerge-compendium-5 +++ b/gettext-tools/tests/msgmerge-compendium-5 @@ -11,7 +11,7 @@ ${MSGMERGE} -q -o mm-c-5.tmp \ --compendium ${top_srcdir}/tests/mm-viet.comp.po \ /dev/null ${top_srcdir}/tests/mm-viet.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-5.tmp > mm-c-5.out +LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6 index d7324c9..89f3833 100755 --- a/gettext-tools/tests/msgmerge-compendium-6 +++ b/gettext-tools/tests/msgmerge-compendium-6 @@ -27,7 +27,7 @@ ${MSGMERGE} -q -o mm-c-6-AEE.tmp \ --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \ ${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out +LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-AEU.tmp mm-c-6-AEU.out" @@ -36,7 +36,7 @@ ${MSGMERGE} -q -o mm-c-6-AEU.tmp \ --compendium mm-ko-comp.utf-8.po \ ${top_srcdir}/tests/mm-ko.euc-kr.po ${top_srcdir}/tests/mm-ko.ascii.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out +LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-AUE.tmp mm-c-6-AUE.out" @@ -45,7 +45,7 @@ ${MSGMERGE} -q -o mm-c-6-AUE.tmp \ --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \ mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out +LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-AUU.tmp mm-c-6-AUU.out" @@ -54,7 +54,7 @@ ${MSGMERGE} -q -o mm-c-6-AUU.tmp \ --compendium mm-ko-comp.utf-8.po \ mm-ko.utf-8.po ${top_srcdir}/tests/mm-ko.ascii.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out +LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-UEE.tmp mm-c-6-UEE.out" @@ -63,7 +63,7 @@ ${MSGMERGE} -q -o mm-c-6-UEE.tmp \ --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \ ${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out +LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-UEU.tmp mm-c-6-UEU.out" @@ -72,7 +72,7 @@ ${MSGMERGE} -q -o mm-c-6-UEU.tmp \ --compendium mm-ko-comp.utf-8.po \ ${top_srcdir}/tests/mm-ko.euc-kr.po mm-ko.utf-8.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out +LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-UUE.tmp mm-c-6-UUE.out" @@ -81,7 +81,7 @@ ${MSGMERGE} -q -o mm-c-6-UUE.tmp \ --compendium ${top_srcdir}/tests/mm-ko-comp.euc-kr.po \ mm-ko.utf-8.po mm-ko.utf-8.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out +LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-UUU.tmp mm-c-6-UUU.out" @@ -90,13 +90,13 @@ ${MSGMERGE} -q -o mm-c-6-UUU.tmp \ --compendium mm-ko-comp.utf-8.po \ mm-ko.utf-8.po mm-ko.utf-8.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out +LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-c-6-U.ok mm-c-6-E.ok" : ${MSGCONV=msgconv} -${MSGCONV} --to-code=UTF-8 mm-c-6-UUU.out | tr -d '\r' > mm-c-6-U.ok -${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | sed -e 's,EUC-KR,euc-kr,' | tr -d '\r' > mm-c-6-E.ok +${MSGCONV} --to-code=UTF-8 mm-c-6-UUU.out | LC_ALL=C tr -d '\r' > mm-c-6-U.ok +${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | sed -e 's,EUC-KR,euc-kr,' | LC_ALL=C tr -d '\r' > mm-c-6-E.ok : ${DIFF=diff} ${DIFF} mm-c-6-E.ok mm-c-6-AEE.out || { rm -fr $tmpfiles; exit 1; } diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1 index 874e489..eb329c2 100755 --- a/gettext-tools/tests/msgmerge-properties-1 +++ b/gettext-tools/tests/msgmerge-properties-1 @@ -41,7 +41,7 @@ tmpfiles="$tmpfiles mm-p-1.tmp mm-p-1.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.tmp mm-p-1.in1 mm-p-1.in2 test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-p-1.tmp > mm-p-1.out +LC_ALL=C tr -d '\r' < mm-p-1.tmp > mm-p-1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-p-1.ok" diff --git a/gettext-tools/tests/msgmerge-properties-2 b/gettext-tools/tests/msgmerge-properties-2 index 7c38e18..37d2db6 100755 --- a/gettext-tools/tests/msgmerge-properties-2 +++ b/gettext-tools/tests/msgmerge-properties-2 @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles mm-p-2.po~ mm-p-2.tmp" ${MSGMERGE} -q --properties-input --update mm-p-2.po mm-p-2.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } mv mm-p-2.po mm-p-2.tmp || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-p-2.tmp > mm-p-2.po +LC_ALL=C tr -d '\r' < mm-p-2.tmp > mm-p-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-p-2.ok" diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2 index 0174032..6f4d4a0 100755 --- a/gettext-tools/tests/msgmerge-update-2 +++ b/gettext-tools/tests/msgmerge-update-2 @@ -57,7 +57,7 @@ tmpfiles="$tmpfiles mm-u-2.po~ mm-u-2.tmp" ${MSGMERGE} -q --update mm-u-2.po mm-u-2.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } mv mm-u-2.po mm-u-2.tmp || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mm-u-2.tmp > mm-u-2.po +LC_ALL=C tr -d '\r' < mm-u-2.tmp > mm-u-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mm-u-2.ok" diff --git a/gettext-tools/tests/msgunfmt-1 b/gettext-tools/tests/msgunfmt-1 index 5a11b45..5cce275 100755 --- a/gettext-tools/tests/msgunfmt-1 +++ b/gettext-tools/tests/msgunfmt-1 @@ -41,7 +41,7 @@ tmpfiles="$tmpfiles mu-test1.tmp mu-test1.out" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o mu-test1.tmp mu-test1.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mu-test1.tmp > mu-test1.out +LC_ALL=C tr -d '\r' < mu-test1.tmp > mu-test1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msgunfmt-2 b/gettext-tools/tests/msgunfmt-2 index f8d9315..39f959b 100755 --- a/gettext-tools/tests/msgunfmt-2 +++ b/gettext-tools/tests/msgunfmt-2 @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles mu-2.tmp mu-2.out" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o mu-2.tmp mu-2.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mu-2.tmp > mu-2.out +LC_ALL=C tr -d '\r' < mu-2.tmp > mu-2.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1 index 6d4c217..7af68bc 100755 --- a/gettext-tools/tests/msgunfmt-properties-1 +++ b/gettext-tools/tests/msgunfmt-properties-1 @@ -33,7 +33,7 @@ tmpfiles="$tmpfiles mu-p-1.tmp mu-p-1.out" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} --properties-output -o mu-p-1.tmp mu-p-1.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < mu-p-1.tmp > mu-p-1.out +LC_ALL=C tr -d '\r' < mu-p-1.tmp > mu-p-1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1 index 7157f34..e137d51 100755 --- a/gettext-tools/tests/msguniq-1 +++ b/gettext-tools/tests/msguniq-1 @@ -9,7 +9,7 @@ tmpfiles="$tmpfiles msguniq-1.tmp msguniq-1.out" : ${MSGUNIQ-msguniq} ${MSGUNIQ} -w 1000 -o msguniq-1.tmp ${top_srcdir}/tests/msguniq-a.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < msguniq-1.tmp > msguniq-1.out +LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2 index d9171e6..d8c6a99 100755 --- a/gettext-tools/tests/msguniq-2 +++ b/gettext-tools/tests/msguniq-2 @@ -9,7 +9,7 @@ tmpfiles="$tmpfiles msguniq-2.tmp msguniq-2.out" : ${MSGUNIQ-msguniq} ${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp ${top_srcdir}/tests/msguniq-a.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < msguniq-2.tmp > msguniq-2.out +LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out 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 4ea6300..dcd5ee8 100755 --- a/gettext-tools/tests/msguniq-3 +++ b/gettext-tools/tests/msguniq-3 @@ -9,7 +9,7 @@ tmpfiles="$tmpfiles msguniq-3.tmp msguniq-3.out" : ${MSGUNIQ-msguniq} ${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp ${top_srcdir}/tests/msguniq-a.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < msguniq-3.tmp > msguniq-3.out +LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles msguniq-3.ok" diff --git a/gettext-tools/tests/msguniq-5 b/gettext-tools/tests/msguniq-5 index 05dcaaa..3e784e1 100755 --- a/gettext-tools/tests/msguniq-5 +++ b/gettext-tools/tests/msguniq-5 @@ -60,7 +60,7 @@ tmpfiles="$tmpfiles msguniq-5.tmp msguniq-5.out" : ${MSGUNIQ-msguniq} ${MSGUNIQ} -o msguniq-5.tmp msguniq-5.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < msguniq-5.tmp > msguniq-5.out +LC_ALL=C tr -d '\r' < msguniq-5.tmp > msguniq-5.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles msguniq-5.ok" diff --git a/gettext-tools/tests/msguniq-6 b/gettext-tools/tests/msguniq-6 index 399668f..c9ded37 100755 --- a/gettext-tools/tests/msguniq-6 +++ b/gettext-tools/tests/msguniq-6 @@ -73,7 +73,7 @@ tmpfiles="$tmpfiles msguniq-6.tmp msguniq-6.out" : ${MSGUNIQ=msguniq} ${MSGUNIQ} -o msguniq-6.tmp msguniq-6.in test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < msguniq-6.tmp > msguniq-6.out +LC_ALL=C tr -d '\r' < msguniq-6.tmp > msguniq-6.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles msguniq-6.ok" diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1 index f62807c..e3b9428 100755 --- a/gettext-tools/tests/plural-1 +++ b/gettext-tools/tests/plural-1 @@ -7,7 +7,7 @@ tmpfiles="$tmpfiles cake.tmp cake.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o cake.tmp --omit-header --no-location ${top_srcdir}/tests/plural-1-prg.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < cake.tmp > cake.pot +LC_ALL=C tr -d '\r' < cake.tmp > cake.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles cake.ok" @@ -36,7 +36,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.new" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o fr.po.tmp fr.po cake.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.new +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} @@ -53,7 +53,7 @@ tmpfiles="$tmpfiles fr.po.tmp fr.po.un" : ${MSGUNFMT=msgunfmt} ${MSGUNFMT} -o fr.po.tmp fr/LC_MESSAGES/cake.mo test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < fr.po.tmp > fr.po.un +LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.un test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles fr.po.strip" @@ -66,15 +66,15 @@ tmpfiles="$tmpfiles cake.ok cake.tmp cake.out" : ${DIFF=diff} echo 'un morceau de gateau' > cake.ok LANGUAGE= ./cake fr 1 > cake.tmp || exit 1 -tr -d '\r' < cake.tmp > cake.out || exit 1 +LC_ALL=C tr -d '\r' < cake.tmp > cake.out || exit 1 ${DIFF} cake.ok cake.out || exit 1 echo '2 morceaux de gateau' > cake.ok LANGUAGE= ./cake fr 2 > cake.tmp || exit 1 -tr -d '\r' < cake.tmp > cake.out || exit 1 +LC_ALL=C tr -d '\r' < cake.tmp > cake.out || exit 1 ${DIFF} cake.ok cake.out || exit 1 echo '10 morceaux de gateau' > cake.ok LANGUAGE= ./cake fr 10 > cake.tmp || exit 1 -tr -d '\r' < cake.tmp > cake.out || exit 1 +LC_ALL=C tr -d '\r' < cake.tmp > cake.out || exit 1 ${DIFF} cake.ok cake.out || exit 1 rm -fr $tmpfiles diff --git a/gettext-tools/tests/xg-c-1.ok.po b/gettext-tools/tests/xg-c-1.ok.po index 5e27a9c..07486ec 100644 --- a/gettext-tools/tests/xg-c-1.ok.po +++ b/gettext-tools/tests/xg-c-1.ok.po @@ -346,8 +346,8 @@ msgstr "" #, c-format msgid "" -"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %" -"s" +"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: " +"%s" msgstr "" msgid "standard input" @@ -375,8 +375,8 @@ msgstr "" #, c-format msgid "" -"Although declared as such, the %s is not a valid %s format string. Reason: %" -"s\n" +"Although declared as such, the %s is not a valid %s format string. Reason: " +"%s\n" msgstr "" #, c-format diff --git a/gettext-tools/tests/xgettext-2 b/gettext-tools/tests/xgettext-2 index 10ed3b2..5e50b50 100755 --- a/gettext-tools/tests/xgettext-2 +++ b/gettext-tools/tests/xgettext-2 @@ -28,7 +28,7 @@ tmpfiles="$tmpfiles xg-test2.tmp.po xg-test2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} -d xg-test2.tmp -k_ --omit-header --no-location xg-test2.in.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-test2.tmp.po > xg-test2.po +LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-test2.ok" diff --git a/gettext-tools/tests/xgettext-3 b/gettext-tools/tests/xgettext-3 index 81ecdcb..9e1fb31 100755 --- a/gettext-tools/tests/xgettext-3 +++ b/gettext-tools/tests/xgettext-3 @@ -28,7 +28,7 @@ tmpfiles="$tmpfiles xg-test3.po" : ${XGETTEXT=xgettext} # delete POT-Creation-Date: line because the date depends on local time. ${XGETTEXT} --output - --no-location -k_ xg-test3.in.c 2>/dev/null \ - | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-test3.po + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-test3.po tmpfiles="$tmpfiles xg-test3.ok" cat <<EOF > xg-test3.ok diff --git a/gettext-tools/tests/xgettext-4 b/gettext-tools/tests/xgettext-4 index 21b14ba..f648666 100755 --- a/gettext-tools/tests/xgettext-4 +++ b/gettext-tools/tests/xgettext-4 @@ -14,7 +14,7 @@ tmpfiles="$tmpfiles xg-test4.po" : ${XGETTEXT=xgettext} # delete POT-Creation-Date: line because the date depends on local time. ${XGETTEXT} --output - --foreign-user --no-location -k_ xg-test4.in.c \ - | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-test4.po + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-test4.po tmpfiles="$tmpfiles xg-test4.ok" cat <<EOF > xg-test4.ok diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5 index ef03180..c654612 100755 --- a/gettext-tools/tests/xgettext-5 +++ b/gettext-tools/tests/xgettext-5 @@ -20,7 +20,7 @@ ${XGETTEXT} --no-location -k_ -o xg-test5.po xg-test5.c 2>/dev/null test $? = 1 || { rm -fr $tmpfiles; exit 1; } ${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.tmp xg-test5.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-test5.tmp > xg-test5.po +LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-test5.pot" diff --git a/gettext-tools/tests/xgettext-6 b/gettext-tools/tests/xgettext-6 index a9f581b..d0997b5 100755 --- a/gettext-tools/tests/xgettext-6 +++ b/gettext-tools/tests/xgettext-6 @@ -95,7 +95,7 @@ ${XGETTEXT} --omit-header --no-location -d xg-test6.tmp \ xg-test6.jl xg-test6.java xg-test6.awk xg-test6.ycp xg-test6.tcl \ xg-test6.pl xg-test6.php test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-test6.tmp.po > xg-test6.po +LC_ALL=C tr -d '\r' < xg-test6.tmp.po > xg-test6.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-test6.ok" diff --git a/gettext-tools/tests/xgettext-7 b/gettext-tools/tests/xgettext-7 index 4113edd..3eddc1b 100755 --- a/gettext-tools/tests/xgettext-7 +++ b/gettext-tools/tests/xgettext-7 @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles xg-test7.tmp.po xg-test7.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-test7.tmp.po > xg-test7.po +LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-test7.ok" diff --git a/gettext-tools/tests/xgettext-8 b/gettext-tools/tests/xgettext-8 index adc2925..10a4f10 100755 --- a/gettext-tools/tests/xgettext-8 +++ b/gettext-tools/tests/xgettext-8 @@ -40,7 +40,7 @@ ${XGETTEXT} -a -j -o xg-test8.po xg-test8.in.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-test8.pot" -sed -e '/POT-Creation-Date/d' < xg-test8.po | tr -d '\r' > xg-test8.pot +sed -e '/POT-Creation-Date/d' < xg-test8.po | LC_ALL=C tr -d '\r' > xg-test8.pot tmpfiles="$tmpfiles xg-test8.ok" cat <<\EOF > xg-test8.ok diff --git a/gettext-tools/tests/xgettext-9 b/gettext-tools/tests/xgettext-9 index 524215e..75d3576 100755 --- a/gettext-tools/tests/xgettext-9 +++ b/gettext-tools/tests/xgettext-9 @@ -29,7 +29,7 @@ ${XGETTEXT} --omit-header \ --keyword=title:1,\"xhtml-format\",\"xml-format\" \ -d xg-test9.tmp xg-test9.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-test9.tmp.po > xg-test9.po +LC_ALL=C tr -d '\r' < xg-test9.tmp.po > xg-test9.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-test9.ok" diff --git a/gettext-tools/tests/xgettext-awk-1 b/gettext-tools/tests/xgettext-awk-1 index ef46fe4..7d3f954 100755 --- a/gettext-tools/tests/xgettext-awk-1 +++ b/gettext-tools/tests/xgettext-awk-1 @@ -23,7 +23,7 @@ tmpfiles="$tmpfiles xg-a-1.tmp.po xg-a-1.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-a-1.tmp xg-a-1.awk test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po +LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-a-1.ok" diff --git a/gettext-tools/tests/xgettext-awk-2 b/gettext-tools/tests/xgettext-awk-2 index eb2ad1c..5ff65dc 100755 --- a/gettext-tools/tests/xgettext-awk-2 +++ b/gettext-tools/tests/xgettext-awk-2 @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-a-2.tmp.po xg-a-2.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-a-2.tmp xg-a-2.awk test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po +LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-a-2.ok" diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1 index f1a7e41..58bb193 100755 --- a/gettext-tools/tests/xgettext-c-1 +++ b/gettext-tools/tests/xgettext-c-1 @@ -12,7 +12,7 @@ tmpfiles="$tmpfiles xg-c-1.tmp.po xg-c-1.po" ${XGETTEXT} -d xg-c-1.tmp -k_ --omit-header --no-location \ $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po +LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${DIFF=diff} diff --git a/gettext-tools/tests/xgettext-c-10 b/gettext-tools/tests/xgettext-c-10 index d21ae99..bf6fdda 100755 --- a/gettext-tools/tests/xgettext-c-10 +++ b/gettext-tools/tests/xgettext-c-10 @@ -22,7 +22,7 @@ ${XGETTEXT} --omit-header --no-location \ --keyword=i18n:1 --keyword=i18n:1c,2 --keyword=tr:1 --keyword=tr:1,2c \ -d xg-c-10.tmp xg-c-10.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po +LC_ALL=C tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po 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 b1ff28b..1dd854f 100755 --- a/gettext-tools/tests/xgettext-c-11 +++ b/gettext-tools/tests/xgettext-c-11 @@ -22,7 +22,7 @@ ${XGETTEXT} --omit-header --no-location \ --keyword=i18n:1 --keyword=i18n:1c,2,2t --keyword=i18n:1,2,3t \ -d xg-c-11.tmp xg-c-11.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po +LC_ALL=C tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-11.ok" diff --git a/gettext-tools/tests/xgettext-c-12 b/gettext-tools/tests/xgettext-c-12 index 696eaee..b138dcb 100755 --- a/gettext-tools/tests/xgettext-c-12 +++ b/gettext-tools/tests/xgettext-c-12 @@ -15,7 +15,7 @@ tmpfiles="$tmpfiles xg-c-12.tmp.po xg-c-12.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-c-12.tmp xg-c-12.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po +LC_ALL=C tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-12.ok" diff --git a/gettext-tools/tests/xgettext-c-13 b/gettext-tools/tests/xgettext-c-13 index 805b246..2db0a74 100755 --- a/gettext-tools/tests/xgettext-c-13 +++ b/gettext-tools/tests/xgettext-c-13 @@ -16,7 +16,7 @@ ${XGETTEXT} --omit-header --no-location -d xg-c-13.tmp \ --flag=foo:1:qt-format --flag=gettext:1:pass-qt-format --qt \ xg-c-13.cc test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po +LC_ALL=C tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-13.ok" diff --git a/gettext-tools/tests/xgettext-c-14 b/gettext-tools/tests/xgettext-c-14 index 485a471..8368ece 100755 --- a/gettext-tools/tests/xgettext-c-14 +++ b/gettext-tools/tests/xgettext-c-14 @@ -23,7 +23,7 @@ tmpfiles="$tmpfiles xg-c-14.tmp.po xg-c-14.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-c-14.tmp --boost xg-c-14.cc test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po +LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } # The first 4 are not marked as c-format, because they are known as diff --git a/gettext-tools/tests/xgettext-c-15 b/gettext-tools/tests/xgettext-c-15 index a8d874e..5cf9252 100755 --- a/gettext-tools/tests/xgettext-c-15 +++ b/gettext-tools/tests/xgettext-c-15 @@ -19,7 +19,7 @@ ${XGETTEXT} --omit-header --no-location \ --keyword=Q_:1g --keyword=Q_:1g,2g \ -d xg-c-15.tmp xg-c-15.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po +LC_ALL=C tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-15.ok" diff --git a/gettext-tools/tests/xgettext-c-16 b/gettext-tools/tests/xgettext-c-16 index e103e19..801ff49 100755 --- a/gettext-tools/tests/xgettext-c-16 +++ b/gettext-tools/tests/xgettext-c-16 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-c-16.tmp.po xg-c-16.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-c-16.tmp xg-c-16.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po +LC_ALL=C tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-16.ok" diff --git a/gettext-tools/tests/xgettext-c-17 b/gettext-tools/tests/xgettext-c-17 index 011c778..7cae3df 100755 --- a/gettext-tools/tests/xgettext-c-17 +++ b/gettext-tools/tests/xgettext-c-17 @@ -22,7 +22,7 @@ tmpfiles="$tmpfiles xg-c-17.tmp.po xg-c-17.po" ${XGETTEXT} --omit-header --no-location -d xg-c-17.tmp --language=C++ --kde \ xg-c-17.cc test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po +LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-17.ok" diff --git a/gettext-tools/tests/xgettext-c-2 b/gettext-tools/tests/xgettext-c-2 index 53adfc6..2c07dc8 100755 --- a/gettext-tools/tests/xgettext-c-2 +++ b/gettext-tools/tests/xgettext-c-2 @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles xg-c-2.tmp.po xg-c-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} -d xg-c-2.tmp -k_ --omit-header --no-location xg-c-2.in.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po +LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-2.ok" diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3 index bc6d69a..6cf1d84 100755 --- a/gettext-tools/tests/xgettext-c-3 +++ b/gettext-tools/tests/xgettext-c-3 @@ -17,7 +17,7 @@ tmpfiles="$tmpfiles xg-c-3.tmp.po xg-c-3.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --add-location -d xg-c-3.tmp xg-c-3.in.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po +LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po 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 290fb32..e5520dd 100755 --- a/gettext-tools/tests/xgettext-c-4 +++ b/gettext-tools/tests/xgettext-c-4 @@ -14,7 +14,7 @@ tmpfiles="$tmpfiles xg-c-4.tmp.po xg-c-4.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4.tmp xg-c-4.in.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po +LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po 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 c5106c4..a0bb798 100755 --- a/gettext-tools/tests/xgettext-c-5 +++ b/gettext-tools/tests/xgettext-c-5 @@ -14,7 +14,7 @@ tmpfiles="$tmpfiles xg-c-5.tmp.po xg-c-5.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5.tmp xg-c-5.in.cc test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po +LC_ALL=C tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po 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 6c4acb9..050dde3 100755 --- a/gettext-tools/tests/xgettext-c-6 +++ b/gettext-tools/tests/xgettext-c-6 @@ -25,7 +25,7 @@ tmpfiles="$tmpfiles xg-c-6.tmp.po xg-c-6.po" ${XGETTEXT} --omit-header --no-location --add-comments=XXX \ -d xg-c-6.tmp xg-c-6.in.C test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po +LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-6.ok" diff --git a/gettext-tools/tests/xgettext-c-7 b/gettext-tools/tests/xgettext-c-7 index d8d3611..8264f0f 100755 --- a/gettext-tools/tests/xgettext-c-7 +++ b/gettext-tools/tests/xgettext-c-7 @@ -44,7 +44,7 @@ tmpfiles="$tmpfiles xg-c-7.tmp.po xg-c-7.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7.tmp xg-c-7.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po +LC_ALL=C tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-7.ok" diff --git a/gettext-tools/tests/xgettext-c-8 b/gettext-tools/tests/xgettext-c-8 index 191002f..1a085ba 100755 --- a/gettext-tools/tests/xgettext-c-8 +++ b/gettext-tools/tests/xgettext-c-8 @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-c-8.tmp xg-c-8.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.tmp xg-c-8.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-8.tmp > xg-c-8.po +LC_ALL=C tr -d '\r' < xg-c-8.tmp > xg-c-8.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-8.ok" diff --git a/gettext-tools/tests/xgettext-c-9 b/gettext-tools/tests/xgettext-c-9 index bef34aa..242df17 100755 --- a/gettext-tools/tests/xgettext-c-9 +++ b/gettext-tools/tests/xgettext-c-9 @@ -28,7 +28,7 @@ tmpfiles="$tmpfiles xg-c-9.tmp.po xg-c-9.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-c-9.tmp xg-c-9.c test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po +LC_ALL=C tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-c-9.ok" diff --git a/gettext-tools/tests/xgettext-csharp-1 b/gettext-tools/tests/xgettext-csharp-1 index bed1b73..9f35c93 100755 --- a/gettext-tools/tests/xgettext-csharp-1 +++ b/gettext-tools/tests/xgettext-csharp-1 @@ -33,7 +33,7 @@ tmpfiles="$tmpfiles xg-cs-1.tmp.po xg-cs-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -c -d xg-cs-1.tmp xg-cs-1.cs test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po +LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-cs-1.ok" diff --git a/gettext-tools/tests/xgettext-csharp-2 b/gettext-tools/tests/xgettext-csharp-2 index d608c73..c5c0f56 100755 --- a/gettext-tools/tests/xgettext-csharp-2 +++ b/gettext-tools/tests/xgettext-csharp-2 @@ -29,7 +29,7 @@ tmpfiles="$tmpfiles xg-cs-2.po" : ${XGETTEXT=xgettext} # delete POT-Creation-Date: line because the date depends on local time. ${XGETTEXT} --output - --add-location -c --from-code=UTF-8 xg-cs-2.cs \ - | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-cs-2.po + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-cs-2.ok" diff --git a/gettext-tools/tests/xgettext-csharp-3 b/gettext-tools/tests/xgettext-csharp-3 index c231b1c..c7d2878 100755 --- a/gettext-tools/tests/xgettext-csharp-3 +++ b/gettext-tools/tests/xgettext-csharp-3 @@ -6,7 +6,7 @@ tmpfiles="" trap 'rm -fr $tmpfiles' 1 2 3 15 tmpfiles="$tmpfiles xg-cs-3.cs" -tr '%' '\015' <<\EOF > xg-cs-3.cs +LC_ALL=C tr '%' '\015' <<\EOF > xg-cs-3.cs class TestCase { public static void Main (String[] args) { // Test recognition of \u escapes. @@ -55,7 +55,7 @@ tmpfiles="$tmpfiles xg-cs-3.po" : ${XGETTEXT=xgettext} # delete POT-Creation-Date: line because the date depends on local time. ${XGETTEXT} --output - --add-location -c -kMyGetString:2 xg-cs-3.cs 2>/dev/null \ - | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-cs-3.po + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-cs-3.ok" diff --git a/gettext-tools/tests/xgettext-csharp-4 b/gettext-tools/tests/xgettext-csharp-4 index 2a03a6a..4a32acc 100755 --- a/gettext-tools/tests/xgettext-csharp-4 +++ b/gettext-tools/tests/xgettext-csharp-4 @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-cs-4.tmp.po xg-cs-4.po" ${XGETTEXT} --omit-header --no-location --keyword=MyPluralString:2,3 \ -d xg-cs-4.tmp xg-cs-4.cs test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po +LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-cs-4.ok" diff --git a/gettext-tools/tests/xgettext-csharp-5 b/gettext-tools/tests/xgettext-csharp-5 index 42806f1..0b0ba3a 100755 --- a/gettext-tools/tests/xgettext-csharp-5 +++ b/gettext-tools/tests/xgettext-csharp-5 @@ -28,7 +28,7 @@ tmpfiles="$tmpfiles xg-cs-5.tmp.po xg-cs-5.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-cs-5.tmp xg-cs-5.cs test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po +LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-cs-5.ok" diff --git a/gettext-tools/tests/xgettext-csharp-6 b/gettext-tools/tests/xgettext-csharp-6 index fa700ea..7a30708 100755 --- a/gettext-tools/tests/xgettext-csharp-6 +++ b/gettext-tools/tests/xgettext-csharp-6 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-cs-6.tmp.po xg-cs-6.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-cs-6.tmp xg-cs-6.cs test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po +LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-cs-6.ok" diff --git a/gettext-tools/tests/xgettext-csharp-7 b/gettext-tools/tests/xgettext-csharp-7 index 8c7629a..ac871fd 100755 --- a/gettext-tools/tests/xgettext-csharp-7 +++ b/gettext-tools/tests/xgettext-csharp-7 @@ -15,7 +15,7 @@ tmpfiles="$tmpfiles xg-cs-7.tmp.po xg-cs-7.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-cs-7.tmp xg-cs-7.cs test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po +LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-cs-7.ok" diff --git a/gettext-tools/tests/xgettext-elisp-1 b/gettext-tools/tests/xgettext-elisp-1 index 317cd70..e008619 100755 --- a/gettext-tools/tests/xgettext-elisp-1 +++ b/gettext-tools/tests/xgettext-elisp-1 @@ -23,7 +23,7 @@ tmpfiles="$tmpfiles xg-el-1.tmp.po xg-el-1.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-el-1.tmp xg-el-1.el test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po +LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-el-1.ok" diff --git a/gettext-tools/tests/xgettext-elisp-2 b/gettext-tools/tests/xgettext-elisp-2 index 8d4e99c..85d1395 100755 --- a/gettext-tools/tests/xgettext-elisp-2 +++ b/gettext-tools/tests/xgettext-elisp-2 @@ -21,7 +21,7 @@ tmpfiles="$tmpfiles xg-el-2.tmp.po xg-el-2.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-el-2.tmp xg-el-2.el test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po +LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-el-2.ok" diff --git a/gettext-tools/tests/xgettext-java-1 b/gettext-tools/tests/xgettext-java-1 index 8ce86e4..62e1de1 100755 --- a/gettext-tools/tests/xgettext-java-1 +++ b/gettext-tools/tests/xgettext-java-1 @@ -35,7 +35,7 @@ tmpfiles="$tmpfiles xg-j-1.tmp.po xg-j-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -c -d xg-j-1.tmp xg-j-1.java test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po +LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-j-1.ok" diff --git a/gettext-tools/tests/xgettext-java-2 b/gettext-tools/tests/xgettext-java-2 index 165e33d..bdf0444 100755 --- a/gettext-tools/tests/xgettext-java-2 +++ b/gettext-tools/tests/xgettext-java-2 @@ -64,7 +64,7 @@ ${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null test $? = 0 || { rm -fr $tmpfiles; exit 1; } # Don't simplify this to "grep ... < xg-j-2.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". -cat xg-j-2.tmp | grep -v 'POT-Creation-Date' | tr -d '\r' > xg-j-2.pot +cat xg-j-2.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-j-2.pot tmpfiles="$tmpfiles xg-j-2.ok" cat <<\EOF > xg-j-2.ok diff --git a/gettext-tools/tests/xgettext-java-3 b/gettext-tools/tests/xgettext-java-3 index 1d1a543..61356dd 100755 --- a/gettext-tools/tests/xgettext-java-3 +++ b/gettext-tools/tests/xgettext-java-3 @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-j-3.tmp.po xg-j-3.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-j-3.tmp xg-j-3.java test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po +LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-j-3.ok" diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4 index 931cbff..b336766 100755 --- a/gettext-tools/tests/xgettext-java-4 +++ b/gettext-tools/tests/xgettext-java-4 @@ -21,7 +21,7 @@ tmpfiles="$tmpfiles xg-j-4.tmp.po xg-j-4.po" ${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 \ -d xg-j-4.tmp xg-j-4.java test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po +LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-j-4.ok" diff --git a/gettext-tools/tests/xgettext-java-5 b/gettext-tools/tests/xgettext-java-5 index 80382df..09f3be9 100755 --- a/gettext-tools/tests/xgettext-java-5 +++ b/gettext-tools/tests/xgettext-java-5 @@ -28,7 +28,7 @@ tmpfiles="$tmpfiles xg-j-5.tmp.po xg-j-5.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-j-5.tmp xg-j-5.java test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po +LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-j-5.ok" diff --git a/gettext-tools/tests/xgettext-java-6 b/gettext-tools/tests/xgettext-java-6 index 32850cb..862fc47 100755 --- a/gettext-tools/tests/xgettext-java-6 +++ b/gettext-tools/tests/xgettext-java-6 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-j-6.tmp.po xg-j-6.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-j-6.tmp xg-j-6.java test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po +LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-j-6.ok" diff --git a/gettext-tools/tests/xgettext-java-7 b/gettext-tools/tests/xgettext-java-7 index d3eac74..caa2b93 100755 --- a/gettext-tools/tests/xgettext-java-7 +++ b/gettext-tools/tests/xgettext-java-7 @@ -16,7 +16,7 @@ tmpfiles="$tmpfiles xg-j-7.tmp.po xg-j-7.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-j-7.tmp xg-j-7.java test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po +LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-j-7.ok" diff --git a/gettext-tools/tests/xgettext-librep-1 b/gettext-tools/tests/xgettext-librep-1 index 874041b..23cae61 100755 --- a/gettext-tools/tests/xgettext-librep-1 +++ b/gettext-tools/tests/xgettext-librep-1 @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles xg-lr-1.tmp.po xg-lr-1.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-lr-1.tmp xg-lr-1.jl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po +LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-lr-1.ok" diff --git a/gettext-tools/tests/xgettext-librep-2 b/gettext-tools/tests/xgettext-librep-2 index 13c62f7..72b3c15 100755 --- a/gettext-tools/tests/xgettext-librep-2 +++ b/gettext-tools/tests/xgettext-librep-2 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-lr-2.tmp.po xg-lr-2.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-lr-2.tmp xg-lr-2.jl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po +LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-lr-2.ok" diff --git a/gettext-tools/tests/xgettext-lisp-1 b/gettext-tools/tests/xgettext-lisp-1 index ca79646..21ebd40 100755 --- a/gettext-tools/tests/xgettext-lisp-1 +++ b/gettext-tools/tests/xgettext-lisp-1 @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles xg-ls-1.tmp.po xg-ls-1.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-ls-1.tmp xg-ls-1.lisp test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po +LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-ls-1.ok" diff --git a/gettext-tools/tests/xgettext-lisp-2 b/gettext-tools/tests/xgettext-lisp-2 index 45218c9..86daea8 100755 --- a/gettext-tools/tests/xgettext-lisp-2 +++ b/gettext-tools/tests/xgettext-lisp-2 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-ls-2.tmp.po xg-ls-2.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-ls-2.tmp xg-ls-2.lisp test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po +LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-ls-2.ok" diff --git a/gettext-tools/tests/xgettext-objc-1 b/gettext-tools/tests/xgettext-objc-1 index 9a5e122..d2200ed 100755 --- a/gettext-tools/tests/xgettext-objc-1 +++ b/gettext-tools/tests/xgettext-objc-1 @@ -32,7 +32,7 @@ tmpfiles="$tmpfiles xg-ob-1.tmp.po xg-ob-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1.tmp xg-ob-1.m test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po +LC_ALL=C tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po 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 3c2f9ff..e9077d1 100755 --- a/gettext-tools/tests/xgettext-objc-2 +++ b/gettext-tools/tests/xgettext-objc-2 @@ -32,7 +32,7 @@ tmpfiles="$tmpfiles xg-ob-2.tmp.po xg-ob-2.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-ob-2.tmp xg-ob-2.m test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po +LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po 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 eb7b374..2b1fc24 100755 --- a/gettext-tools/tests/xgettext-perl-1 +++ b/gettext-tools/tests/xgettext-perl-1 @@ -156,7 +156,7 @@ ${XGETTEXT} --omit-header -n \ -k\$__ --flag=\$__:1:pass-perl-format --flag=\$__:1:pass-perl-brace-format \ -d xg-pl-1.tmp xg-pl-1.pl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po +LC_ALL=C tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-pl-1.ok" diff --git a/gettext-tools/tests/xgettext-perl-2 b/gettext-tools/tests/xgettext-perl-2 index 338c8d8..87c8357 100755 --- a/gettext-tools/tests/xgettext-perl-2 +++ b/gettext-tools/tests/xgettext-perl-2 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-pl-2.po" : ${XGETTEXT=xgettext} # delete POT-Creation-Date: line because the date depends on local time. ${XGETTEXT} --output - --from-code=ISO-8859-1 xg-pl-2.pl \ - | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-pl-2.po + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-pl-2.ok" diff --git a/gettext-tools/tests/xgettext-perl-3 b/gettext-tools/tests/xgettext-perl-3 index 131f777..95f5e34 100755 --- a/gettext-tools/tests/xgettext-perl-3 +++ b/gettext-tools/tests/xgettext-perl-3 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-pl-3.po" : ${XGETTEXT=xgettext} # delete POT-Creation-Date: line because the date depends on local time. ${XGETTEXT} --output - --from-code=UTF-8 xg-pl-3.pl \ - | sed '/\"POT-Creation-Date:.*/d' | tr -d '\r' > xg-pl-3.po + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-pl-3.ok" diff --git a/gettext-tools/tests/xgettext-perl-4 b/gettext-tools/tests/xgettext-perl-4 index 2429d6c..566b40b 100755 --- a/gettext-tools/tests/xgettext-perl-4 +++ b/gettext-tools/tests/xgettext-perl-4 @@ -62,7 +62,7 @@ tmpfiles="$tmpfiles xg-pl-4.tmp.pot xg-pl-4.pot" LC_MESSAGES=C LC_ALL= \ ${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.tmp.pot xg-pl-4.pl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot +LC_ALL=C tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-pl-4.ok" diff --git a/gettext-tools/tests/xgettext-perl-5 b/gettext-tools/tests/xgettext-perl-5 index 7e5e8ad..2783070 100755 --- a/gettext-tools/tests/xgettext-perl-5 +++ b/gettext-tools/tests/xgettext-perl-5 @@ -23,7 +23,7 @@ tmpfiles="$tmpfiles xg-pl-5.tmp.po xg-pl-5.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-pl-5.tmp xg-pl-5.pl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po +LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-pl-5.ok" diff --git a/gettext-tools/tests/xgettext-perl-6 b/gettext-tools/tests/xgettext-perl-6 index cf3f9a4..02b9820 100755 --- a/gettext-tools/tests/xgettext-perl-6 +++ b/gettext-tools/tests/xgettext-perl-6 @@ -71,7 +71,7 @@ tmpfiles="$tmpfiles xg-pl-6.tmp xg-pl-6.pot" LC_MESSAGES=C LC_ALL= \ ${XGETTEXT} --omit-header --no-location -o xg-pl-6.tmp xg-pl-6.pl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot +LC_ALL=C tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-pl-6.ok" diff --git a/gettext-tools/tests/xgettext-perl-7 b/gettext-tools/tests/xgettext-perl-7 index 17eedfe..c62de10 100755 --- a/gettext-tools/tests/xgettext-perl-7 +++ b/gettext-tools/tests/xgettext-perl-7 @@ -22,7 +22,7 @@ tmpfiles="$tmpfiles xg-pl-7.tmp.po xg-pl-7.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-pl-7.tmp xg-pl-7.pl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po +LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-pl-7.ok" diff --git a/gettext-tools/tests/xgettext-php-1 b/gettext-tools/tests/xgettext-php-1 index 34528a0..eaf7498 100755 --- a/gettext-tools/tests/xgettext-php-1 +++ b/gettext-tools/tests/xgettext-php-1 @@ -30,7 +30,7 @@ tmpfiles="$tmpfiles xg-ph-1.tmp.po xg-ph-1.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-ph-1.tmp xg-ph-1.php test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po +LC_ALL=C tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-ph-1.ok" diff --git a/gettext-tools/tests/xgettext-php-2 b/gettext-tools/tests/xgettext-php-2 index abb6ba9..5de8eb5 100755 --- a/gettext-tools/tests/xgettext-php-2 +++ b/gettext-tools/tests/xgettext-php-2 @@ -46,7 +46,7 @@ tmpfiles="$tmpfiles xg-ph-2.tmp.po xg-ph-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po +LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-ph-2.ok" diff --git a/gettext-tools/tests/xgettext-php-3 b/gettext-tools/tests/xgettext-php-3 index c72430e..6da2caf 100755 --- a/gettext-tools/tests/xgettext-php-3 +++ b/gettext-tools/tests/xgettext-php-3 @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-ph-3.tmp.po xg-ph-3.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-ph-3.tmp xg-ph-3.php test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po +LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-ph-3.ok" diff --git a/gettext-tools/tests/xgettext-php-4 b/gettext-tools/tests/xgettext-php-4 index fbbcfdc..4546da3 100755 --- a/gettext-tools/tests/xgettext-php-4 +++ b/gettext-tools/tests/xgettext-php-4 @@ -22,7 +22,7 @@ tmpfiles="$tmpfiles xg-ph-4.tmp.po xg-ph-4.po" ${XGETTEXT} --omit-header --no-location --extract-all \ -d xg-ph-4.tmp xg-ph-4.php test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po +LC_ALL=C tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-ph-4.ok" diff --git a/gettext-tools/tests/xgettext-po-1 b/gettext-tools/tests/xgettext-po-1 index 37b0b80..0784ad2 100755 --- a/gettext-tools/tests/xgettext-po-1 +++ b/gettext-tools/tests/xgettext-po-1 @@ -50,7 +50,7 @@ tmpfiles="$tmpfiles xg-po-1.tmp.po xg-po-1.po" ${XGETTEXT} --omit-header -n \ -d xg-po-1.tmp xg-po-1.in.po xg-po-1.c xg-po-1.cc test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po +LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po 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 0573606..2d36a60 100755 --- a/gettext-tools/tests/xgettext-properties-1 +++ b/gettext-tools/tests/xgettext-properties-1 @@ -47,7 +47,7 @@ tmpfiles="$tmpfiles xg-pr-1.tmp.po xg-pr-1.po" ${XGETTEXT} --omit-header -n \ -d xg-pr-1.tmp xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po +LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-pr-1.ok" diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1 index 094fa3a..9ea20dc 100755 --- a/gettext-tools/tests/xgettext-python-1 +++ b/gettext-tools/tests/xgettext-python-1 @@ -30,7 +30,7 @@ ${XGETTEXT} --add-comments --no-location -o xg-py-1.tmp xg-py-1.py 2>xg-py-1.err test $? = 0 || { cat xg-py-1.err; rm -fr $tmpfiles; exit 1; } # Don't simplify this to "grep ... < xg-py-1.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". -cat xg-py-1.tmp | grep -v 'POT-Creation-Date' | tr -d '\r' > xg-py-1.pot +cat xg-py-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-1.pot tmpfiles="$tmpfiles xg-py-1.ok" cat <<\EOF > xg-py-1.ok diff --git a/gettext-tools/tests/xgettext-python-2 b/gettext-tools/tests/xgettext-python-2 index b9538a0..418c9a0 100755 --- a/gettext-tools/tests/xgettext-python-2 +++ b/gettext-tools/tests/xgettext-python-2 @@ -27,7 +27,7 @@ tmpfiles="$tmpfiles xg-py-2.tmp.po xg-py-2.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-py-2.tmp xg-py-2.py test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po +LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po 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 44c3c19..2c4a5a7 100755 --- a/gettext-tools/tests/xgettext-python-3 +++ b/gettext-tools/tests/xgettext-python-3 @@ -57,7 +57,7 @@ ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=euc-jp \ test $? = 0 || { rm -fr $tmpfiles; exit 1; } # Don't simplify this to "grep ... < xg-py-3a.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". -cat xg-py-3a.tmp | grep -v 'POT-Creation-Date' | tr -d '\r' > xg-py-3a.pot +cat xg-py-3a.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3a.pot : ${DIFF=diff} ${DIFF} xg-py-3.ok xg-py-3a.pot @@ -71,7 +71,7 @@ ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \ test $? = 0 || { rm -fr $tmpfiles; exit 1; } # Don't simplify this to "grep ... < xg-py-3b.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". -cat xg-py-3b.tmp | grep -v 'POT-Creation-Date' | tr -d '\r' > xg-py-3b.pot +cat xg-py-3b.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3b.pot ${DIFF} xg-py-3.ok xg-py-3b.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } @@ -85,7 +85,7 @@ ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=iso-8859-1 \ test $? = 0 || { rm -fr $tmpfiles; exit 1; } # Don't simplify this to "grep ... < xg-py-3c.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". -cat xg-py-3c.tmp | grep -v 'POT-Creation-Date' | tr -d '\r' > xg-py-3c.pot +cat xg-py-3c.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3c.pot ${DIFF} xg-py-3.ok xg-py-3c.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } @@ -107,7 +107,7 @@ ${XGETTEXT} --add-comments=TRANSLATORS: \ test $? = 0 || { rm -fr $tmpfiles; exit 1; } # Don't simplify this to "grep ... < xg-py-3d.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". -cat xg-py-3d.tmp | grep -v 'POT-Creation-Date' | tr -d '\r' > xg-py-3d.pot +cat xg-py-3d.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3d.pot tmpfiles="$tmpfiles xg-py-3d.ok" cat <<\EOF > xg-py-3d.ok diff --git a/gettext-tools/tests/xgettext-python-4 b/gettext-tools/tests/xgettext-python-4 index eb662d4..d29f3a9 100755 --- a/gettext-tools/tests/xgettext-python-4 +++ b/gettext-tools/tests/xgettext-python-4 @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-py-3.tmp.po xg-py-3.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-py-3.tmp xg-py-3.py test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-py-3.tmp.po > xg-py-3.po +LC_ALL=C tr -d '\r' < xg-py-3.tmp.po > xg-py-3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-py-3.ok" diff --git a/gettext-tools/tests/xgettext-scheme-1 b/gettext-tools/tests/xgettext-scheme-1 index e33c013..b5d5aa9 100755 --- a/gettext-tools/tests/xgettext-scheme-1 +++ b/gettext-tools/tests/xgettext-scheme-1 @@ -21,7 +21,7 @@ tmpfiles="$tmpfiles xg-sc-1.tmp.po xg-sc-1.po" ${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-sc-1.tmp xg-sc-1.scm test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po +LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-sc-1.ok" diff --git a/gettext-tools/tests/xgettext-scheme-3 b/gettext-tools/tests/xgettext-scheme-3 index e4df4cb..b7c6985 100755 --- a/gettext-tools/tests/xgettext-scheme-3 +++ b/gettext-tools/tests/xgettext-scheme-3 @@ -21,7 +21,7 @@ tmpfiles="$tmpfiles xg-sc-3.tmp.po xg-sc-3.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-sc-3.tmp xg-sc-3.scm test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po +LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-sc-3.ok" diff --git a/gettext-tools/tests/xgettext-sh-1 b/gettext-tools/tests/xgettext-sh-1 index ac3e5cf..b40b509 100755 --- a/gettext-tools/tests/xgettext-sh-1 +++ b/gettext-tools/tests/xgettext-sh-1 @@ -470,7 +470,7 @@ tmpfiles="$tmpfiles xg-sh-1.tmp.po xg-sh-1.po" ${XGETTEXT} --omit-header --no-location --keyword=ngettext:1 \ -d xg-sh-1.tmp xg-sh-1.sh test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po +LC_ALL=C tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po 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 09cbc51..849e13c 100755 --- a/gettext-tools/tests/xgettext-sh-2 +++ b/gettext-tools/tests/xgettext-sh-2 @@ -23,7 +23,7 @@ tmpfiles="$tmpfiles xg-sh-2.tmp.po xg-sh-2.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-sh-2.tmp xg-sh-2.sh test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po +LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po 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 6f304a1..169185d 100755 --- a/gettext-tools/tests/xgettext-sh-3 +++ b/gettext-tools/tests/xgettext-sh-3 @@ -14,7 +14,7 @@ tmpfiles="$tmpfiles xg-sh-3.tmp.po xg-sh-3.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-sh-3.tmp xg-sh-3.sh test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po +LC_ALL=C tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po 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 a94d930..8a3b22f 100755 --- a/gettext-tools/tests/xgettext-sh-4 +++ b/gettext-tools/tests/xgettext-sh-4 @@ -120,7 +120,7 @@ tmpfiles="$tmpfiles xg-sh-4.err xg-sh-4.tmp.po xg-sh-4.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-sh-4.tmp xg-sh-4.sh 2>xg-sh-4.err test $? = 0 || { cat xg-sh-4.err; rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po +LC_ALL=C tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-sh-4.ok" diff --git a/gettext-tools/tests/xgettext-sh-5 b/gettext-tools/tests/xgettext-sh-5 index 11b2506..609ec0e 100755 --- a/gettext-tools/tests/xgettext-sh-5 +++ b/gettext-tools/tests/xgettext-sh-5 @@ -21,7 +21,7 @@ tmpfiles="$tmpfiles xg-sh-5.tmp.po xg-sh-5.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-sh-5.tmp xg-sh-5.sh test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po +LC_ALL=C tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-sh-5.ok" diff --git a/gettext-tools/tests/xgettext-sh-6 b/gettext-tools/tests/xgettext-sh-6 index 2f8e975..10842d4 100755 --- a/gettext-tools/tests/xgettext-sh-6 +++ b/gettext-tools/tests/xgettext-sh-6 @@ -16,7 +16,7 @@ tmpfiles="$tmpfiles xg-sh-6.tmp.po xg-sh-6.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-sh-6.tmp xg-sh-6.sh test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po +LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-sh-6.ok" diff --git a/gettext-tools/tests/xgettext-smalltalk-1 b/gettext-tools/tests/xgettext-smalltalk-1 index e741671..acbd9a5 100755 --- a/gettext-tools/tests/xgettext-smalltalk-1 +++ b/gettext-tools/tests/xgettext-smalltalk-1 @@ -24,7 +24,7 @@ tmpfiles="$tmpfiles xg-st-1.tmp.po xg-st-1.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-st-1.tmp xg-st-1.st test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po +LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-st-1.ok" diff --git a/gettext-tools/tests/xgettext-smalltalk-2 b/gettext-tools/tests/xgettext-smalltalk-2 index 0e65670..5aa51b6 100755 --- a/gettext-tools/tests/xgettext-smalltalk-2 +++ b/gettext-tools/tests/xgettext-smalltalk-2 @@ -20,7 +20,7 @@ tmpfiles="$tmpfiles xg-st-2.tmp.po xg-st-2.po" ${XGETTEXT} --add-comments --omit-header --no-location \ -d xg-st-2.tmp xg-st-2.st test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po +LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-st-2.ok" diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1 index 6c05510..3b3208e 100755 --- a/gettext-tools/tests/xgettext-stringtable-1 +++ b/gettext-tools/tests/xgettext-stringtable-1 @@ -29,7 +29,7 @@ ${XGETTEXT} -o xg-st-1.tmp xg-st-1.strings test $? = 0 || { rm -fr $tmpfiles; exit 1; } # Don't simplify this to "grep ... < xg-st-1.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". -cat xg-st-1.tmp | grep -v 'POT-Creation-Date' | tr -d '\r' > xg-st-1.po +cat xg-st-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-st-1.po tmpfiles="$tmpfiles xg-st-1.ok" cat <<\EOF > xg-st-1.ok diff --git a/gettext-tools/tests/xgettext-tcl-1 b/gettext-tools/tests/xgettext-tcl-1 index 91a8222..373729a 100755 --- a/gettext-tools/tests/xgettext-tcl-1 +++ b/gettext-tools/tests/xgettext-tcl-1 @@ -30,7 +30,7 @@ ${XGETTEXT} --add-comments --no-location -k_ -o xg-t-1.tmp xg-t-1.tcl 2>xg-t-1.e test $? = 0 || { cat xg-t-1.err; rm -fr $tmpfiles; exit 1; } # Don't simplify this to "grep ... < xg-t-1.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". -cat xg-t-1.tmp | grep -v 'POT-Creation-Date' | tr -d '\r' > xg-t-1.pot +cat xg-t-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-t-1.pot tmpfiles="$tmpfiles xg-t-1.ok" cat <<\EOF > xg-t-1.ok diff --git a/gettext-tools/tests/xgettext-tcl-2 b/gettext-tools/tests/xgettext-tcl-2 index 5ec8a02..f04e07c 100755 --- a/gettext-tools/tests/xgettext-tcl-2 +++ b/gettext-tools/tests/xgettext-tcl-2 @@ -23,7 +23,7 @@ tmpfiles="$tmpfiles xg-t-2.tmp.po xg-t-2.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: -k_ \ -d xg-t-2.tmp xg-t-2.tcl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po +LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-t-2.ok" diff --git a/gettext-tools/tests/xgettext-tcl-3 b/gettext-tools/tests/xgettext-tcl-3 index 4cddca6..04966b3 100755 --- a/gettext-tools/tests/xgettext-tcl-3 +++ b/gettext-tools/tests/xgettext-tcl-3 @@ -17,7 +17,7 @@ tmpfiles="$tmpfiles xg-t-3.tmp.po xg-t-3.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-t-3.tmp xg-t-3.tcl test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po +LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-t-3.ok" diff --git a/gettext-tools/tests/xgettext-ycp-1 b/gettext-tools/tests/xgettext-ycp-1 index b9c3d34..ea75805 100755 --- a/gettext-tools/tests/xgettext-ycp-1 +++ b/gettext-tools/tests/xgettext-ycp-1 @@ -15,7 +15,7 @@ tmpfiles="$tmpfiles xg-y-1.tmp.po xg-y-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1.tmp xg-y-1.ycp test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po +LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-y-1.ok" diff --git a/gettext-tools/tests/xgettext-ycp-2 b/gettext-tools/tests/xgettext-ycp-2 index 0a4d681..7455d2d 100755 --- a/gettext-tools/tests/xgettext-ycp-2 +++ b/gettext-tools/tests/xgettext-ycp-2 @@ -26,7 +26,7 @@ tmpfiles="$tmpfiles xg-y-2.tmp.po xg-y-2.po" ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-y-2.tmp xg-y-2.ycp test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po +LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-y-2.ok" diff --git a/gettext-tools/tests/xgettext-ycp-3 b/gettext-tools/tests/xgettext-ycp-3 index ea3814c..75ca2ad 100755 --- a/gettext-tools/tests/xgettext-ycp-3 +++ b/gettext-tools/tests/xgettext-ycp-3 @@ -17,7 +17,7 @@ tmpfiles="$tmpfiles xg-y-3.tmp.po xg-y-3.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-y-3.tmp xg-y-3.ycp test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po +LC_ALL=C tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-y-3.ok" diff --git a/gettext-tools/tests/xgettext-ycp-4 b/gettext-tools/tests/xgettext-ycp-4 index b6faa9c..a055394 100755 --- a/gettext-tools/tests/xgettext-ycp-4 +++ b/gettext-tools/tests/xgettext-ycp-4 @@ -18,7 +18,7 @@ tmpfiles="$tmpfiles xg-y-4.tmp.po xg-y-4.po" ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-y-4.tmp xg-y-4.ycp test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po +LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles xg-y-4.ok" |