diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-03-10 18:13:28 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-03-10 18:24:15 +0900 |
| commit | d66197a3ca8355efa22f1d9c687f41eb30ae19ff (patch) | |
| tree | c4acc964d617b04629a3a3bbb7632f34cdb35b9c | |
| parent | 0e79f41006d2b4d69dd3eb57c0202faa6c1fba44 (diff) | |
| download | external_gettext-d66197a3ca8355efa22f1d9c687f41eb30ae19ff.zip external_gettext-d66197a3ca8355efa22f1d9c687f41eb30ae19ff.tar.gz external_gettext-d66197a3ca8355efa22f1d9c687f41eb30ae19ff.tar.bz2 | |
tests: Remove unnecessary tempfile cleanup code
Cleanup code like "rm -fr $tmpfiles" are no longer needed, since
'init.sh' takes care of that.
369 files changed, 1123 insertions, 4409 deletions
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 8983d35..518c5cb 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,376 @@ +2014-03-10 Daiki Ueno <ueno@gnu.org> + + Remove unnecessary temporary file cleanup code. + Cleanup code like "rm -fr $tmpfiles" are no longer needed, since + 'init.sh' takes care of that. + * format-awk-1: Remove unnecessary temporary file cleanup code. + * format-awk-2: Likewise + * format-boost-1: Likewise + * format-boost-2: Likewise + * format-c-1: Likewise + * format-c-2: Likewise + * format-c-3: Likewise + * format-c-4: Likewise + * format-c-5: Likewise + * format-csharp-1: Likewise + * format-csharp-2: Likewise + * format-elisp-1: Likewise + * format-elisp-2: Likewise + * format-gcc-internal-1: Likewise + * format-gcc-internal-2: Likewise + * format-gfc-internal-1: Likewise + * format-gfc-internal-2: Likewise + * format-java-1: Likewise + * format-java-2: Likewise + * format-javascript-1: Likewise + * format-javascript-2: Likewise + * format-kde-1: Likewise + * format-kde-2: Likewise + * format-librep-1: Likewise + * format-librep-2: Likewise + * format-lisp-1: Likewise + * format-lisp-2: Likewise + * format-lua-1: Likewise + * format-lua-2: Likewise + * format-pascal-1: Likewise + * format-pascal-2: Likewise + * format-perl-1: Likewise + * format-perl-2: Likewise + * format-perl-brace-1: Likewise + * format-perl-brace-2: Likewise + * format-perl-mixed-1: Likewise + * format-perl-mixed-2: Likewise + * format-php-1: Likewise + * format-php-2: Likewise + * format-python-1: Likewise + * format-python-2: Likewise + * format-python-brace-1: Likewise + * format-python-brace-2: Likewise + * format-qt-1: Likewise + * format-qt-2: Likewise + * format-qt-plural-1: Likewise + * format-qt-plural-2: Likewise + * format-scheme-1: Likewise + * format-scheme-2: Likewise + * format-sh-1: Likewise + * format-sh-2: Likewise + * format-tcl-1: Likewise + * format-tcl-2: Likewise + * format-ycp-1: Likewise + * format-ycp-2: Likewise + * gettext-1: Likewise + * gettext-2: Likewise + * gettext-3: Likewise + * gettext-4: Likewise + * gettext-5: Likewise + * gettext-6: Likewise + * gettext-7: Likewise + * gettextpo-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-javascript: Likewise + * lang-librep: Likewise + * lang-lua: 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-vala: 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-12: Likewise + * msgcat-13: Likewise + * msgcat-14: Likewise + * msgcat-15: Likewise + * msgcat-16: Likewise + * msgcat-17: Likewise + * msgcat-18: 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-properties-2: Likewise + * msgcat-stringtable-1: Likewise + * msgcmp-1: Likewise + * msgcmp-2: Likewise + * msgcmp-3: Likewise + * msgcmp-4: Likewise + * msgcomm-1: Likewise + * msgcomm-10: Likewise + * msgcomm-11: Likewise + * msgcomm-12: Likewise + * msgcomm-13: Likewise + * msgcomm-14: Likewise + * msgcomm-15: 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-27: Likewise + * msgcomm-3: Likewise + * msgcomm-4: Likewise + * msgcomm-5: Likewise + * msgcomm-6: Likewise + * msgcomm-7: Likewise + * msgcomm-8: Likewise + * msgcomm-9: Likewise + * msgconv-1: Likewise + * msgconv-2: Likewise + * msgconv-3: Likewise + * msgconv-4: Likewise + * msgconv-5: Likewise + * msgconv-6: Likewise + * msgen-1: Likewise + * msgen-2: Likewise + * msgen-3: Likewise + * msgexec-1: Likewise + * msgexec-2: Likewise + * msgexec-3: Likewise + * msgexec-4: Likewise + * msgfilter-1: Likewise + * msgfilter-2: Likewise + * msgfilter-3: Likewise + * msgfilter-4: Likewise + * msgfilter-sr-latin-1: Likewise + * msgfmt-1: Likewise + * msgfmt-10: Likewise + * msgfmt-11: Likewise + * msgfmt-12: Likewise + * msgfmt-13: Likewise + * msgfmt-14: Likewise + * msgfmt-15: Likewise + * msgfmt-16: Likewise + * msgfmt-17: Likewise + * msgfmt-2: Likewise + * msgfmt-3: Likewise + * msgfmt-4: Likewise + * msgfmt-5: Likewise + * msgfmt-6: Likewise + * msgfmt-7: Likewise + * msgfmt-8: Likewise + * msgfmt-9: Likewise + * msgfmt-properties-1: Likewise + * msgfmt-qt-1: Likewise + * msgfmt-qt-2: Likewise + * msggrep-1: Likewise + * msggrep-10: Likewise + * msggrep-2: Likewise + * msggrep-3: Likewise + * msggrep-4: Likewise + * msggrep-5: Likewise + * msggrep-6: Likewise + * msggrep-7: Likewise + * msggrep-8: Likewise + * msggrep-9: 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-24: 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-1: Likewise + * msgmerge-update-2: Likewise + * msgmerge-update-3: Likewise + * msgmerge-update-4: Likewise + * msgunfmt-1: Likewise + * msgunfmt-2: Likewise + * msgunfmt-csharp-1: Likewise + * msgunfmt-java-1: Likewise + * msgunfmt-properties-1: Likewise + * msgunfmt-tcl-1: Likewise + * msguniq-1: Likewise + * msguniq-2: Likewise + * msguniq-3: Likewise + * msguniq-4: Likewise + * msguniq-5: Likewise + * msguniq-6: Likewise + * plural-1: Likewise + * plural-2: Likewise + * recode-sr-latin-1: Likewise + * recode-sr-latin-2: Likewise + * xgettext-1: 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-18: 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-glade-1: Likewise + * xgettext-glade-2: Likewise + * xgettext-glade-3: Likewise + * xgettext-glade-4: Likewise + * xgettext-glade-5: Likewise + * xgettext-glade-6: Likewise + * xgettext-glade-7: Likewise + * xgettext-gsettings-1: 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-javascript-1: Likewise + * xgettext-javascript-2: Likewise + * xgettext-javascript-3: Likewise + * xgettext-javascript-4: Likewise + * xgettext-javascript-5: Likewise + * xgettext-javascript-6: Likewise + * xgettext-librep-1: Likewise + * xgettext-librep-2: Likewise + * xgettext-lisp-1: Likewise + * xgettext-lisp-2: Likewise + * xgettext-lua-1: Likewise + * xgettext-lua-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-perl-8: 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-2: 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-tcl-4: Likewise + * xgettext-vala-1: Likewise + * xgettext-ycp-1: Likewise + * xgettext-ycp-2: Likewise + * xgettext-ycp-3: Likewise + * xgettext-ycp-4: Likewise + 2014-02-03 Roumen Petrov <bugtrack@roumenpetrov.info> (tiny change) tests: pass required --tag=XX to libtool diff --git a/gettext-tools/tests/format-awk-1 b/gettext-tools/tests/format-awk-1 index 2170765..0baa275 100755..100644 --- a/gettext-tools/tests/format-awk-1 +++ b/gettext-tools/tests/format-awk-1 @@ -3,10 +3,6 @@ # Test recognition of awk format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-a-1.data" cat <<\EOF > f-a-1.data # Valid: no argument "abc%%" @@ -107,7 +103,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-a-1-$n.in f-a-1-$n.po" cat <<EOF > f-a-1-$n.in dcgettext(${string}); EOF @@ -137,6 +132,4 @@ EOF rm -f f-a-1-$n.in f-a-1-$n.po done < f-a-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-awk-2 b/gettext-tools/tests/format-awk-2 index 6f4870b..feaaf82 100755..100644 --- a/gettext-tools/tests/format-awk-2 +++ b/gettext-tools/tests/format-awk-2 @@ -3,10 +3,6 @@ # Test checking of awk format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-a-2.data" cat <<\EOF > f-a-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -112,7 +108,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-a-2-$n.po f-a-2-$n.mo" cat <<EOF > f-a-2-$n.po #, awk-format ${msgid_line} @@ -141,6 +136,4 @@ EOF rm -f f-a-2-$n.po f-a-2-$n.mo done < f-a-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-boost-1 b/gettext-tools/tests/format-boost-1 index 2ab97a6..a9d4ad9 100755..100644 --- a/gettext-tools/tests/format-boost-1 +++ b/gettext-tools/tests/format-boost-1 @@ -3,10 +3,6 @@ # Test recognition of Boost format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-bo-1.data" cat <<\EOF > f-bo-1.data # Valid: no argument "abc%%" @@ -281,7 +277,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-bo-1-$n.in f-bo-1-$n.po" cat <<EOF > f-bo-1-$n.in gettext(${string}); EOF @@ -311,6 +306,4 @@ EOF rm -f f-bo-1-$n.in f-bo-1-$n.po done < f-bo-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-boost-2 b/gettext-tools/tests/format-boost-2 index 1c7340f..b41b7b0 100755..100644 --- a/gettext-tools/tests/format-boost-2 +++ b/gettext-tools/tests/format-boost-2 @@ -3,10 +3,6 @@ # Test checking of Boost format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-bo-2.data" cat <<\EOF > f-bo-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -178,7 +174,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-bo-2-$n.po f-bo-2-$n.mo" cat <<EOF > f-bo-2-$n.po #, boost-format ${msgid_line} @@ -207,6 +202,4 @@ EOF rm -f f-bo-2-$n.po f-bo-2-$n.mo done < f-bo-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-c-1 b/gettext-tools/tests/format-c-1 index 01d9362..8150abf 100755..100644 --- a/gettext-tools/tests/format-c-1 +++ b/gettext-tools/tests/format-c-1 @@ -3,10 +3,6 @@ # Test recognition of C format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-c-1.data" cat <<\EOF > f-c-1.data # Valid: no argument "abc%%" @@ -131,7 +127,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-c-1-$n.in f-c-1-$n.po" cat <<EOF > f-c-1-$n.in gettext(${string}); EOF @@ -161,6 +156,4 @@ EOF rm -f f-c-1-$n.in f-c-1-$n.po done < f-c-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-c-2 b/gettext-tools/tests/format-c-2 index 7c47c19..e7793e0 100755..100644 --- a/gettext-tools/tests/format-c-2 +++ b/gettext-tools/tests/format-c-2 @@ -3,10 +3,6 @@ # Test checking of C format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-c-2.data" cat <<\EOF > f-c-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -280,7 +276,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-c-2-$n.po f-c-2-$n.mo" cat <<EOF > f-c-2-$n.po #, c-format ${msgid_line} @@ -309,6 +304,4 @@ EOF rm -f f-c-2-$n.po f-c-2-$n.mo done < f-c-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3 index 98737dd..b72da21 100755..100644 --- a/gettext-tools/tests/format-c-3 +++ b/gettext-tools/tests/format-c-3 @@ -3,17 +3,10 @@ # Test ISO C 99 <inttypes.h> format string directives. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles fc3.tmp fc3.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o fc3.tmp --omit-header --no-location "$abs_srcdir"/format-c-3-prg.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o fc3.tmp --omit-header --no-location "$abs_srcdir"/format-c-3-prg.c || exit 1 +LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot || exit 1 -tmpfiles="$tmpfiles fc3.ok" cat <<EOF > fc3.ok #, c-format msgid "father of %<PRId8> children" @@ -23,14 +16,12 @@ EOF : ${DIFF=diff} ${DIFF} fc3.ok fc3.pot || exit 1 -tmpfiles="$tmpfiles fc3-de.po" cat <<EOF > fc3-de.po #, c-format msgid "father of %<PRId8> children" msgstr "Vater von %<PRId8> Kindern" EOF -tmpfiles="$tmpfiles fc3-dir" test -d fc3-dir || mkdir fc3-dir test -d fc3-dir/de || mkdir fc3-dir/de test -d fc3-dir/de/LC_MESSAGES || mkdir fc3-dir/de/LC_MESSAGES @@ -38,12 +29,9 @@ test -d fc3-dir/de/LC_MESSAGES || mkdir fc3-dir/de/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o fc3-dir/de/LC_MESSAGES/fc3.mo fc3-de.po -tmpfiles="$tmpfiles fc3-de.po.tmp fc3-de.po.un" : ${MSGUNFMT=msgunfmt} -${MSGUNFMT} -o fc3-de.po.tmp fc3-dir/de/LC_MESSAGES/fc3.mo -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < fc3-de.po.tmp > fc3-de.po.un -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o fc3-de.po.tmp fc3-dir/de/LC_MESSAGES/fc3.mo || exit 1 +LC_ALL=C tr -d '\r' < fc3-de.po.tmp > fc3-de.po.un || exit 1 : ${DIFF=diff} ${DIFF} fc3-de.po fc3-de.po.un || exit 1 @@ -51,6 +39,4 @@ ${DIFF} fc3-de.po fc3-de.po.un || exit 1 LANGUAGE= ../fc3 de_DE result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4 index b5f21bd..edfdc4e 100755..100644 --- a/gettext-tools/tests/format-c-4 +++ b/gettext-tools/tests/format-c-4 @@ -3,17 +3,10 @@ # Test ISO C 99 <inttypes.h> format string directives with plural forms. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles fc4.tmp fc4.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o fc4.tmp --omit-header --no-location "$abs_srcdir"/format-c-4-prg.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o fc4.tmp --omit-header --no-location "$abs_srcdir"/format-c-4-prg.c || exit 1 +LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot || exit 1 -tmpfiles="$tmpfiles fc4.ok" cat <<EOF > fc4.ok #, c-format msgid "father of %<PRId8> child" @@ -25,7 +18,6 @@ EOF : ${DIFF=diff} ${DIFF} fc4.ok fc4.pot || exit 1 -tmpfiles="$tmpfiles fc4-de.po" cat <<EOF > fc4-de.po #, c-format msgid "father of %<PRId8> child" @@ -34,7 +26,6 @@ msgstr[0] "Vater eines Kindes" msgstr[1] "Vater von %<PRId8> Kindern" EOF -tmpfiles="$tmpfiles fc4-dir" test -d fc4-dir || mkdir fc4-dir test -d fc4-dir/de || mkdir fc4-dir/de test -d fc4-dir/de/LC_MESSAGES || mkdir fc4-dir/de/LC_MESSAGES @@ -42,12 +33,9 @@ test -d fc4-dir/de/LC_MESSAGES || mkdir fc4-dir/de/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o fc4-dir/de/LC_MESSAGES/fc4.mo fc4-de.po -tmpfiles="$tmpfiles fc4-de.po.tmp fc4-de.po.un" : ${MSGUNFMT=msgunfmt} -${MSGUNFMT} -o fc4-de.po.tmp fc4-dir/de/LC_MESSAGES/fc4.mo -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < fc4-de.po.tmp > fc4-de.po.un -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o fc4-de.po.tmp fc4-dir/de/LC_MESSAGES/fc4.mo || exit 1 +LC_ALL=C tr -d '\r' < fc4-de.po.tmp > fc4-de.po.un || exit 1 : ${DIFF=diff} ${DIFF} fc4-de.po fc4-de.po.un || exit 1 @@ -55,6 +43,4 @@ ${DIFF} fc4-de.po fc4-de.po.un || exit 1 LANGUAGE= ../fc4 de_DE result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5 index 1af04dd..7868785 100755..100644 --- a/gettext-tools/tests/format-c-5 +++ b/gettext-tools/tests/format-c-5 @@ -3,17 +3,10 @@ # Test 'I' format directive flag. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles fc5.tmp fc5.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o fc5.tmp --omit-header --no-location "$abs_srcdir"/format-c-5-prg.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o fc5.tmp --omit-header --no-location "$abs_srcdir"/format-c-5-prg.c || exit 1 +LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot || exit 1 -tmpfiles="$tmpfiles fc5.ok" cat <<EOF > fc5.ok #, c-format msgid "father of %d children" @@ -23,7 +16,6 @@ EOF : ${DIFF=diff} ${DIFF} fc5.ok fc5.pot || exit 1 -tmpfiles="$tmpfiles fa.po" # This should better be Farsi, not German. Can some translator help me? cat <<EOF > fa.po #, c-format @@ -31,19 +23,15 @@ msgid "father of %d children" msgstr "Vater von %Id Kindern" EOF -tmpfiles="$tmpfiles fa" test -d fa || mkdir fa test -d fa/LC_MESSAGES || mkdir fa/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o fa/LC_MESSAGES/fc5.mo fa.po -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; } -LC_ALL=C tr -d '\r' < fa.po.tmp > fa.po.un -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo || exit 1 +LC_ALL=C tr -d '\r' < fa.po.tmp > fa.po.un || exit 1 : ${DIFF=diff} ${DIFF} fa.po fa.po.un || exit 1 @@ -57,10 +45,8 @@ case $? in else echo "Skipping test: locale fa_IR not supported" fi - rm -fr $tmpfiles; exit 77;; + exit 77;; *) exit 1;; esac -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-csharp-1 b/gettext-tools/tests/format-csharp-1 index 9db1134..792165a 100755..100644 --- a/gettext-tools/tests/format-csharp-1 +++ b/gettext-tools/tests/format-csharp-1 @@ -3,10 +3,6 @@ # Test recognition of C# format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-cs-1.data" cat <<\EOF > f-cs-1.data # Valid: one argument "abc{0}def" @@ -55,7 +51,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-cs-1-$n.in f-cs-1-$n.po" cat <<EOF > f-cs-1-$n.in GetString(${string}); EOF @@ -85,6 +80,4 @@ EOF rm -f f-cs-1-$n.in f-cs-1-$n.po done < f-cs-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-csharp-2 b/gettext-tools/tests/format-csharp-2 index 4cc8beb..cc68575 100755..100644 --- a/gettext-tools/tests/format-csharp-2 +++ b/gettext-tools/tests/format-csharp-2 @@ -3,10 +3,6 @@ # Test checking of Java format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-cs-2.data" cat <<\EOF > f-cs-2.data # Invalid: invalid msgstr msgid "abc{0}def" @@ -46,7 +42,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-cs-2-$n.po f-cs-2-$n.mo" cat <<EOF > f-cs-2-$n.po #, csharp-format ${msgid_line} @@ -75,6 +70,4 @@ EOF rm -f f-cs-2-$n.po f-cs-2-$n.mo done < f-cs-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-elisp-1 b/gettext-tools/tests/format-elisp-1 index 1d7289a..918530a 100755..100644 --- a/gettext-tools/tests/format-elisp-1 +++ b/gettext-tools/tests/format-elisp-1 @@ -3,10 +3,6 @@ # Test recognition of Emacs Lisp format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-el-1.data" cat <<\EOF > f-el-1.data # Valid: no argument "abc%%" @@ -103,7 +99,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-el-1-$n.in f-el-1-$n.po" cat <<EOF > f-el-1-$n.in (_ ${string}); EOF @@ -133,6 +128,4 @@ EOF rm -f f-el-1-$n.in f-el-1-$n.po done < f-el-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-elisp-2 b/gettext-tools/tests/format-elisp-2 index dde86c3..d4b1e6a 100755..100644 --- a/gettext-tools/tests/format-elisp-2 +++ b/gettext-tools/tests/format-elisp-2 @@ -3,10 +3,6 @@ # Test checking of Emacs Lisp format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-el-2.data" cat <<\EOF > f-el-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -262,7 +258,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-el-2-$n.po f-el-2-$n.mo" cat <<EOF > f-el-2-$n.po #, elisp-format ${msgid_line} @@ -291,6 +286,4 @@ EOF rm -f f-el-2-$n.po f-el-2-$n.mo done < f-el-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-gcc-internal-1 b/gettext-tools/tests/format-gcc-internal-1 index 54fef56..92c931b 100755..100644 --- a/gettext-tools/tests/format-gcc-internal-1 +++ b/gettext-tools/tests/format-gcc-internal-1 @@ -3,10 +3,6 @@ # Test recognition of GCC internal format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-gi-1.data" cat <<\EOF > f-gi-1.data # Valid: no argument "abc%%" @@ -135,7 +131,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-gi-1-$n.in f-gi-1-$n.po" cat <<EOF > f-gi-1-$n.in gettext(${string}); EOF @@ -165,6 +160,4 @@ EOF rm -f f-gi-1-$n.in f-gi-1-$n.po done < f-gi-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-gcc-internal-2 b/gettext-tools/tests/format-gcc-internal-2 index a5f92c0..3034f24 100755..100644 --- a/gettext-tools/tests/format-gcc-internal-2 +++ b/gettext-tools/tests/format-gcc-internal-2 @@ -3,10 +3,6 @@ # Test checking of GCC internal format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-gi-2.data" cat <<\EOF > f-gi-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -511,7 +507,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-gi-2-$n.po f-gi-2-$n.mo" cat <<EOF > f-gi-2-$n.po #, gcc-internal-format ${msgid_line} @@ -540,6 +535,4 @@ EOF rm -f f-gi-2-$n.po f-gi-2-$n.mo done < f-gi-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-gfc-internal-1 b/gettext-tools/tests/format-gfc-internal-1 index 69ef28b..fc0c44c 100755..100644 --- a/gettext-tools/tests/format-gfc-internal-1 +++ b/gettext-tools/tests/format-gfc-internal-1 @@ -3,10 +3,6 @@ # Test recognition of GFC internal format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-gf-1.data" cat <<\EOF > f-gf-1.data # Valid: no argument "abc%%" @@ -75,7 +71,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-gf-1-$n.in f-gf-1-$n.po" cat <<EOF > f-gf-1-$n.in gettext(${string}); EOF @@ -105,6 +100,4 @@ EOF rm -f f-gf-1-$n.in f-gf-1-$n.po done < f-gf-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-gfc-internal-2 b/gettext-tools/tests/format-gfc-internal-2 index 42c1b30..f89fece 100755..100644 --- a/gettext-tools/tests/format-gfc-internal-2 +++ b/gettext-tools/tests/format-gfc-internal-2 @@ -3,10 +3,6 @@ # Test checking of GFC internal format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-gf-2.data" cat <<\EOF > f-gf-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -151,7 +147,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-gf-2-$n.po f-gf-2-$n.mo" cat <<EOF > f-gf-2-$n.po #, gfc-internal-format ${msgid_line} @@ -180,6 +175,4 @@ EOF rm -f f-gf-2-$n.po f-gf-2-$n.mo done < f-gf-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-java-1 b/gettext-tools/tests/format-java-1 index 6a694b4..ecf56dd 100755..100644 --- a/gettext-tools/tests/format-java-1 +++ b/gettext-tools/tests/format-java-1 @@ -3,10 +3,6 @@ # Test recognition of Java format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-j-1.data" cat <<\EOF > f-j-1.data # Valid: one argument "abc{0}def" @@ -125,7 +121,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-j-1-$n.in f-j-1-$n.po" cat <<EOF > f-j-1-$n.in gettext(${string}); EOF @@ -155,6 +150,4 @@ EOF rm -f f-j-1-$n.in f-j-1-$n.po done < f-j-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-java-2 b/gettext-tools/tests/format-java-2 index 580bddc..e363e92 100755..100644 --- a/gettext-tools/tests/format-java-2 +++ b/gettext-tools/tests/format-java-2 @@ -3,10 +3,6 @@ # Test checking of Java format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-j-2.data" cat <<\EOF > f-j-2.data # Invalid: invalid msgstr msgid "abc{0}def" @@ -115,7 +111,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-j-2-$n.po f-j-2-$n.mo" cat <<EOF > f-j-2-$n.po #, java-format ${msgid_line} @@ -144,6 +139,4 @@ EOF rm -f f-j-2-$n.po f-j-2-$n.mo done < f-j-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-javascript-1 b/gettext-tools/tests/format-javascript-1 index f747aab..d53df29 100755..100644 --- a/gettext-tools/tests/format-javascript-1 +++ b/gettext-tools/tests/format-javascript-1 @@ -3,10 +3,6 @@ # Test recognition of JavaScript format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-js-1.data" cat <<\EOF > f-js-1.data # Valid: no argument "abc%%" @@ -48,13 +44,11 @@ cat <<\EOF > f-js-1.data "abc%d%j%j" EOF -tmpfiles="$tmpfiles f-js-1.err" : ${XGETTEXT=xgettext} n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-js-1-$n.in f-js-1-$n.po" cat <<EOF > f-js-1-$n.in gettext(${string}); EOF @@ -86,6 +80,4 @@ EOF rm -f f-js-1-$n.in f-js-1-$n.po done < f-js-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-javascript-2 b/gettext-tools/tests/format-javascript-2 index 6a9642d..d1801b1 100755..100644 --- a/gettext-tools/tests/format-javascript-2 +++ b/gettext-tools/tests/format-javascript-2 @@ -3,10 +3,6 @@ # Test checking of JavaScript format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-js-2.data" cat <<\EOF > f-js-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -55,7 +51,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-js-2-$n.po f-js-2-$n.mo" cat <<EOF > f-js-2-$n.po #, python-format ${msgid_line} @@ -84,6 +79,4 @@ EOF rm -f f-js-2-$n.po f-js-2-$n.mo done < f-js-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-kde-1 b/gettext-tools/tests/format-kde-1 index 5752c63..1b4dafc 100755..100644 --- a/gettext-tools/tests/format-kde-1 +++ b/gettext-tools/tests/format-kde-1 @@ -3,10 +3,6 @@ # Test recognition of KDE format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-kd-1.data" cat <<\EOF > f-kd-1.data # Unrecognized: no argument "abc%%def" @@ -49,7 +45,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-kd-1-$n.in f-kd-1-$n.po" cat <<EOF > f-kd-1-$n.in _(${string}); EOF @@ -79,6 +74,4 @@ EOF rm -f f-kd-1-$n.in f-kd-1-$n.po done < f-kd-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-kde-2 b/gettext-tools/tests/format-kde-2 index 9b9bb98..9fb96f5 100755..100644 --- a/gettext-tools/tests/format-kde-2 +++ b/gettext-tools/tests/format-kde-2 @@ -3,10 +3,6 @@ # Test checking of KDE format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-kd-2.data" cat <<\EOF > f-kd-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -76,7 +72,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-kd-2-$n.po f-kd-2-$n.mo" cat <<EOF > f-kd-2-$n.po #, kde-format ${msgid_line} @@ -105,6 +100,4 @@ EOF rm -f f-kd-2-$n.po f-kd-2-$n.mo done < f-kd-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-librep-1 b/gettext-tools/tests/format-librep-1 index 0fe2ec1..2168381 100755..100644 --- a/gettext-tools/tests/format-librep-1 +++ b/gettext-tools/tests/format-librep-1 @@ -3,10 +3,6 @@ # Test recognition of librep format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-lr-1.data" cat <<\EOF > f-lr-1.data # Valid: no argument "abc%%" @@ -77,7 +73,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-lr-1-$n.in f-lr-1-$n.po" cat <<EOF > f-lr-1-$n.in (_ ${string}); EOF @@ -107,6 +102,4 @@ EOF rm -f f-lr-1-$n.in f-lr-1-$n.po done < f-lr-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-librep-2 b/gettext-tools/tests/format-librep-2 index 52db538..6266619 100755..100644 --- a/gettext-tools/tests/format-librep-2 +++ b/gettext-tools/tests/format-librep-2 @@ -3,10 +3,6 @@ # Test checking of librep format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-lr-2.data" cat <<\EOF > f-lr-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -118,7 +114,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-lr-2-$n.po f-lr-2-$n.mo" cat <<EOF > f-lr-2-$n.po #, librep-format ${msgid_line} @@ -147,6 +142,4 @@ EOF rm -f f-lr-2-$n.po f-lr-2-$n.mo done < f-lr-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-lisp-1 b/gettext-tools/tests/format-lisp-1 index 81ae3d5..ef863b3 100755..100644 --- a/gettext-tools/tests/format-lisp-1 +++ b/gettext-tools/tests/format-lisp-1 @@ -3,10 +3,6 @@ # Test recognition of Lisp format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-l-1.data" cat <<\EOF > f-l-1.data # Valid: no argument, ( | . *) "abc~~def" @@ -259,7 +255,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-l-1-$n.in f-l-1-$n.po" cat <<EOF > f-l-1-$n.in (gettext ${string}) EOF @@ -289,6 +284,4 @@ EOF rm -f f-l-1-$n.in f-l-1-$n.po done < f-l-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-lisp-2 b/gettext-tools/tests/format-lisp-2 index 7bc35e0..4698932 100755..100644 --- a/gettext-tools/tests/format-lisp-2 +++ b/gettext-tools/tests/format-lisp-2 @@ -3,10 +3,6 @@ # Test checking of Lisp format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-l-2.data" cat <<\EOF > f-l-2.data # Valid: ~~ doesn't count msgid "abc~~def" @@ -175,7 +171,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-l-2-$n.po f-l-2-$n.mo" cat <<EOF > f-l-2-$n.po #, lisp-format ${msgid_line} @@ -204,6 +199,4 @@ EOF rm -f f-l-2-$n.po f-l-2-$n.mo done < f-l-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-lua-1 b/gettext-tools/tests/format-lua-1 index 42b8515..6a213d7 100755..100644 --- a/gettext-tools/tests/format-lua-1 +++ b/gettext-tools/tests/format-lua-1 @@ -3,10 +3,6 @@ # Test recognition of Lua format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-lu-1.data" cat <<\EOF > f-lu-1.data # Valid: no argument "abc%%" @@ -59,13 +55,11 @@ cat <<\EOF > f-lu-1.data # Invalid: unterminated "abc%3" EOF -tmpfiles="$tmpfiles f-l-1.err" : ${XGETTEXT=xgettext} n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-lu-1-$n.in f-lu-1-$n.po" echo "gettext.gettext(${string});" > f-lu-1-$n.in ${XGETTEXT} -L Lua -o f-lu-1-$n.po f-lu-1-$n.in || exit 1 test -f f-lu-1-$n.po || exit 1 @@ -93,7 +87,5 @@ while read comment; do rm -f f-lu-1-$n.in f-lu-1-$n.po done < f-lu-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-lua-2 b/gettext-tools/tests/format-lua-2 index 17e32cc..5c4a45b 100755..100644 --- a/gettext-tools/tests/format-lua-2 +++ b/gettext-tools/tests/format-lua-2 @@ -3,10 +3,6 @@ # Test checking of Python format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-lu-2.data" cat <<\EOF > f-lu-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -91,7 +87,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-lu-2-$n.po f-lu-2-$n.mo" cat <<EOF > f-lu-2-$n.po #, lua-format ${msgid_line} @@ -120,6 +115,4 @@ EOF rm -f f-lu-2-$n.po f-lu-2-$n.mo done < f-lu-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-pascal-1 b/gettext-tools/tests/format-pascal-1 index 4d2875b..16549b1 100755..100644 --- a/gettext-tools/tests/format-pascal-1 +++ b/gettext-tools/tests/format-pascal-1 @@ -3,10 +3,6 @@ # Test recognition of Object Pascal format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-op-1.data" cat <<\EOF > f-op-1.data # Valid: no argument "abc%%" @@ -97,7 +93,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-op-1-$n.in f-op-1-$n.po" echo "x.y=${string}" | sed -e "s/\"/'/g" > f-op-1-$n.in ${XGETTEXT} -L RST -o f-op-1-$n.po f-op-1-$n.in || exit 1 test -f f-op-1-$n.po || exit 1 @@ -125,6 +120,4 @@ while read comment; do rm -f f-op-1-$n.in f-op-1-$n.po done < f-op-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-pascal-2 b/gettext-tools/tests/format-pascal-2 index a0967fd..48bacc4 100755..100644 --- a/gettext-tools/tests/format-pascal-2 +++ b/gettext-tools/tests/format-pascal-2 @@ -3,10 +3,6 @@ # Test checking of Object Pascal format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-op-2.data" cat <<\EOF > f-op-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -103,7 +99,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-op-2-$n.po f-op-2-$n.mo" cat <<EOF > f-op-2-$n.po #, object-pascal-format ${msgid_line} @@ -132,6 +127,4 @@ EOF rm -f f-op-2-$n.po f-op-2-$n.mo done < f-op-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-perl-1 b/gettext-tools/tests/format-perl-1 index cf666b2..3f8a44a 100755..100644 --- a/gettext-tools/tests/format-perl-1 +++ b/gettext-tools/tests/format-perl-1 @@ -3,10 +3,6 @@ # Test recognition of Perl format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-pl-1.data" cat <<\EOF > f-pl-1.data # Valid: no argument "abc%%" @@ -137,7 +133,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-pl-1-$n.in f-pl-1-$n.po" sed -e 's,\$,\\$,g' <<EOF > f-pl-1-$n.in gettext(${string}); EOF @@ -167,6 +162,4 @@ EOF rm -f f-pl-1-$n.in f-pl-1-$n.po done < f-pl-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-perl-2 b/gettext-tools/tests/format-perl-2 index 12f0d70..8bbbd2e 100755..100644 --- a/gettext-tools/tests/format-perl-2 +++ b/gettext-tools/tests/format-perl-2 @@ -3,10 +3,6 @@ # Test checking of Perl format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-pl-2.data" cat <<\EOF > f-pl-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -214,7 +210,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-pl-2-$n.po f-pl-2-$n.mo" cat <<EOF > f-pl-2-$n.po #, perl-format ${msgid_line} @@ -243,6 +238,4 @@ EOF rm -f f-pl-2-$n.po f-pl-2-$n.mo done < f-pl-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-perl-brace-1 b/gettext-tools/tests/format-perl-brace-1 index 23ec185..c42ddaa 100755..100644 --- a/gettext-tools/tests/format-perl-brace-1 +++ b/gettext-tools/tests/format-perl-brace-1 @@ -3,10 +3,6 @@ # Test recognition of Perl brace format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-pb-1.data" cat <<\EOF > f-pb-1.data # Invalid: no argument "abc" @@ -37,7 +33,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-pb-1-$n.in f-pb-1-$n.po" cat <<EOF > f-pb-1-$n.in gettext(${string}); EOF @@ -67,6 +62,4 @@ EOF rm -f f-pb-1-$n.in f-pb-1-$n.po done < f-pb-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-perl-brace-2 b/gettext-tools/tests/format-perl-brace-2 index 3654f6a..486bf30 100755..100644 --- a/gettext-tools/tests/format-perl-brace-2 +++ b/gettext-tools/tests/format-perl-brace-2 @@ -3,10 +3,6 @@ # Test checking of Perl brace format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-pb-2.data" cat <<\EOF > f-pb-2.data # Valid: same named arguments msgid "abc{date}{time}" @@ -37,7 +33,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-pb-2-$n.po f-pb-2-$n.mo" cat <<EOF > f-pb-2-$n.po #, perl-brace-format ${msgid_line} @@ -66,6 +61,4 @@ EOF rm -f f-pb-2-$n.po f-pb-2-$n.mo done < f-pb-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-perl-mixed-1 b/gettext-tools/tests/format-perl-mixed-1 index ffbdf26..d94abf3 100755..100644 --- a/gettext-tools/tests/format-perl-mixed-1 +++ b/gettext-tools/tests/format-perl-mixed-1 @@ -4,10 +4,6 @@ # Test recognition of Perl format strings of both kinds (printf and brace). # This test is for the combination of both kinds. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-pm-1.data" cat <<\EOF > f-pm-1.data # Both formats. @@ -36,7 +32,6 @@ while read comment; do read formats read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-pm-1-$n.in f-pm-1-$n.po" cat <<EOF > f-pm-1-$n.in gettext(${string}); EOF @@ -67,6 +62,4 @@ EOF fi done < f-pm-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-perl-mixed-2 b/gettext-tools/tests/format-perl-mixed-2 index 5337eb9..6e313f7 100755..100644 --- a/gettext-tools/tests/format-perl-mixed-2 +++ b/gettext-tools/tests/format-perl-mixed-2 @@ -4,10 +4,6 @@ # Test checking of Perl format strings. # This test is for the combination of printf and brace format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-pm-2.data" cat <<\EOF > f-pm-2.data # Valid: normal case. #, perl-format, perl-brace-format @@ -46,7 +42,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-pm-2-$n.po f-pm-2-$n.mo" cat <<EOF > f-pm-2-$n.po ${formats} ${msgid_line} @@ -74,6 +69,4 @@ EOF fi done < f-pm-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-php-1 b/gettext-tools/tests/format-php-1 index 2763040..642e660 100755..100644 --- a/gettext-tools/tests/format-php-1 +++ b/gettext-tools/tests/format-php-1 @@ -3,10 +3,6 @@ # Test recognition of PHP format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-ph-1.data" cat <<\EOF > f-ph-1.data # Valid: no argument "abc%%" @@ -85,7 +81,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-ph-1-$n.in f-ph-1-$n.po" echo "<?= gettext(${string}) ?>" | sed -e 's/\$/\\\$/g' > f-ph-1-$n.in ${XGETTEXT} -L PHP -o f-ph-1-$n.po f-ph-1-$n.in || exit 1 test -f f-ph-1-$n.po || exit 1 @@ -113,6 +108,4 @@ while read comment; do rm -f f-ph-1-$n.in f-ph-1-$n.po done < f-ph-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-php-2 b/gettext-tools/tests/format-php-2 index 9ff7342..f64c119 100755..100644 --- a/gettext-tools/tests/format-php-2 +++ b/gettext-tools/tests/format-php-2 @@ -3,10 +3,6 @@ # Test checking of PHP format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-ph-2.data" cat <<\EOF > f-ph-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -91,7 +87,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-ph-2-$n.po f-ph-2-$n.mo" cat <<EOF > f-ph-2-$n.po #, php-format ${msgid_line} @@ -120,6 +115,4 @@ EOF rm -f f-ph-2-$n.po f-ph-2-$n.mo done < f-ph-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-python-1 b/gettext-tools/tests/format-python-1 index 7b87cda..b42ccca 100755..100644 --- a/gettext-tools/tests/format-python-1 +++ b/gettext-tools/tests/format-python-1 @@ -3,10 +3,6 @@ # Test recognition of Python format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-p-1.data" cat <<\EOF > f-p-1.data # Valid: no argument "abc%%" @@ -98,13 +94,11 @@ cat <<\EOF > f-p-1.data "abc%(addr).*x" EOF -tmpfiles="$tmpfiles f-p-1.err" : ${XGETTEXT=xgettext} n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-p-1-$n.in f-p-1-$n.po" cat <<EOF > f-p-1-$n.in gettext(${string}); EOF @@ -136,6 +130,4 @@ EOF rm -f f-p-1-$n.in f-p-1-$n.po done < f-p-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-python-2 b/gettext-tools/tests/format-python-2 index 8b5558e..204fc0c 100755..100644 --- a/gettext-tools/tests/format-python-2 +++ b/gettext-tools/tests/format-python-2 @@ -3,10 +3,6 @@ # Test checking of Python format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-p-2.data" cat <<\EOF > f-p-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -118,7 +114,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-p-2-$n.po f-p-2-$n.mo" cat <<EOF > f-p-2-$n.po #, python-format ${msgid_line} @@ -147,6 +142,4 @@ EOF rm -f f-p-2-$n.po f-p-2-$n.mo done < f-p-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-python-brace-1 b/gettext-tools/tests/format-python-brace-1 index 057114b..dba2dac 100755..100644 --- a/gettext-tools/tests/format-python-brace-1 +++ b/gettext-tools/tests/format-python-brace-1 @@ -3,10 +3,6 @@ # Test recognition of Python brace format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-pyb-1.data" cat <<\EOF > f-pyb-1.data # Invalid: no argument "abc" @@ -39,7 +35,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-pyb-1-$n.in f-pyb-1-$n.po" cat <<EOF > f-pyb-1-$n.in gettext(${string}); EOF @@ -69,6 +64,4 @@ EOF rm -f f-pyb-1-$n.in f-pyb-1-$n.po done < f-pyb-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-python-brace-2 b/gettext-tools/tests/format-python-brace-2 index a40b052..e05f8a4 100755..100644 --- a/gettext-tools/tests/format-python-brace-2 +++ b/gettext-tools/tests/format-python-brace-2 @@ -3,10 +3,6 @@ # Test checking of Python brace format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-pyb-2.data" cat <<\EOF > f-pyb-2.data # Valid: same named arguments msgid "abc{date}{time}" @@ -37,7 +33,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-pyb-2-$n.po f-pyb-2-$n.mo" cat <<EOF > f-pyb-2-$n.po #, python-brace-format ${msgid_line} @@ -66,6 +61,4 @@ EOF rm -f f-pyb-2-$n.po f-pyb-2-$n.mo done < f-pyb-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-qt-1 b/gettext-tools/tests/format-qt-1 index fe4e04d..a092ef7 100755..100644 --- a/gettext-tools/tests/format-qt-1 +++ b/gettext-tools/tests/format-qt-1 @@ -3,10 +3,6 @@ # Test recognition of Qt format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-qt-1.data" cat <<\EOF > f-qt-1.data # Unrecognized: no argument "abc%%def" @@ -43,7 +39,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-qt-1-$n.in f-qt-1-$n.po" cat <<EOF > f-qt-1-$n.in _(${string}); EOF @@ -73,6 +68,4 @@ EOF rm -f f-qt-1-$n.in f-qt-1-$n.po done < f-qt-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-qt-2 b/gettext-tools/tests/format-qt-2 index bd720c7..4cfc713 100755..100644 --- a/gettext-tools/tests/format-qt-2 +++ b/gettext-tools/tests/format-qt-2 @@ -3,10 +3,6 @@ # Test checking of Qt format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-qt-2.data" cat <<\EOF > f-qt-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -55,7 +51,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-qt-2-$n.po f-qt-2-$n.mo" cat <<EOF > f-qt-2-$n.po #, qt-format ${msgid_line} @@ -84,6 +79,4 @@ EOF rm -f f-qt-2-$n.po f-qt-2-$n.mo done < f-qt-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-qt-plural-1 b/gettext-tools/tests/format-qt-plural-1 index 4393ba6..89bbfc3 100755..100644 --- a/gettext-tools/tests/format-qt-plural-1 +++ b/gettext-tools/tests/format-qt-plural-1 @@ -3,10 +3,6 @@ # Test recognition of Qt plural format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-qtp-1.data" cat <<\EOF > f-qtp-1.data # Unrecognized: no argument "abcdef" @@ -31,7 +27,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-qtp-1-$n.in f-qtp-1-$n.po" cat <<EOF > f-qtp-1-$n.in _(${string}); EOF @@ -61,6 +56,4 @@ EOF rm -f f-qtp-1-$n.in f-qtp-1-$n.po done < f-qtp-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-qt-plural-2 b/gettext-tools/tests/format-qt-plural-2 index 48d61c1..ec21a86 100755..100644 --- a/gettext-tools/tests/format-qt-plural-2 +++ b/gettext-tools/tests/format-qt-plural-2 @@ -3,10 +3,6 @@ # Test checking of Qt plural format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-qtp-2.data" cat <<\EOF > f-qtp-2.data # Valid: %1 doesn't count msgid "abc%1def" @@ -40,7 +36,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-qtp-2-$n.po f-qtp-2-$n.mo" cat <<EOF > f-qtp-2-$n.po #, qt-plural-format ${msgid_line} @@ -69,6 +64,4 @@ EOF rm -f f-qtp-2-$n.po f-qtp-2-$n.mo done < f-qtp-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-scheme-1 b/gettext-tools/tests/format-scheme-1 index 741cd75..6a34146 100755..100644 --- a/gettext-tools/tests/format-scheme-1 +++ b/gettext-tools/tests/format-scheme-1 @@ -3,10 +3,6 @@ # Test recognition of Scheme format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-sc-1.data" cat <<\EOF > f-sc-1.data # Valid: no argument, ( | . *) "abc~~def" @@ -261,7 +257,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-sc-1-$n.in f-sc-1-$n.po" cat <<EOF > f-sc-1-$n.in (gettext ${string}) EOF @@ -291,6 +286,4 @@ EOF rm -f f-sc-1-$n.in f-sc-1-$n.po done < f-sc-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-scheme-2 b/gettext-tools/tests/format-scheme-2 index 43f01fc..8be3daa 100755..100644 --- a/gettext-tools/tests/format-scheme-2 +++ b/gettext-tools/tests/format-scheme-2 @@ -3,10 +3,6 @@ # Test checking of Lisp format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-sc-2.data" cat <<\EOF > f-sc-2.data # Valid: ~~ doesn't count msgid "abc~~def" @@ -190,7 +186,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-sc-2-$n.po f-sc-2-$n.mo" cat <<EOF > f-sc-2-$n.po #, scheme-format ${msgid_line} @@ -219,6 +214,4 @@ EOF rm -f f-sc-2-$n.po f-sc-2-$n.mo done < f-sc-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-sh-1 b/gettext-tools/tests/format-sh-1 index 6a8f565..8a8a68d 100755..100644 --- a/gettext-tools/tests/format-sh-1 +++ b/gettext-tools/tests/format-sh-1 @@ -3,10 +3,6 @@ # Test recognition of Shell format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-sh-1.data" cat <<\EOF > f-sh-1.data # Invalid: no argument "abc" @@ -41,7 +37,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-sh-1-$n.in f-sh-1-$n.po" sed -e 's,\$,\\$,g' <<EOF > f-sh-1-$n.in gettext ${string}; EOF @@ -71,6 +66,4 @@ EOF rm -f f-sh-1-$n.in f-sh-1-$n.po done < f-sh-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-sh-2 b/gettext-tools/tests/format-sh-2 index 453b19c..d98005a 100755..100644 --- a/gettext-tools/tests/format-sh-2 +++ b/gettext-tools/tests/format-sh-2 @@ -3,10 +3,6 @@ # Test checking of Shell format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-sh-2.data" cat <<\EOF > f-sh-2.data # Invalid: invalid msgstr msgid "abc$file" @@ -34,7 +30,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-sh-2-$n.po f-sh-2-$n.mo" cat <<EOF > f-sh-2-$n.po #, sh-format ${msgid_line} @@ -63,6 +58,4 @@ EOF rm -f f-sh-2-$n.po f-sh-2-$n.mo done < f-sh-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-tcl-1 b/gettext-tools/tests/format-tcl-1 index f5d0fab..feecaaa 100755..100644 --- a/gettext-tools/tests/format-tcl-1 +++ b/gettext-tools/tests/format-tcl-1 @@ -3,10 +3,6 @@ # Test recognition of Tcl format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-t-1.data" cat <<\EOF > f-t-1.data # Valid: no argument "abc%%" @@ -107,7 +103,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-t-1-$n.in f-t-1-$n.po" escape_dollars='s/\$/\\\$/g' string=`echo "$string" | sed -e "$escape_dollars"` cat <<EOF > f-t-1-$n.in @@ -139,6 +134,4 @@ EOF rm -f f-t-1-$n.in f-t-1-$n.po done < f-t-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-tcl-2 b/gettext-tools/tests/format-tcl-2 index a76b215..8a94236 100755..100644 --- a/gettext-tools/tests/format-tcl-2 +++ b/gettext-tools/tests/format-tcl-2 @@ -3,10 +3,6 @@ # Test checking of Tcl format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-t-2.data" cat <<\EOF > f-t-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -112,7 +108,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-t-2-$n.po f-t-2-$n.mo" cat <<EOF > f-t-2-$n.po #, tcl-format ${msgid_line} @@ -141,6 +136,4 @@ EOF rm -f f-t-2-$n.po f-t-2-$n.mo done < f-t-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-ycp-1 b/gettext-tools/tests/format-ycp-1 index 9f66e84..c010209 100755..100644 --- a/gettext-tools/tests/format-ycp-1 +++ b/gettext-tools/tests/format-ycp-1 @@ -3,10 +3,6 @@ # Test recognition of YCP format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-y-1.data" cat <<\EOF > f-y-1.data # Valid: no argument "abc%%def" @@ -31,7 +27,6 @@ n=0 while read comment; do read string n=`expr $n + 1` - tmpfiles="$tmpfiles f-y-1-$n.in f-y-1-$n.po" cat <<EOF > f-y-1-$n.in _(${string}); EOF @@ -61,6 +56,4 @@ EOF rm -f f-y-1-$n.in f-y-1-$n.po done < f-y-1.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/format-ycp-2 b/gettext-tools/tests/format-ycp-2 index 4b3bd81..e606744 100755..100644 --- a/gettext-tools/tests/format-ycp-2 +++ b/gettext-tools/tests/format-ycp-2 @@ -3,10 +3,6 @@ # Test checking of YCP format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles f-y-2.data" cat <<\EOF > f-y-2.data # Valid: %% doesn't count msgid "abc%%def" @@ -40,7 +36,6 @@ while read comment; do read msgid_line read msgstr_line n=`expr $n + 1` - tmpfiles="$tmpfiles f-y-2-$n.po f-y-2-$n.mo" cat <<EOF > f-y-2-$n.po #, ycp-format ${msgid_line} @@ -69,6 +64,4 @@ EOF rm -f f-y-2-$n.po f-y-2-$n.mo done < f-y-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/gettext-1 b/gettext-tools/tests/gettext-1 index e756684..87b609b 100755..100644 --- a/gettext-tools/tests/gettext-1 +++ b/gettext-tools/tests/gettext-1 @@ -3,22 +3,16 @@ # Test the gettext program with -e option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Create binary test file in correct position. -tmpfiles="$tmpfiles gt-1" test -d gt-1 || mkdir gt-1 test -d gt-1/LC_MESSAGES || mkdir gt-1/LC_MESSAGES cp "$abs_srcdir"/test.mo gt-1/LC_MESSAGES -tmpfiles="$tmpfiles gt-test1.out" : ${GETTEXT=gettext} TEXTDOMAINDIR=. LANGUAGE=gt-1 \ ${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" cat <<EOF > gtmf-test1.ok MSGFMT(1) portable message object file compiler Copyright (C) 1995 Free Software Foundation @@ -29,6 +23,4 @@ EOF ${DIFF} gtmf-test1.ok gt-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/gettext-2 b/gettext-tools/tests/gettext-2 index 6b4b29e..46d6a99 100755..100644 --- a/gettext-tools/tests/gettext-2 +++ b/gettext-tools/tests/gettext-2 @@ -15,28 +15,20 @@ else ac_n= ac_c='\c' ac_t= fi -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Create binary test file in correct position. -tmpfiles="$tmpfiles gt-2" test -d gt-2 || mkdir gt-2 test -d gt-2/LC_MESSAGES || mkdir gt-2/LC_MESSAGES cp "$abs_srcdir"/test.mo gt-2/LC_MESSAGES -tmpfiles="$tmpfiles gt-test2.out" : ${GETTEXT=gettext} TEXTDOMAINDIR=. LANGUAGE=gt-2 \ ${GETTEXT} --env LC_ALL=en test 'error 3' > gt-test2.out # Create correct file. -tmpfile="$tmpfiles gtmf-test2.ok" echo $ac_n "error 3 translation$ac_c" > gtmf-test2.ok : ${DIFF=diff} ${DIFF} gtmf-test2.ok gt-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3 index 51290d4..76c28a9 100755..100644 --- a/gettext-tools/tests/gettext-3 +++ b/gettext-tools/tests/gettext-3 @@ -4,9 +4,6 @@ # Test that on glibc systems, gettext() works right even with intermediate # setlocale() calls. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # This test works only on glibc systems. : ${GLIBC2=no} test "$GLIBC2" = yes || { @@ -32,7 +29,6 @@ LC_ALL=fr_FR ../testlocale || { exit 77 } -tmpfiles="$tmpfiles gt-3" test -d gt-3 || mkdir gt-3 test -d gt-3/de_DE || mkdir gt-3/de_DE test -d gt-3/de_DE/LC_MESSAGES || mkdir gt-3/de_DE/LC_MESSAGES @@ -43,7 +39,6 @@ test -d gt-3/fr_FR/LC_MESSAGES || mkdir gt-3/fr_FR/LC_MESSAGES ${MSGFMT} -o gt-3/de_DE/LC_MESSAGES/tstlang.mo "$abs_srcdir"/gettext-3-1.po ${MSGFMT} -o gt-3/fr_FR/LC_MESSAGES/tstlang.mo "$abs_srcdir"/gettext-3-2.po -tmpfiles="$tmpfiles gt-3.ok" cat <<EOF > gt-3.ok String1 - Lang1: 1st string String2 - Lang1: 2nd string @@ -53,12 +48,9 @@ String1 - First string for testing. String2 - Another string for testing. EOF -tmpfiles="$tmpfiles gt-3.out" ../gettext-3-prg > gt-3.out || exit 1 : ${DIFF=diff} ${DIFF} gt-3.ok gt-3.out || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/gettext-4 b/gettext-tools/tests/gettext-4 index 3b9885f..fdfa096 100755..100644 --- a/gettext-tools/tests/gettext-4 +++ b/gettext-tools/tests/gettext-4 @@ -3,9 +3,6 @@ # Test that bind_textdomain_codeset() works. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # This test works only on systems that have a traditional french locale # installed. # gettext-4.po is actually a German PO file, but only the encoding of the @@ -22,7 +19,6 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 exit 77 } -tmpfiles="$tmpfiles gt-4" test -d gt-4 || mkdir gt-4 test -d gt-4/fr || mkdir gt-4/fr test -d gt-4/fr/LC_MESSAGES || mkdir gt-4/fr/LC_MESSAGES @@ -32,6 +28,4 @@ ${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-4.po ../gettext-4-prg $LOCALE_FR || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/gettext-5 b/gettext-tools/tests/gettext-5 index 3e9306b..a7af65e 100755..100644 --- a/gettext-tools/tests/gettext-5 +++ b/gettext-tools/tests/gettext-5 @@ -4,9 +4,6 @@ # Test that on glibc systems, the gettext() results come out in the correct # encoding for locales that differ only in their encoding. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # This test works only on glibc systems. : ${GLIBC2=no} test "$GLIBC2" = yes || { @@ -33,7 +30,6 @@ LC_ALL=de_DE.UTF-8 ../testlocale || { exit 77 } -tmpfiles="$tmpfiles gt-5" test -d gt-5 || mkdir gt-5 test -d gt-5/de_DE || mkdir gt-5/de_DE test -d gt-5/de_DE/LC_MESSAGES || mkdir gt-5/de_DE/LC_MESSAGES @@ -43,6 +39,4 @@ ${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-5.po ../gettext-5-prg || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6 index 0ff96a4..7bc4e01 100755..100644 --- a/gettext-tools/tests/gettext-6 +++ b/gettext-tools/tests/gettext-6 @@ -5,9 +5,6 @@ # correctly if different threads operate in different locales with the same # encoding. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # This test works only on glibc and MacOS X systems. : ${host_os=unknown} : ${GLIBC2=no} @@ -32,7 +29,6 @@ if test -n "$missing_locale"; then exit 77 fi -tmpfiles="$tmpfiles gt-6" test -d gt-6 || mkdir gt-6 test -d gt-6/de_DE || mkdir gt-6/de_DE test -d gt-6/de_DE/LC_MESSAGES || mkdir gt-6/de_DE/LC_MESSAGES @@ -43,7 +39,6 @@ test -d gt-6/fr_FR/LC_MESSAGES || mkdir gt-6/fr_FR/LC_MESSAGES ${MSGFMT} -o gt-6/de_DE/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-6-1.po ${MSGFMT} -o gt-6/fr_FR/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-6-2.po -tmpfiles="$tmpfiles gt-6.ok" cat <<EOF > gt-6.ok Schnheit beaut @@ -51,19 +46,16 @@ Schnheit beaut EOF -tmpfiles="$tmpfiles gt-6.out" ../gettext-6-prg > gt-6.out case $? in 0) ;; 77) echo "Skipping test: not a glibc >= 2.3 or MacOS X >= 10.5 system" - rm -fr $tmpfiles; exit 77 + exit 77 ;; esac : ${DIFF=diff} ${DIFF} gt-6.ok gt-6.out || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7 index c10dac6..a38e5f1 100755..100644 --- a/gettext-tools/tests/gettext-7 +++ b/gettext-tools/tests/gettext-7 @@ -5,9 +5,6 @@ # correctly if different threads operate in different locales referring to # the same catalog file but with different encodings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # This test works only on glibc and MacOS X systems. : ${host_os=unknown} : ${GLIBC2=no} @@ -33,7 +30,6 @@ if test -n "$missing_locale"; then exit 77 fi -tmpfiles="$tmpfiles gt-7" test -d gt-7 || mkdir gt-7 test -d gt-7/de_DE || mkdir gt-7/de_DE test -d gt-7/de_DE/LC_MESSAGES || mkdir gt-7/de_DE/LC_MESSAGES @@ -41,19 +37,16 @@ test -d gt-7/de_DE/LC_MESSAGES || mkdir gt-7/de_DE/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o gt-7/de_DE/LC_MESSAGES/tstthread.mo "$abs_srcdir"/gettext-7.po -tmpfiles="$tmpfiles gt-7.out" ../gettext-7-prg > gt-7.out case $? in 0) ;; 77) echo "Skipping test: not a glibc >= 2.3 or MacOS X >= 10.5 system" - rm -fr $tmpfiles; exit 77 + exit 77 ;; *) exit 1 ;; esac -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/gettext-8 b/gettext-tools/tests/gettext-8 index 5ee22bc..5ee22bc 100755..100644 --- a/gettext-tools/tests/gettext-8 +++ b/gettext-tools/tests/gettext-8 diff --git a/gettext-tools/tests/gettextpo-1 b/gettext-tools/tests/gettextpo-1 index e0a1abf..2657a1b 100755..100644 --- a/gettext-tools/tests/gettextpo-1 +++ b/gettext-tools/tests/gettextpo-1 @@ -2,16 +2,10 @@ . "${srcdir=.}/init.sh"; path_prepend_ . ../src # Test the libgettextpo library. -tmpfiles="gtpo-1-copied.po gtpo-1-created.po" -../gettextpo-1-prg${EXEEXT} "$abs_srcdir"/gettextpo-1.de.po > /dev/null -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +../gettextpo-1-prg${EXEEXT} "$abs_srcdir"/gettextpo-1.de.po > /dev/null || exit 1 : ${DIFF=diff} -${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-copied.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-created.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -f $tmpfiles +${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-copied.po || exit 1 +${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-created.po || exit 1 exit 0 diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash index 2140ade..d0be463 100755..100644 --- a/gettext-tools/tests/lang-bash +++ b/gettext-tools/tests/lang-bash @@ -10,10 +10,6 @@ # output when accessing any .mo file not generated from a .po file in UTF-8 # encoding. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.bash" cat <<\EOF > prog.bash #! /bin/bash @@ -31,18 +27,15 @@ $echo $"'Your command, please?', asked the waiter." $echo "`eval_ngettext "a piece of cake" "\\$n pieces of cake" $n`" EOF -tmpfiles="$tmpfiles l-bash-prog.tmp l-bash-prog.pot l-bash-prog.err" : ${XGETTEXT=xgettext} LC_MESSAGES=C LC_ALL= \ ${XGETTEXT} -o l-bash-prog.tmp --omit-header --no-location prog.bash \ >l-bash-prog.err 2>&1 result=$? cat l-bash-prog.err | grep -v 'warning: the syntax \$"\.\.\." is deprecated due to security reasons' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-bash-prog.tmp > l-bash-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < l-bash-prog.tmp > l-bash-prog.pot || exit 1 -tmpfiles="$tmpfiles l-bash-prog.ok" cat <<\EOF > l-bash-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -57,7 +50,6 @@ EOF : ${DIFF=diff} ${DIFF} l-bash-prog.ok l-bash-prog.pot || exit 1 -tmpfiles="$tmpfiles l-bash-fr.po" cat <<\EOF > l-bash-fr.po msgid "" msgstr "" @@ -75,17 +67,13 @@ msgstr[0] "un morceau de gateau" msgstr[1] "$n morceaux de gateau" EOF -tmpfiles="$tmpfiles l-bash-fr.po.tmp l-bash-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-bash-fr.po.tmp l-bash-fr.po l-bash-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-bash-fr.po.tmp > l-bash-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-bash-fr.po.tmp l-bash-fr.po l-bash-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-bash-fr.po.tmp > l-bash-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-bash-fr.po l-bash-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-bash" test -d l-bash || mkdir l-bash test -d l-bash/fr || mkdir l-bash/fr test -d l-bash/fr/LC_MESSAGES || mkdir l-bash/fr/LC_MESSAGES @@ -95,10 +83,10 @@ ${MSGFMT} -o l-bash/fr/LC_MESSAGES/prog.mo l-bash-fr.po # Test for presence of bash version 2.0 or newer. (bash -c :) >/dev/null 2>/dev/null \ - || { echo "Skipping test: bash not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: bash not found"; exit 77; } case `bash -c 'echo $BASH_VERSION'` in [2-9].*) ;; - *) echo "Skipping test: bash version too old"; rm -fr $tmpfiles; exit 77;; + *) echo "Skipping test: bash version too old"; exit 77;; esac # Test which of the fr_FR locales are installed. @@ -126,10 +114,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-bash-prog.nok l-bash-prog.ok l-bash-prog.oku l-bash-prog.out" # Expected result when bash is built without i18n support. cat <<\EOF > l-bash-prog.nok 'Your command, please?', asked the waiter. @@ -152,7 +139,7 @@ if test $LOCALE_FR != none; then : ${DIFF=diff} ${DIFF} l-bash-prog.nok l-bash-prog.out > /dev/null && { echo "Skipping test: bash is built without i18n support" - rm -fr $tmpfiles; exit 77 + exit 77 } ${DIFF} l-bash-prog.ok l-bash-prog.out || exit 1 fi @@ -161,11 +148,9 @@ if test $LOCALE_FR_UTF8 != none; then : ${DIFF=diff} ${DIFF} l-bash-prog.nok l-bash-prog.out > /dev/null && { echo "Skipping test: bash is built without i18n support" - rm -fr $tmpfiles; exit 77 + exit 77 } ${DIFF} l-bash-prog.oku l-bash-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c index 562b412..33935dc 100755..100644 --- a/gettext-tools/tests/lang-c +++ b/gettext-tools/tests/lang-c @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: gcc. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.c" cat <<\EOF > prog.c #include "config.h" #include <libintl.h> @@ -43,7 +39,6 @@ int main (int argc, char *argv[]) } EOF -tmpfiles="$tmpfiles l-c-prog.${OBJEXT} l-c-prog${EXEEXT}" # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h # is found in the build directory, regardless of -I options present in # ${CFLAGS} or ${CPPFLAGS}. @@ -51,14 +46,10 @@ tmpfiles="$tmpfiles l-c-prog.${OBJEXT} l-c-prog${EXEEXT}" ${LIBTOOL} --quiet --tag=CC --mode=link ${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib ../../gnulib-lib/libgettextlib.la -I../../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-c-prog prog.c ${LTLIBINTL} \ || exit 1 -tmpfiles="$tmpfiles l-c-prog.tmp l-c-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-c-prog.tmp --omit-header --no-location -k_ prog.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-c-prog.tmp > l-c-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-c-prog.tmp --omit-header --no-location -k_ prog.c || exit 1 +LC_ALL=C tr -d '\r' < l-c-prog.tmp > l-c-prog.pot || exit 1 -tmpfiles="$tmpfiles l-c-prog.ok" cat <<EOF > l-c-prog.ok #, c-format msgid "'Your command, please?', asked the waiter." @@ -78,7 +69,6 @@ EOF : ${DIFF=diff} ${DIFF} l-c-prog.ok l-c-prog.pot || exit 1 -tmpfiles="$tmpfiles l-c-fr.po" cat <<\EOF > l-c-fr.po msgid "" msgstr "" @@ -102,17 +92,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-c-fr.po.tmp l-c-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-c-fr.po.tmp l-c-fr.po l-c-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-c-fr.po.tmp > l-c-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-c-fr.po.tmp l-c-fr.po l-c-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-c-fr.po.tmp > l-c-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-c-fr.po l-c-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-c" test -d l-c || mkdir l-c test -d l-c/fr || mkdir l-c/fr test -d l-c/fr/LC_MESSAGES || mkdir l-c/fr/LC_MESSAGES @@ -120,7 +106,6 @@ test -d l-c/fr/LC_MESSAGES || mkdir l-c/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o l-c/fr/LC_MESSAGES/prog.mo l-c-fr.po -tmpfiles="$tmpfiles l-c-prog.ok l-c-prog.oku l-c-prog.out" : ${DIFF=diff} cat <<\EOF > l-c-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -157,9 +142,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++ index ec2f82b..110c511 100755..100644 --- a/gettext-tools/tests/lang-c++ +++ b/gettext-tools/tests/lang-c++ @@ -5,9 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: gcc g++. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether a C++ compiler is found and libasprintf is built. test "${CXX}" != ":" || { echo "Skipping test: no C++ compiler found" @@ -18,7 +15,6 @@ test "${TESTLIBASPRINTF}" = yes || { exit 77 } -tmpfiles="$tmpfiles l-c++-prog.cc" cat <<\EOF > l-c++-prog.cc #include "config.h" @@ -60,7 +56,6 @@ int main (int argc, char *argv[]) } EOF -tmpfiles="$tmpfiles l-c++-prog.${OBJEXT} l-c++-prog${EXEEXT}" # Compile in two steps from .cc to .o and from .o to 'l-c++-prog'. This way, # relinking is faster because doesn't need to redo the first step. # Put the -I flags before ${CXXFLAGS} ${CPPFLAGS}, to make sure that libintl.h @@ -75,14 +70,10 @@ ${CXX} -I../.. -I../../../gettext-runtime/libasprintf -I"$abs_top_srcdir"/gnulib ${LIBTOOL} --quiet --tag=CXX --mode=link --tag=CXX ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o l-c++-prog l-c++-prog.${OBJEXT} ../../../gettext-runtime/libasprintf/libasprintf.la ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \ || exit 1 -tmpfiles="$tmpfiles l-c++-prog.tmp l-c++-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-c++-prog.tmp --omit-header --no-location -k_ l-c++-prog.cc -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-c++-prog.tmp > l-c++-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-c++-prog.tmp --omit-header --no-location -k_ l-c++-prog.cc || exit 1 +LC_ALL=C tr -d '\r' < l-c++-prog.tmp > l-c++-prog.pot || exit 1 -tmpfiles="$tmpfiles l-c++-prog.ok" cat <<EOF > l-c++-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -101,7 +92,6 @@ EOF : ${DIFF=diff} ${DIFF} l-c++-prog.ok l-c++-prog.pot || exit 1 -tmpfiles="$tmpfiles l-c++-fr.po" cat <<\EOF > l-c++-fr.po msgid "" msgstr "" @@ -124,17 +114,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-c++-fr.po.tmp l-c++-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-c++-fr.po.tmp l-c++-fr.po l-c++-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-c++-fr.po.tmp > l-c++-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-c++-fr.po.tmp l-c++-fr.po l-c++-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-c++-fr.po.tmp > l-c++-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-c++-fr.po l-c++-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-c++" test -d l-c++ || mkdir l-c++ test -d l-c++/fr || mkdir l-c++/fr test -d l-c++/fr/LC_MESSAGES || mkdir l-c++/fr/LC_MESSAGES @@ -142,7 +128,6 @@ test -d l-c++/fr/LC_MESSAGES || mkdir l-c++/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o l-c++/fr/LC_MESSAGES/prog.mo l-c++-fr.po -tmpfiles="$tmpfiles l-c++-prog.ok l-c++-prog.oku l-c++-prog.out" : ${DIFF=diff} cat <<\EOF > l-c++-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -179,9 +164,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp index 78ee8ee..fe76fb5 100755..100644 --- a/gettext-tools/tests/lang-clisp +++ b/gettext-tools/tests/lang-clisp @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: clisp. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.lisp" cat <<\EOF > prog.lisp (setf (textdomain) "prog") (setf (textdomaindir "prog") "./l-clisp/") @@ -22,14 +18,10 @@ cat <<\EOF > prog.lisp (format t "~A~%" (format nil (gettext "~A is replaced by ~A.") "FF" "EUR")) EOF -tmpfiles="$tmpfiles l-clisp-prog.tmp l-clisp-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-clisp-prog.tmp --omit-header --no-location prog.lisp -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-clisp-prog.tmp > l-clisp-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-clisp-prog.tmp --omit-header --no-location prog.lisp || exit 1 +LC_ALL=C tr -d '\r' < l-clisp-prog.tmp > l-clisp-prog.pot || exit 1 -tmpfiles="$tmpfiles l-clisp-prog.ok" cat <<EOF > l-clisp-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -48,7 +40,6 @@ EOF : ${DIFF=diff} ${DIFF} l-clisp-prog.ok l-clisp-prog.pot || exit 1 -tmpfiles="$tmpfiles l-clisp-fr.po" cat <<\EOF > l-clisp-fr.po msgid "" msgstr "" @@ -71,17 +62,13 @@ msgid "~A is replaced by ~A." msgstr "~1@*~A remplace ~0@*~A." EOF -tmpfiles="$tmpfiles l-clisp-fr.po.tmp l-clisp-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-clisp-fr.po.tmp l-clisp-fr.po l-clisp-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-clisp-fr.po.tmp > l-clisp-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-clisp-fr.po.tmp l-clisp-fr.po l-clisp-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-clisp-fr.po.tmp > l-clisp-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-clisp-fr.po l-clisp-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-clisp" test -d l-clisp || mkdir l-clisp test -d l-clisp/fr || mkdir l-clisp/fr test -d l-clisp/fr/LC_MESSAGES || mkdir l-clisp/fr/LC_MESSAGES @@ -93,17 +80,17 @@ ${MSGFMT} -o l-clisp/fr/LC_MESSAGES/prog.mo l-clisp-fr.po # Use clisp for the comparison of the version numbers; neither 'expr' nor 'bc' # can deal with floating-point numbers. (clisp --version) >/dev/null 2>/dev/null \ - || { echo "Skipping test: clisp not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: clisp not found"; exit 77; } version=`clisp --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'` case $version in 19* | 20*) # older than 2.25 - echo "Skipping test: clisp version too old"; rm -fr $tmpfiles; exit 77;; + echo "Skipping test: clisp version too old"; exit 77;; esac version=`echo $version | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'` clisp -norc -x "(sys::exit #+GETTEXT (not (>= $version 2.28)) #-GETTEXT t)" \ >/dev/null \ || { echo "Skipping test: clisp was built without gettext support" - rm -fr $tmpfiles; exit 77 + exit 77 } # Test which of the fr_FR locales are installed. @@ -131,10 +118,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-clisp-prog.ok l-clisp-prog.oku l-clisp-prog.out" : ${DIFF=diff} cat <<\EOF > l-clisp-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -160,6 +146,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-clisp-prog.oku l-clisp-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp index 1d5cf8f..1a4c3a3 100755..100644 --- a/gettext-tools/tests/lang-csharp +++ b/gettext-tools/tests/lang-csharp @@ -9,9 +9,6 @@ # are wrong for locales containing a language and a territory. This is fixed # in mono-0.29. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether we can build and test C# programs. test "${CSHARP_CHOICE}" != no || { echo "Skipping test: configured with --disable-csharp" @@ -26,7 +23,6 @@ test "${TESTCSHARP}" = yes || { exit 77 } -tmpfiles="$tmpfiles program.cs" cat <<\EOF > program.cs using System; using GNU.Gettext; @@ -50,19 +46,14 @@ class Program { } EOF -tmpfiles="$tmpfiles l-csharp" test -d l-csharp || mkdir l-csharp : ${CSHARPCOMP="/bin/sh ../../csharpcomp.sh"} ${CSHARPCOMP} -o l-csharp/program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1 -tmpfiles="$tmpfiles l-csharp-prog.tmp l-csharp-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-csharp-prog.tmp --omit-header --no-location program.cs -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-csharp-prog.tmp > l-csharp-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-csharp-prog.tmp --omit-header --no-location program.cs || exit 1 +LC_ALL=C tr -d '\r' < l-csharp-prog.tmp > l-csharp-prog.pot || exit 1 -tmpfiles="$tmpfiles l-csharp-prog.ok" cat <<EOF > l-csharp-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -93,7 +84,6 @@ EOF : ${DIFF=diff} ${DIFF} l-csharp-prog.ok l-csharp-prog.pot || exit 1 -tmpfiles="$tmpfiles l-csharp-fr.po" cat <<\EOF > l-csharp-fr.po msgid "" msgstr "" @@ -130,12 +120,9 @@ msgid "{0} is replaced by {1}." msgstr "Le nouveau {1} remplace le vieux {0}." EOF -tmpfiles="$tmpfiles l-csharp-fr.po.tmp l-csharp-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-csharp-fr.po.tmp l-csharp-fr.po l-csharp-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-csharp-fr.po.tmp > l-csharp-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-csharp-fr.po.tmp l-csharp-fr.po l-csharp-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-csharp-fr.po.tmp > l-csharp-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-csharp-fr.po l-csharp-fr.po.new || exit 1 @@ -169,10 +156,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-csharp-prog.ok l-csharp-prog.oku l-csharp-prog.out" : ${DIFF=diff} cat <<\EOF > l-csharp-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -201,6 +187,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-csharp-prog.oku l-csharp-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-elisp b/gettext-tools/tests/lang-elisp index 7a49ae5..afe2873 100755..100644 --- a/gettext-tools/tests/lang-elisp +++ b/gettext-tools/tests/lang-elisp @@ -3,10 +3,6 @@ # Test of gettext facilities in the Emacs Lisp language. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.el" cat <<\EOF > prog.el (textdomain "prog") (bindtextdomain "prog" "l-elisp") @@ -17,14 +13,10 @@ cat <<\EOF > prog.el (format nil (_ "%s is replaced by %s.") "FF" "EUR")) EOF -tmpfiles="$tmpfiles l-elisp-prog.tmp l-elisp-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-elisp-prog.tmp --omit-header --no-location prog.el -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-elisp-prog.tmp > l-elisp-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-elisp-prog.tmp --omit-header --no-location prog.el || exit 1 +LC_ALL=C tr -d '\r' < l-elisp-prog.tmp > l-elisp-prog.pot || exit 1 -tmpfiles="$tmpfiles l-elisp-prog.ok" cat <<EOF > l-elisp-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -37,7 +29,6 @@ EOF : ${DIFF=diff} ${DIFF} l-elisp-prog.ok l-elisp-prog.pot || exit 1 -tmpfiles="$tmpfiles l-elisp-fr.po" cat <<\EOF > l-elisp-fr.po msgid "" msgstr "" @@ -53,17 +44,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-elisp-fr.po.tmp l-elisp-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-elisp-fr.po.tmp l-elisp-fr.po l-elisp-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-elisp-fr.po.tmp > l-elisp-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-elisp-fr.po.tmp l-elisp-fr.po l-elisp-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-elisp-fr.po.tmp > l-elisp-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-elisp-fr.po l-elisp-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-elisp" test -d l-elisp || mkdir l-elisp test -d l-elisp/fr || mkdir l-elisp/fr test -d l-elisp/fr/LC_MESSAGES || mkdir l-elisp/fr/LC_MESSAGES @@ -71,6 +58,4 @@ test -d l-elisp/fr/LC_MESSAGES || mkdir l-elisp/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o l-elisp/fr/LC_MESSAGES/prog.mo l-elisp-fr.po -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk index dca67ef..c93a2f4 100755..100644 --- a/gettext-tools/tests/lang-gawk +++ b/gettext-tools/tests/lang-gawk @@ -9,10 +9,6 @@ # but not in the fr_FR.UTF-8 locale. Probably because in the fr_FR locale, # nl_langinfo(CODESET) returns "". -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.awk" cat <<\EOF > prog.awk BEGIN { TEXTDOMAIN = "prog" @@ -26,14 +22,10 @@ BEGIN { } EOF -tmpfiles="$tmpfiles l-gawk-prog.tmp l-gawk-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-gawk-prog.tmp --omit-header --no-location prog.awk -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-gawk-prog.tmp > l-gawk-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-gawk-prog.tmp --omit-header --no-location prog.awk || exit 1 +LC_ALL=C tr -d '\r' < l-gawk-prog.tmp > l-gawk-prog.pot || exit 1 -tmpfiles="$tmpfiles l-gawk-prog.ok" cat <<EOF > l-gawk-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -52,7 +44,6 @@ EOF : ${DIFF=diff} ${DIFF} l-gawk-prog.ok l-gawk-prog.pot || exit 1 -tmpfiles="$tmpfiles l-gawk-fr.po" cat <<\EOF > l-gawk-fr.po msgid "" msgstr "" @@ -75,17 +66,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-gawk-fr.po.tmp l-gawk-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-gawk-fr.po.tmp l-gawk-fr.po l-gawk-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-gawk-fr.po.tmp > l-gawk-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-gawk-fr.po.tmp l-gawk-fr.po l-gawk-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-gawk-fr.po.tmp > l-gawk-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-gawk-fr.po l-gawk-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-gawk" test -d l-gawk || mkdir l-gawk test -d l-gawk/fr || mkdir l-gawk/fr test -d l-gawk/fr/LC_MESSAGES || mkdir l-gawk/fr/LC_MESSAGES @@ -95,10 +82,10 @@ ${MSGFMT} -o l-gawk/fr/LC_MESSAGES/prog.mo l-gawk-fr.po # Test for presence of gawk version 3.1.3 or newer, excluding version 3.1.5. (gawk --version) >/dev/null 2>/dev/null \ - || { echo "Skipping test: gawk not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: gawk not found"; exit 77; } case `gawk --version 2>&1 | sed -e 's/^[^0-9]*//'` in 0.* | 1.* | 2.* | 3.0* | 3.1.0* | 3.1.1* | 3.1.2* | 3.1.5*) - echo "Skipping test: gawk version too old"; rm -fr $tmpfiles; exit 77;; + echo "Skipping test: gawk version too old"; exit 77;; esac # Test which of the fr_FR locales are installed. @@ -126,7 +113,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi # Test that gawk wasn't built with --disable-nls. @@ -136,18 +123,17 @@ if test $LOCALE_FR != none; then LANGUAGE= LC_ALL=$LOCALE_FR gawk --version | grep logiciel > /dev/null test $? = 0 || { echo "Skipping test: gawk was built without i18n support" - rm -fr $tmpfiles; exit 77 + exit 77 } fi if test $LOCALE_FR_UTF8 != none; then LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk --version | grep logiciel > /dev/null test $? = 0 || { echo "Skipping test: gawk was built without i18n support" - rm -fr $tmpfiles; exit 77 + exit 77 } fi -tmpfiles="$tmpfiles l-gawk-prog.ok l-gawk-prog.oku l-gawk-prog.out" : ${DIFF=diff} cat <<\EOF > l-gawk-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -171,6 +157,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-gawk-prog.oku l-gawk-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile index 13cb07c..25cae7c 100755..100644 --- a/gettext-tools/tests/lang-guile +++ b/gettext-tools/tests/lang-guile @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: guile. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.scm" cat <<\EOF > prog.scm (use-modules (ice-9 format)) @@ -25,14 +21,10 @@ cat <<\EOF > prog.scm (format #t "~A~%" (format #f (gettext "~A is replaced by ~A.") "FF" "EUR")) EOF -tmpfiles="$tmpfiles l-guile-prog.tmp l-guile-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-guile-prog.tmp --omit-header --no-location prog.scm -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-guile-prog.tmp > l-guile-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-guile-prog.tmp --omit-header --no-location prog.scm || exit 1 +LC_ALL=C tr -d '\r' < l-guile-prog.tmp > l-guile-prog.pot || exit 1 -tmpfiles="$tmpfiles l-guile-prog.ok" cat <<EOF > l-guile-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -51,7 +43,6 @@ EOF : ${DIFF=diff} ${DIFF} l-guile-prog.ok l-guile-prog.pot || exit 1 -tmpfiles="$tmpfiles l-guile-fr.po" cat <<\EOF > l-guile-fr.po msgid "" msgstr "" @@ -74,17 +65,13 @@ msgid "~A is replaced by ~A." msgstr "~1@*~A remplace ~0@*~A." EOF -tmpfiles="$tmpfiles l-guile-fr.po.tmp l-guile-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-guile-fr.po.tmp l-guile-fr.po l-guile-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-guile-fr.po.tmp > l-guile-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-guile-fr.po.tmp l-guile-fr.po l-guile-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-guile-fr.po.tmp > l-guile-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-guile-fr.po l-guile-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-guile" test -d l-guile || mkdir l-guile test -d l-guile/fr || mkdir l-guile/fr test -d l-guile/fr/LC_MESSAGES || mkdir l-guile/fr/LC_MESSAGES @@ -94,10 +81,10 @@ ${MSGFMT} -o l-guile/fr/LC_MESSAGES/prog.mo l-guile-fr.po # Test for presence of guile version 1.7 or newer. (guile --version) >/dev/null 2>/dev/null \ - || { echo "Skipping test: guile not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: guile not found"; exit 77; } case `guile --version | sed -e 1q | sed -e 's/^[^0-9]*//'` in 0.* | 1.[0-6] | 1.[0-6].* ) - echo "Skipping test: guile version too old"; rm -fr $tmpfiles; exit 77;; + echo "Skipping test: guile version too old"; exit 77;; esac # Test which of the fr_FR locales are installed. @@ -125,10 +112,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-guile-prog.ok l-guile-prog.oku l-guile-prog.out l-guile-prog.err" : ${DIFF=diff} cat <<\EOF > l-guile-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -154,6 +140,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-guile-prog.oku l-guile-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java index 6e7d194..4cd2020 100755..100644 --- a/gettext-tools/tests/lang-java +++ b/gettext-tools/tests/lang-java @@ -8,9 +8,6 @@ # Note: This test fails when using gcj from GCC 3.1 and GCC 3.2, due to a bug # (libgcj/6576). It is fixed in GCC 3.3. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether we can build and test Java programs. test "${JAVA_CHOICE}" != no || { echo "Skipping test: configured with --disable-java" @@ -25,7 +22,6 @@ test "${TESTJAVA}" = yes || { exit 77 } -tmpfiles="$tmpfiles Program.java" cat <<\EOF > Program.java import java.util.*; import java.io.*; @@ -63,21 +59,16 @@ cat <<\EOF >> Program.java } EOF -tmpfiles="$tmpfiles Program.class l-java l-java-prog.err" test -d l-java || mkdir l-java : ${JAVACOMP="/bin/sh ../../javacomp.sh"} CLASSPATH=../../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d l-java Program.java 2>l-java-prog.err \ || { cat l-java-prog.err 1>&2; exit 1; } -tmpfiles="$tmpfiles l-java-prog.tmp l-java-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-java-prog.tmp --omit-header --no-location Program.java -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-java-prog.tmp > l-java-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-java-prog.tmp --omit-header --no-location Program.java || exit 1 +LC_ALL=C tr -d '\r' < l-java-prog.tmp > l-java-prog.pot || exit 1 -tmpfiles="$tmpfiles l-java-prog.ok" cat <<EOF > l-java-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -108,7 +99,6 @@ EOF : ${DIFF=diff} ${DIFF} l-java-prog.ok l-java-prog.pot || exit 1 -tmpfiles="$tmpfiles l-java-fr.po" cat <<\EOF > l-java-fr.po msgid "" msgstr "" @@ -145,17 +135,13 @@ msgid "{0} is replaced by {1}." msgstr "Le nouveau {1} remplace le vieux {0}." EOF -tmpfiles="$tmpfiles l-java-fr.po.tmp l-java-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-java-fr.po.tmp l-java-fr.po l-java-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-java-fr.po.tmp > l-java-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-java-fr.po.tmp l-java-fr.po l-java-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-java-fr.po.tmp > l-java-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-java-fr.po l-java-fr.po.new || exit 1 -tmpfiles="$tmpfiles prog_fr.class" : ${MSGFMT=msgfmt} ${MSGFMT} -j -d l-java -r prog -l fr l-java-fr.po || exit 1 @@ -184,10 +170,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-java-prog.ok l-java-prog.oku l-java-prog.out" : ${DIFF=diff} cat <<\EOF > l-java-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -216,6 +201,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-java-prog.oku l-java-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-javascript b/gettext-tools/tests/lang-javascript index c53cdf3..596dcbd 100755..100644 --- a/gettext-tools/tests/lang-javascript +++ b/gettext-tools/tests/lang-javascript @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: gjs. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.js" cat <<\EOF > prog.js const Format = imports.format; const Gettext = imports.gettext; @@ -22,14 +18,10 @@ print(_("'Your command, please?', asked the waiter.")); print(_("%s is replaced by %s.").format("FF", "EUR")); EOF -tmpfiles="$tmpfiles l-javascript-prog.tmp l-javascript-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-javascript-prog.tmp --omit-header --no-location prog.js -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-javascript-prog.tmp > l-javascript-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-javascript-prog.tmp --omit-header --no-location prog.js || exit 1 +LC_ALL=C tr -d '\r' < l-javascript-prog.tmp > l-javascript-prog.pot || exit 1 -tmpfiles="$tmpfiles l-javascript-prog.ok" cat <<EOF > l-javascript-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -42,7 +34,6 @@ EOF : ${DIFF=diff} ${DIFF} l-javascript-prog.ok l-javascript-prog.pot || exit 1 -tmpfiles="$tmpfiles l-javascript-fr.po" cat <<\EOF > l-javascript-fr.po msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -56,17 +47,13 @@ msgid "%s is replaced by %s." msgstr "%s remplace %s." EOF -tmpfiles="$tmpfiles l-javascript-fr.po.tmp l-javascript-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-javascript-fr.po.tmp l-javascript-fr.po l-javascript-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-javascript-fr.po.tmp > l-javascript-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-javascript-fr.po.tmp l-javascript-fr.po l-javascript-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-javascript-fr.po.tmp > l-javascript-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-javascript-fr.po l-javascript-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-javascript" test -d l-javascript || mkdir l-javascript test -d l-javascript/fr || mkdir l-javascript/fr test -d l-javascript/fr/LC_MESSAGES || mkdir l-javascript/fr/LC_MESSAGES @@ -76,11 +63,11 @@ ${MSGFMT} -o l-javascript/fr/LC_MESSAGES/prog.mo l-javascript-fr.po # Test for presence of gjs. (gjs -h) >/dev/null 2>/dev/null \ - || { echo "Skipping test: gjs not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: gjs not found"; exit 77; } (gjs -c imports.gettext) >/dev/null 2>/dev/null \ - || { echo "Skipping test: gjs gettext module not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: gjs gettext module not found"; exit 77; } (gjs -c imports.format) >/dev/null 2>/dev/null \ - || { echo "Skipping test: gjs format module not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: gjs format module not found"; exit 77; } # Test which of the fr_FR locales are installed. : ${LOCALE_FR=fr_FR} @@ -107,10 +94,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-javascript-prog.ok l-javascript-prog.oku l-javascript-prog.out" : ${DIFF=diff} cat <<\EOF > l-javascript-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -132,6 +118,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} -u l-javascript-prog.oku l-javascript-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep index 89743a0..6748252 100755..100644 --- a/gettext-tools/tests/lang-librep +++ b/gettext-tools/tests/lang-librep @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: librep. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.jl" cat <<\EOF > prog.jl (require 'rep.i18n.gettext) @@ -21,14 +17,10 @@ cat <<\EOF > prog.jl (format nil (_ "%s is replaced by %s.") "FF" "EUR")) EOF -tmpfiles="$tmpfiles l-librep-prog.tmp l-librep-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-librep-prog.tmp --omit-header --no-location prog.jl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-librep-prog.tmp > l-librep-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-librep-prog.tmp --omit-header --no-location prog.jl || exit 1 +LC_ALL=C tr -d '\r' < l-librep-prog.tmp > l-librep-prog.pot || exit 1 -tmpfiles="$tmpfiles l-librep-prog.ok" cat <<EOF > l-librep-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -41,7 +33,6 @@ EOF : ${DIFF=diff} ${DIFF} l-librep-prog.ok l-librep-prog.pot || exit 1 -tmpfiles="$tmpfiles l-librep-fr.po" cat <<\EOF > l-librep-fr.po msgid "" msgstr "" @@ -57,17 +48,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-librep-fr.po.tmp l-librep-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-librep-fr.po.tmp l-librep-fr.po l-librep-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-librep-fr.po.tmp > l-librep-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-librep-fr.po.tmp l-librep-fr.po l-librep-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-librep-fr.po.tmp > l-librep-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-librep-fr.po l-librep-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-librep" test -d l-librep || mkdir l-librep test -d l-librep/fr || mkdir l-librep/fr test -d l-librep/fr/LC_MESSAGES || mkdir l-librep/fr/LC_MESSAGES @@ -77,10 +64,10 @@ ${MSGFMT} -o l-librep/fr/LC_MESSAGES/prog.mo l-librep-fr.po # Test for presence of rep version 0.15.3 or newer. (rep --version) >/dev/null 2>/dev/null \ - || { echo "Skipping test: rep not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: rep not found"; exit 77; } case `rep --version | sed -e 's/^[^0-9]*//'` in 0.[0-9] | 0.1[0-5] | 0.[0-9].* | 0.1[0-4].* | 0.15.[0-2] ) - echo "Skipping test: rep version too old"; rm -fr $tmpfiles; exit 77;; + echo "Skipping test: rep version too old"; exit 77;; esac # Test which of the fr_FR locales are installed. @@ -108,10 +95,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-librep-prog.ok l-librep-prog.oku l-librep-prog.out" : ${DIFF=diff} cat <<\EOF > l-librep-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -133,6 +119,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-librep-prog.oku l-librep-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-lua b/gettext-tools/tests/lang-lua index 3fbe068..d6f8e71 100755..100644 --- a/gettext-tools/tests/lang-lua +++ b/gettext-tools/tests/lang-lua @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: lua, lua-gettext. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.lua" cat <<\EOF > prog.lua require("gettext") gettext.bindtextdomain("prog", "l-lua") @@ -21,14 +17,10 @@ print(string.format(gettext.ngettext('a piece of cake', [[%d pieces of cake]], n print(string.format(_[==[%s is replaced by %s.]==], "FF", "EUR")) EOF -tmpfiles="$tmpfiles l-lua-prog.tmp l-lua-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-lua-prog.tmp --omit-header --no-location prog.lua -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-lua-prog.tmp > l-lua-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-lua-prog.tmp --omit-header --no-location prog.lua || exit 1 +LC_ALL=C tr -d '\r' < l-lua-prog.tmp > l-lua-prog.pot || exit 1 -tmpfiles="$tmpfiles l-lua-prog.ok" cat <<\EOF > l-lua-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -47,7 +39,6 @@ EOF : ${DIFF=diff} ${DIFF} l-lua-prog.ok l-lua-prog.pot || exit 1 -tmpfiles="$tmpfiles l-lua-fr.po" cat <<\EOF > l-lua-fr.po msgid "" msgstr "" @@ -68,17 +59,13 @@ msgid "%s is replaced by %s." msgstr "%s remplace %s." EOF -tmpfiles="$tmpfiles l-lua-fr.po.tmp l-lua-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-lua-fr.po.tmp l-lua-fr.po l-lua-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-lua-fr.po.tmp > l-lua-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-lua-fr.po.tmp l-lua-fr.po l-lua-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-lua-fr.po.tmp > l-lua-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-lua-fr.po l-lua-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-lua" test -d l-lua || mkdir l-lua test -d l-lua/fr || mkdir l-lua/fr test -d l-lua/fr/LC_MESSAGES || mkdir l-lua/fr/LC_MESSAGES @@ -89,14 +76,14 @@ ${MSGFMT} -o l-lua/fr/LC_MESSAGES/prog.mo l-lua-fr.po # Test for presence of lua version 5.0 or newer with gettext support. (lua -v) >/dev/null 2>/dev/null test $? -le 1 \ - || { echo "Skipping test: lua not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: lua not found"; exit 77; } case `lua -v 2>&1 | sed -e 's/^[^0-9]*//'` in [5-9].*) ;; - *) echo "Skipping test: lua version too old"; rm -fr $tmpfiles; exit 77;; + *) echo "Skipping test: lua version too old"; exit 77;; esac { lua -v -l gettext > /dev/null 2>/dev/null; } \ || { echo "Skipping test: lua gettext module not found" - rm -fr $tmpfiles; exit 77 + exit 77 } # Test which of the fr_FR locales are installed. @@ -124,10 +111,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-lua-prog.ok l-lua-prog.oku l-lua-prog.out" : ${DIFF=diff} cat <<\EOF > l-lua-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -151,6 +137,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-lua-prog.oku l-lua-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc index 81e459d..b378d5d 100755..100644 --- a/gettext-tools/tests/lang-objc +++ b/gettext-tools/tests/lang-objc @@ -5,11 +5,7 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: gcc. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether an ObjectiveC compiler is found. -tmpfiles="$tmpfiles hello.m l-objc-hello.${OBJEXT} l-objc-hello${EXEEXT} l-objc-hello.dSYM" cat <<\EOF > hello.m #include <stdio.h> #include <stdlib.h> @@ -21,10 +17,9 @@ int main () EOF ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-objc-hello hello.m 2>/dev/null \ || { echo "Skipping test: Objective C compiler not found" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles prog.m" cat <<\EOF > prog.m #include "config.h" #include <libintl.h> @@ -59,7 +54,6 @@ int main (int argc, char *argv[]) } EOF -tmpfiles="$tmpfiles l-objc-prog.${OBJEXT} l-objc-prog${EXEEXT}" # Put the -I flags before ${CFLAGS} ${CPPFLAGS}, to make sure that libintl.h # is found in the build directory, regardless of -I options present in # ${CFLAGS} or ${CPPFLAGS}. @@ -67,14 +61,10 @@ tmpfiles="$tmpfiles l-objc-prog.${OBJEXT} l-objc-prog${EXEEXT}" ${LIBTOOL} --quiet --tag=CC --mode=link ${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib ../../gnulib-lib/libgettextlib.la -I../../intl ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o l-objc-prog prog.m ${LTLIBINTL} \ || exit 1 -tmpfiles="$tmpfiles l-objc-prog.tmp l-objc-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-objc-prog.tmp --omit-header --no-location -k_ prog.m -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-objc-prog.tmp > l-objc-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-objc-prog.tmp --omit-header --no-location -k_ prog.m || exit 1 +LC_ALL=C tr -d '\r' < l-objc-prog.tmp > l-objc-prog.pot || exit 1 -tmpfiles="$tmpfiles l-objc-prog.ok" cat <<EOF > l-objc-prog.ok #, c-format msgid "'Your command, please?', asked the waiter." @@ -94,7 +84,6 @@ EOF : ${DIFF=diff} ${DIFF} l-objc-prog.ok l-objc-prog.pot || exit 1 -tmpfiles="$tmpfiles l-objc-fr.po" cat <<\EOF > l-objc-fr.po msgid "" msgstr "" @@ -118,17 +107,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-objc-fr.po.tmp l-objc-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-objc-fr.po.tmp l-objc-fr.po l-objc-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-objc-fr.po.tmp > l-objc-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-objc-fr.po.tmp l-objc-fr.po l-objc-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-objc-fr.po.tmp > l-objc-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-objc-fr.po l-objc-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-objc" test -d l-objc || mkdir l-objc test -d l-objc/fr || mkdir l-objc/fr test -d l-objc/fr/LC_MESSAGES || mkdir l-objc/fr/LC_MESSAGES @@ -136,7 +121,6 @@ test -d l-objc/fr/LC_MESSAGES || mkdir l-objc/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o l-objc/fr/LC_MESSAGES/prog.mo l-objc-fr.po -tmpfiles="$tmpfiles l-objc-prog.ok l-objc-prog.oku l-objc-prog.out" : ${DIFF=diff} cat <<\EOF > l-objc-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -173,9 +157,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal index 4032937..d269c57 100755..100644 --- a/gettext-tools/tests/lang-pascal +++ b/gettext-tools/tests/lang-pascal @@ -9,10 +9,6 @@ # This here is a quick workaround: UTF8_LOCALE_UNSUPPORTED=yes -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles pascalprog.pp" cat <<\EOF > pascalprog.pp program pascalprog; {$mode delphi} @@ -30,22 +26,17 @@ begin end. EOF -tmpfiles="$tmpfiles pascalprog.o pascalprog.rst pascalprog" (ppc386 pascalprog.pp) >/dev/null 2>&1 || (ppcx64 pascalprog.pp) >/dev/null 2>&1 || { echo "Skipping test: Pascal compiler ppc386 or ppcx64 not found" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles l-pascal-pascalprog.tmp l-pascal-pascalprog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-pascal-pascalprog.tmp --omit-header --add-location pascalprog.rst -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-pascal-pascalprog.tmp > l-pascal-pascalprog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-pascal-pascalprog.tmp --omit-header --add-location pascalprog.rst || exit 1 +LC_ALL=C tr -d '\r' < l-pascal-pascalprog.tmp > l-pascal-pascalprog.pot || exit 1 -tmpfiles="$tmpfiles l-pascal-pascalprog.ok" cat <<EOF > l-pascal-pascalprog.ok #: pascalprog.question msgid "'Your command, please?', asked the waiter." @@ -60,7 +51,6 @@ EOF : ${DIFF=diff} ${DIFF} l-pascal-pascalprog.ok l-pascal-pascalprog.pot || exit 1 -tmpfiles="$tmpfiles l-pascal-fr.po" cat <<\EOF > l-pascal-fr.po msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -76,17 +66,13 @@ msgid "%s is replaced by %s." msgstr "%1:s remplace %0:s." EOF -tmpfiles="$tmpfiles l-pascal-fr.po.tmp l-pascal-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-pascal-fr.po.tmp l-pascal-fr.po l-pascal-pascalprog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-pascal-fr.po.tmp > l-pascal-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-pascal-fr.po.tmp l-pascal-fr.po l-pascal-pascalprog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-pascal-fr.po.tmp > l-pascal-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-pascal-fr.po l-pascal-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-pascal" test -d l-pascal || mkdir l-pascal test -d l-pascal/fr || mkdir l-pascal/fr test -d l-pascal/fr/LC_MESSAGES || mkdir l-pascal/fr/LC_MESSAGES @@ -94,7 +80,6 @@ test -d l-pascal/fr/LC_MESSAGES || mkdir l-pascal/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o l-pascal/fr/LC_MESSAGES/pascalprog.mo l-pascal-fr.po -tmpfiles="$tmpfiles l-pascal-pascalprog.ok l-pascal-pascalprog.oku l-pascal-pascalprog.out" : ${DIFF=diff} cat <<\EOF > l-pascal-pascalprog.ok Votre commande, s'il vous plait, dit le garon. @@ -124,7 +109,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi else if test $LOCALE_FR = none; then @@ -133,10 +118,8 @@ else else echo "Skipping test: no traditional french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1 index acea7b6..ea317d6 100755..100644 --- a/gettext-tools/tests/lang-perl-1 +++ b/gettext-tools/tests/lang-perl-1 @@ -6,10 +6,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: perl. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles program1.pl" cat <<\EOF > program1.pl use strict; @@ -25,16 +21,12 @@ printf gettext "%s is replaced by %s.", "FF", "EUR"; print "\n"; EOF -tmpfiles="$tmpfiles l-perl-1-prog.tmp l-perl-1-prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} \ -k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \ - -o l-perl-1-prog.tmp --omit-header --no-location program1.pl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-perl-1-prog.tmp > l-perl-1-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -o l-perl-1-prog.tmp --omit-header --no-location program1.pl || exit 1 +LC_ALL=C tr -d '\r' < l-perl-1-prog.tmp > l-perl-1-prog.pot || exit 1 -tmpfiles="$tmpfiles l-perl-1-prog.ok" cat <<EOF > l-perl-1-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -53,7 +45,6 @@ EOF : ${DIFF=diff} ${DIFF} l-perl-1-prog.ok l-perl-1-prog.pot || exit 1 -tmpfiles="$tmpfiles l-perl-1-fr.po" cat <<\EOF > l-perl-1-fr.po msgid "" msgstr "" @@ -76,17 +67,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-perl-1-fr.po.tmp l-perl-1-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-perl-1-fr.po.tmp l-perl-1-fr.po l-perl-1-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-perl-1-fr.po.tmp > l-perl-1-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-perl-1-fr.po.tmp l-perl-1-fr.po l-perl-1-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-perl-1-fr.po.tmp > l-perl-1-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-perl-1-fr.po l-perl-1-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-perl-1" test -d l-perl-1 || mkdir l-perl-1 test -d l-perl-1/fr || mkdir l-perl-1/fr test -d l-perl-1/fr/LC_MESSAGES || mkdir l-perl-1/fr/LC_MESSAGES @@ -94,7 +81,6 @@ test -d l-perl-1/fr/LC_MESSAGES || mkdir l-perl-1/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o l-perl-1/fr/LC_MESSAGES/prog.mo l-perl-1-fr.po -tmpfiles="$tmpfiles l-perl-1-prog.ok l-perl-1-prog.oku l-perl-1-prog.out" : ${DIFF=diff} cat <<\EOF > l-perl-1-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -110,7 +96,7 @@ EOF # Test for perl with Locale::Messages package. perl -e 'use Locale::Messages;' 2>/dev/null \ || { echo "Skipping test: perl package Locale::Messages is not installed" - rm -fr $tmpfiles; exit 77 + exit 77 } : ${LOCALE_FR=fr_FR} @@ -129,9 +115,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2 index 4a1578c..5a8c30d 100755..100644 --- a/gettext-tools/tests/lang-perl-2 +++ b/gettext-tools/tests/lang-perl-2 @@ -6,10 +6,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: perl, libintl-perl. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles program2.pl" cat <<\EOF > program2.pl use Locale::TextDomain (prog => './l-perl-2'); my $n = 2; @@ -21,19 +17,15 @@ printf __x ("{old} is replaced by {new}.", old => "FF", new => "EUR"); print "\n"; EOF -tmpfiles="$tmpfiles l-perl-2-prog.tmp l-perl-2-prog.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} \ -k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \ -k__n:1,2 --flag=__n:1:pass-perl-format --flag=__n:1:pass-perl-brace-format \ --flag=__n:2:pass-perl-format --flag=__n:2:pass-perl-brace-format \ -k__x --flag=__x:1:perl-brace-format \ - -o l-perl-2-prog.tmp --omit-header --no-location program2.pl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-perl-2-prog.tmp > l-perl-2-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -o l-perl-2-prog.tmp --omit-header --no-location program2.pl || exit 1 +LC_ALL=C tr -d '\r' < l-perl-2-prog.tmp > l-perl-2-prog.pot || exit 1 -tmpfiles="$tmpfiles l-perl-2-prog.ok" cat <<EOF > l-perl-2-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -52,7 +44,6 @@ EOF : ${DIFF=diff} ${DIFF} l-perl-2-prog.ok l-perl-2-prog.pot || exit 1 -tmpfiles="$tmpfiles l-perl-2-fr.po" cat <<\EOF > l-perl-2-fr.po msgid "" msgstr "" @@ -75,17 +66,13 @@ msgid "{old} is replaced by {new}." msgstr "{new} remplace {old}." EOF -tmpfiles="$tmpfiles l-perl-2-fr.po.tmp l-perl-2-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-perl-2-fr.po.tmp l-perl-2-fr.po l-perl-2-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-perl-2-fr.po.tmp > l-perl-2-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-perl-2-fr.po.tmp l-perl-2-fr.po l-perl-2-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-perl-2-fr.po.tmp > l-perl-2-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-perl-2-fr.po l-perl-2-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-perl-2" test -d l-perl-2 || mkdir l-perl-2 test -d l-perl-2/fr || mkdir l-perl-2/fr test -d l-perl-2/fr/LC_MESSAGES || mkdir l-perl-2/fr/LC_MESSAGES @@ -93,7 +80,6 @@ test -d l-perl-2/fr/LC_MESSAGES || mkdir l-perl-2/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o l-perl-2/fr/LC_MESSAGES/prog.mo l-perl-2-fr.po -tmpfiles="$tmpfiles l-perl-2-prog.ok l-perl-2-prog.oku l-perl-2-prog.out" : ${DIFF=diff} cat <<\EOF > l-perl-2-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -109,7 +95,7 @@ EOF # Test for perl with libintl-perl package. perl -M'Locale::TextDomain' -e '' 2>/dev/null \ || { echo "Skipping test: perl package libintl-perl is not installed" - rm -fr $tmpfiles; exit 77 + exit 77 } : ${LOCALE_FR=fr_FR} @@ -128,9 +114,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php index 072392c..3bc096d 100755..100644 --- a/gettext-tools/tests/lang-php +++ b/gettext-tools/tests/lang-php @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: mod_php4-core. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.php" cat <<\EOF > prog.php <?php setlocale (LC_ALL, ""); @@ -21,14 +17,10 @@ cat <<\EOF > prog.php ?> EOF -tmpfiles="$tmpfiles l-php-prog.tmp l-php-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-php-prog.tmp --omit-header --no-location prog.php -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-php-prog.tmp > l-php-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-php-prog.tmp --omit-header --no-location prog.php || exit 1 +LC_ALL=C tr -d '\r' < l-php-prog.tmp > l-php-prog.pot || exit 1 -tmpfiles="$tmpfiles l-php-prog.ok" cat <<EOF > l-php-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -41,7 +33,6 @@ EOF : ${DIFF=diff} ${DIFF} l-php-prog.ok l-php-prog.pot || exit 1 -tmpfiles="$tmpfiles l-php-fr.po" cat <<\EOF > l-php-fr.po msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -55,17 +46,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-php-fr.po.tmp l-php-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-php-fr.po.tmp l-php-fr.po l-php-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-php-fr.po.tmp > l-php-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-php-fr.po.tmp l-php-fr.po l-php-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-php-fr.po.tmp > l-php-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-php-fr.po l-php-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-php" test -d l-php || mkdir l-php test -d l-php/fr || mkdir l-php/fr test -d l-php/fr/LC_MESSAGES || mkdir l-php/fr/LC_MESSAGES @@ -76,14 +63,14 @@ ${MSGFMT} -o l-php/fr/LC_MESSAGES/prog.mo l-php-fr.po # Test for presence of php version 4.0 or newer with gettext support. (php -v) >/dev/null 2>/dev/null test $? -le 1 \ - || { echo "Skipping test: php not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: php not found"; exit 77; } case `php -v | sed -n -e 1p | sed -e 's/^[^0-9]*//'` in [4-9].*) ;; - *) echo "Skipping test: php version too old"; rm -fr $tmpfiles; exit 77;; + *) echo "Skipping test: php version too old"; exit 77;; esac { php -m | grep '^gettext$' >/dev/null; } \ || { echo "Skipping test: php was built without gettext support" - rm -fr $tmpfiles; exit 77 + exit 77 } # Test which of the fr_FR locales are installed. @@ -111,10 +98,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-php-prog.ok l-php-prog.oku l-php-prog.out" : ${DIFF=diff} cat <<\EOF > l-php-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -136,6 +122,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-php-prog.oku l-php-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-po b/gettext-tools/tests/lang-po index c37da7e..7b2824d 100755..100644 --- a/gettext-tools/tests/lang-po +++ b/gettext-tools/tests/lang-po @@ -3,12 +3,8 @@ # Test of gettext facilities in the PO/POT format. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test with POT format. -tmpfiles="$tmpfiles prog-in.pot" cat <<\EOF > prog-in.pot msgid "'Your command, please?', asked the waiter." msgstr "" @@ -24,19 +20,15 @@ msgid "%s is replaced by %s." msgstr "" EOF -tmpfiles="$tmpfiles l-po-prog.tmp l-po-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-po-prog.tmp --omit-header --add-location prog-in.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-po-prog.tmp > l-po-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-po-prog.tmp --omit-header --add-location prog-in.pot || exit 1 +LC_ALL=C tr -d '\r' < l-po-prog.tmp > l-po-prog.pot || exit 1 : ${DIFF=diff} ${DIFF} prog-in.pot l-po-prog.pot || exit 1 # Test with PO format. -tmpfiles="$tmpfiles l-po-prog-in.po" cat <<\EOF > l-po-prog-in.po msgid "" msgstr "" @@ -59,16 +51,11 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-po-prog.tmp.po l-po-prog.po" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-po-prog.tmp.po --omit-header --add-location l-po-prog-in.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-po-prog.tmp.po > l-po-prog.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-po-prog.tmp.po --omit-header --add-location l-po-prog-in.po || exit 1 +LC_ALL=C tr -d '\r' < l-po-prog.tmp.po > l-po-prog.po || exit 1 : ${DIFF=diff} ${DIFF} l-po-prog-in.po l-po-prog.po || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1 index 6dff69c..db91d47 100755..100644 --- a/gettext-tools/tests/lang-python-1 +++ b/gettext-tools/tests/lang-python-1 @@ -7,10 +7,6 @@ # It looks like a bug in Python's gettext.py. This here is a quick workaround: UTF8_LOCALE_UNSUPPORTED=yes -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog1.py" cat <<\EOF > prog1.py import gettext @@ -22,14 +18,10 @@ print gettext.gettext("%(oldCurrency)s is replaced by %(newCurrency)s.") \ % { 'oldCurrency': "FF", 'newCurrency' : "EUR" } EOF -tmpfiles="$tmpfiles l-python-1-prog.tmp l-python-1-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-python-1-prog.tmp --omit-header --no-location prog1.py -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-python-1-prog.tmp > l-python-1-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-python-1-prog.tmp --omit-header --no-location prog1.py || exit 1 +LC_ALL=C tr -d '\r' < l-python-1-prog.tmp > l-python-1-prog.pot || exit 1 -tmpfiles="$tmpfiles l-python-1-prog.ok" cat <<EOF > l-python-1-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -42,7 +34,6 @@ EOF : ${DIFF=diff} ${DIFF} l-python-1-prog.ok l-python-1-prog.pot || exit 1 -tmpfiles="$tmpfiles l-python-1-fr.po" cat <<\EOF > l-python-1-fr.po msgid "" msgstr "" @@ -58,17 +49,13 @@ msgid "%(oldCurrency)s is replaced by %(newCurrency)s." msgstr "%(newCurrency)s remplace %(oldCurrency)s." EOF -tmpfiles="$tmpfiles l-python-1-fr.po.tmp l-python-1-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-python-1-fr.po.tmp l-python-1-fr.po l-python-1-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-python-1-fr.po.tmp > l-python-1-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-python-1-fr.po.tmp l-python-1-fr.po l-python-1-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-python-1-fr.po.tmp > l-python-1-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-python-1-fr.po l-python-1-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-python-1" test -d l-python-1 || mkdir l-python-1 test -d l-python-1/fr || mkdir l-python-1/fr test -d l-python-1/fr/LC_MESSAGES || mkdir l-python-1/fr/LC_MESSAGES @@ -78,13 +65,12 @@ ${MSGFMT} -o l-python-1/fr/LC_MESSAGES/prog.mo l-python-1-fr.po # Test for presence of python version 2.0 or newer. (python -V) >/dev/null 2>/dev/null \ - || { echo "Skipping test: python not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: python not found"; exit 77; } case `python -c 'import sys; print sys.hexversion >= 0x20000F0'` in 1 | True) ;; - *) echo "Skipping test: python version too old"; rm -fr $tmpfiles; exit 77;; + *) echo "Skipping test: python version too old"; exit 77;; esac -tmpfiles="$tmpfiles l-python-1-prog.ok l-python-1-prog.oku l-python-1-prog.out" : ${DIFF=diff} cat <<\EOF > l-python-1-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -112,7 +98,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi else if test $LOCALE_FR = none; then @@ -121,10 +107,8 @@ else else echo "Skipping test: no traditional french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2 index 770babe..eb58c1a 100755..100644 --- a/gettext-tools/tests/lang-python-2 +++ b/gettext-tools/tests/lang-python-2 @@ -8,10 +8,6 @@ # It looks like a bug in Python's gettext.py. This here is a quick workaround: UTF8_LOCALE_UNSUPPORTED=yes -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog2.py" cat <<\EOF > prog2.py import sys import gettext @@ -28,14 +24,10 @@ print gettext.gettext("%(oldCurrency)s is replaced by %(newCurrency)s.") \ % { 'oldCurrency': "FF", 'newCurrency' : "EUR" } EOF -tmpfiles="$tmpfiles l-python-2-prog.tmp l-python-2-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-python-2-prog.tmp --omit-header --no-location prog2.py -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-python-2-prog.tmp > l-python-2-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-python-2-prog.tmp --omit-header --no-location prog2.py || exit 1 +LC_ALL=C tr -d '\r' < l-python-2-prog.tmp > l-python-2-prog.pot || exit 1 -tmpfiles="$tmpfiles l-python-2-prog.ok" cat <<EOF > l-python-2-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -54,7 +46,6 @@ EOF : ${DIFF=diff} ${DIFF} l-python-2-prog.ok l-python-2-prog.pot || exit 1 -tmpfiles="$tmpfiles l-python-2-fr.po" cat <<\EOF > l-python-2-fr.po msgid "" msgstr "" @@ -77,17 +68,13 @@ msgid "%(oldCurrency)s is replaced by %(newCurrency)s." msgstr "%(newCurrency)s remplace %(oldCurrency)s." EOF -tmpfiles="$tmpfiles l-python-2-fr.po.tmp l-python-2-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-python-2-fr.po.tmp l-python-2-fr.po l-python-2-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-python-2-fr.po.tmp > l-python-2-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-python-2-fr.po.tmp l-python-2-fr.po l-python-2-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-python-2-fr.po.tmp > l-python-2-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-python-2-fr.po l-python-2-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-python-2" test -d l-python-2 || mkdir l-python-2 test -d l-python-2/fr || mkdir l-python-2/fr test -d l-python-2/fr/LC_MESSAGES || mkdir l-python-2/fr/LC_MESSAGES @@ -97,13 +84,12 @@ ${MSGFMT} -o l-python-2/fr/LC_MESSAGES/prog.mo l-python-2-fr.po # Test for presence of python version 2.3 or newer. (python -V) >/dev/null 2>/dev/null \ - || { echo "Skipping test: python not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: python not found"; exit 77; } case `python -c 'import sys; print sys.hexversion >= 0x20300F0'` in 1 | True) ;; - *) echo "Skipping test: python version too old"; rm -fr $tmpfiles; exit 77;; + *) echo "Skipping test: python version too old"; exit 77;; esac -tmpfiles="$tmpfiles l-python-2-prog.ok l-python-2-prog.oku l-python-2-prog.out" : ${DIFF=diff} cat <<\EOF > l-python-2-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -133,7 +119,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi else if test $LOCALE_FR = none; then @@ -142,10 +128,8 @@ else else echo "Skipping test: no traditional french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-rst b/gettext-tools/tests/lang-rst index baee2db..95fc934 100755..100644 --- a/gettext-tools/tests/lang-rst +++ b/gettext-tools/tests/lang-rst @@ -3,10 +3,6 @@ # Test of gettext facilities in the RST format. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.rst" cat <<\EOF > prog.rst # From the rstconv program itself. rstconv.help='rstconv [-h|--help] Displays this help'#10+ @@ -23,14 +19,10 @@ rstconv.NoOutFilename='No output filename specified' rstconv.InvalidOutputFormat='Invalid output format -' EOF -tmpfiles="$tmpfiles l-rst-prog.tmp l-rst-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-rst-prog.tmp --omit-header --add-location prog.rst -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-rst-prog.tmp > l-rst-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-rst-prog.tmp --omit-header --add-location prog.rst || exit 1 +LC_ALL=C tr -d '\r' < l-rst-prog.tmp > l-rst-prog.pot || exit 1 -tmpfiles="$tmpfiles l-rst-prog.ok" cat <<EOF > l-rst-prog.ok #: rstconv.help msgid "" @@ -69,11 +61,9 @@ ${DIFF} l-rst-prog.ok l-rst-prog.pot || exit 1 # - no line wrapping in fpc versions < 2.6.0 # - extra newline at the end -tmpfiles="$tmpfiles l-rst-prog.pot" : ${RSTCONV=rstconv} if (${RSTCONV} -o l-rst-prog.pot -i prog.rst) >/dev/null 2>&1; then -tmpfiles="$tmpfiles l-rst-prog.ok1" cat <<EOF > l-rst-prog.ok1 #: rstconv:help msgid "rstconv [-h|--help] Displays this help\nrstconv options Convert rst file\n\nOptions are:\n -i file Use specified file instead of stdin as input .rst (OPTIONAL)\n -o file Write output to specified file (REQUIRED)\n -f format Specifies the output format:\n po GNU gettext .po (portable) format (DEFAULT)\n" @@ -97,7 +87,6 @@ msgstr "" EOF -tmpfiles="$tmpfiles l-rst-prog.ok2" cat <<EOF > l-rst-prog.ok2 #: rstconv:help msgid "" @@ -134,6 +123,4 @@ ${DIFF} l-rst-prog.ok1 l-rst-prog.pot >/dev/null || ${DIFF} l-rst-prog.ok2 l-rst fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh index 6cf43f6..a4bb1fd 100755..100644 --- a/gettext-tools/tests/lang-sh +++ b/gettext-tools/tests/lang-sh @@ -8,10 +8,6 @@ # Note: This test fails on BeOS because there all locales use the UTF-8 # encoding, even the locale fr_FR, thus the output comes out in UTF-8. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.sh" cat <<\EOF > prog.sh #! /bin/sh @@ -29,14 +25,10 @@ $echo "`gettext \"'Your command, please?', asked the waiter.\"`" $echo "`eval_ngettext \"a piece of cake\" \"\\$n pieces of cake\" $n`" EOF -tmpfiles="$tmpfiles l-sh-prog.tmp l-sh-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-sh-prog.tmp --omit-header --no-location prog.sh -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-sh-prog.tmp > l-sh-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-sh-prog.tmp --omit-header --no-location prog.sh || exit 1 +LC_ALL=C tr -d '\r' < l-sh-prog.tmp > l-sh-prog.pot || exit 1 -tmpfiles="$tmpfiles l-sh-prog.ok" cat <<\EOF > l-sh-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -51,7 +43,6 @@ EOF : ${DIFF=diff} ${DIFF} l-sh-prog.ok l-sh-prog.pot || exit 1 -tmpfiles="$tmpfiles l-sh-fr.po" cat <<\EOF > l-sh-fr.po msgid "" msgstr "" @@ -69,17 +60,13 @@ msgstr[0] "un morceau de gateau" msgstr[1] "$n morceaux de gateau" EOF -tmpfiles="$tmpfiles l-sh-fr.po.tmp l-sh-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-sh-fr.po.tmp l-sh-fr.po l-sh-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-sh-fr.po.tmp > l-sh-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-sh-fr.po.tmp l-sh-fr.po l-sh-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-sh-fr.po.tmp > l-sh-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-sh-fr.po l-sh-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-sh" test -d l-sh || mkdir l-sh test -d l-sh/fr || mkdir l-sh/fr test -d l-sh/fr/LC_MESSAGES || mkdir l-sh/fr/LC_MESSAGES @@ -112,10 +99,9 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles l-sh-prog.ok l-sh-prog.oku l-sh-prog.out" : ${DIFF=diff} cat <<\EOF > l-sh-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -137,6 +123,4 @@ if test $LOCALE_FR_UTF8 != none; then ${DIFF} l-sh-prog.oku l-sh-prog.out || exit 1 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk index 448badf..799ee69 100755..100644 --- a/gettext-tools/tests/lang-smalltalk +++ b/gettext-tools/tests/lang-smalltalk @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: smalltalk. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.st" cat <<\EOF > prog.st PackageLoader fileInPackage: 'I18N' ! @@ -34,14 +30,10 @@ run Main new run! EOF -tmpfiles="$tmpfiles l-smalltalk-prog.tmp l-smalltalk-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-smalltalk-prog.tmp --omit-header --no-location prog.st -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-smalltalk-prog.tmp > l-smalltalk-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-smalltalk-prog.tmp --omit-header --no-location prog.st || exit 1 +LC_ALL=C tr -d '\r' < l-smalltalk-prog.tmp > l-smalltalk-prog.pot || exit 1 -tmpfiles="$tmpfiles l-smalltalk-prog.ok" cat <<EOF > l-smalltalk-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -60,7 +52,6 @@ EOF : ${DIFF=diff} ${DIFF} l-smalltalk-prog.ok l-smalltalk-prog.pot || exit 1 -tmpfiles="$tmpfiles l-smalltalk-fr.po" cat <<\EOF > l-smalltalk-fr.po msgid "" msgstr "" @@ -83,17 +74,13 @@ msgid "%1 is replaced by %2." msgstr "%2 remplace %1." EOF -tmpfiles="$tmpfiles l-smalltalk-fr.po.tmp l-smalltalk-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-smalltalk-fr.po.tmp l-smalltalk-fr.po l-smalltalk-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-smalltalk-fr.po.tmp > l-smalltalk-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-smalltalk-fr.po.tmp l-smalltalk-fr.po l-smalltalk-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-smalltalk-fr.po.tmp > l-smalltalk-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-smalltalk-fr.po l-smalltalk-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-smalltalk" test -d l-smalltalk || mkdir l-smalltalk test -d l-smalltalk/fr || mkdir l-smalltalk/fr test -d l-smalltalk/fr/LC_MESSAGES || mkdir l-smalltalk/fr/LC_MESSAGES @@ -103,13 +90,12 @@ ${MSGFMT} -o l-smalltalk/fr/LC_MESSAGES/prog.mo l-smalltalk-fr.po # Test for presence of gst version 2.0.6 or newer. (gst --version) >/dev/null 2>/dev/null \ - || { echo "Skipping test: gst not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: gst not found"; exit 77; } case `gst --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'` in 0.* | 1.* | 2.0 | 2.0.[0-5] | 2.1 | 2.1.[0-1]) - echo "Skipping test: gst version too old"; rm -fr $tmpfiles; exit 77;; + echo "Skipping test: gst version too old"; exit 77;; esac -tmpfiles="$tmpfiles l-smalltalk-prog.ok l-smalltalk-prog.oku l-smalltalk-prog.ok2 l-smalltalk-prog.oku2 l-smalltalk-prog.ok3 l-smalltalk-prog.oku3 l-smalltalk-prog.out" : ${DIFF=diff} cat <<\EOF > l-smalltalk-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -151,9 +137,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl index 4f8416d..d05ebeb 100755..100644 --- a/gettext-tools/tests/lang-tcl +++ b/gettext-tools/tests/lang-tcl @@ -12,10 +12,6 @@ # Note: This test fails on Cygwin 1.7.2 in the fr_FR.UTF-8 locale but not # in the fr_FR.ISO-8859-1 locale. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles program.tcl" cat <<\EOF > program.tcl #!/usr/bin/env tclsh package require msgcat @@ -25,14 +21,10 @@ puts [_ "'Your command, please?', asked the waiter."] puts [format [::msgcat::mc "%s is replaced by %s."] "FF" "EUR"] EOF -tmpfiles="$tmpfiles l-tcl-prog.tmp l-tcl-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-tcl-prog.tmp --omit-header -k_ program.tcl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-tcl-prog.tmp > l-tcl-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-tcl-prog.tmp --omit-header -k_ program.tcl || exit 1 +LC_ALL=C tr -d '\r' < l-tcl-prog.tmp > l-tcl-prog.pot || exit 1 -tmpfiles="$tmpfiles l-tcl-prog.ok" cat <<EOF > l-tcl-prog.ok #: program.tcl:5 msgid "'Your command, please?', asked the waiter." @@ -47,7 +39,6 @@ EOF : ${DIFF=diff} ${DIFF} l-tcl-prog.ok l-tcl-prog.pot || exit 1 -tmpfiles="$tmpfiles l-tcl-fr.po" cat <<\EOF > l-tcl-fr.po msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -63,17 +54,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-tcl-fr.po.tmp l-tcl-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-tcl-fr.po.tmp l-tcl-fr.po l-tcl-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-tcl-fr.po.tmp > l-tcl-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-tcl-fr.po.tmp l-tcl-fr.po l-tcl-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-tcl-fr.po.tmp > l-tcl-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-tcl-fr.po l-tcl-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-tcl" test -d l-tcl || mkdir l-tcl test -d l-tcl/msgs || mkdir l-tcl/msgs @@ -81,17 +68,15 @@ test -d l-tcl/msgs || mkdir l-tcl/msgs ${MSGFMT} --tcl -d l-tcl/msgs -l fr l-tcl-fr.po || exit 1 # Test for presence of tclsh with msgcat extension. -tmpfiles="$tmpfiles l-tcl-version.tcl" cat <<\EOF > l-tcl-version.tcl package require msgcat puts $tcl_version EOF (tclsh l-tcl-version.tcl) >/dev/null 2>/dev/null \ || { echo "Skipping test: tclsh not found or msgcat extension not present" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles l-tcl-prog.ok l-tcl-prog.oku l-tcl-prog.out" : ${DIFF=diff} cat <<\EOF > l-tcl-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -120,9 +105,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala index 096fd3e..e442928 100644 --- a/gettext-tools/tests/lang-vala +++ b/gettext-tools/tests/lang-vala @@ -5,10 +5,6 @@ # Assumes an fr_FR locale is installed. # Assumes the following packages are installed: vala. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles l-vala-prog.vala" cat <<\EOF > l-vala-prog.vala int main (string[] args) { Intl.setlocale (LocaleCategory.ALL, ""); @@ -23,21 +19,16 @@ EOF # Test for presence of valac. (valac --version) >/dev/null 2>/dev/null test $? -le 1 \ - || { echo "Skipping test: valac not found"; rm -fr $tmpfiles; exit 77; } + || { echo "Skipping test: valac not found"; exit 77; } -tmpfiles="$tmpfiles l-vala-prog.vala l-vala-prog.c l-vala-prog l-vala-prog.err" : ${VALAC=valac} ${VALAC} --Xcc=-DGETTEXT_PACKAGE=\"prog\" l-vala-prog.vala 2>l-vala-prog.err \ || { cat l-vala-prog.err 1>&2; exit 1; } -tmpfiles="$tmpfiles l-vala-prog.tmp l-vala-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-vala-prog.tmp --omit-header --no-location l-vala-prog.vala -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-vala-prog.tmp > l-vala-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-vala-prog.tmp --omit-header --no-location l-vala-prog.vala || exit 1 +LC_ALL=C tr -d '\r' < l-vala-prog.tmp > l-vala-prog.pot || exit 1 -tmpfiles="$tmpfiles l-vala-prog.ok" cat <<EOF > l-vala-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -50,7 +41,6 @@ EOF : ${DIFF=diff} ${DIFF} l-vala-prog.ok l-vala-prog.pot || exit 1 -tmpfiles="$tmpfiles l-vala-fr.po" cat <<\EOF > l-vala-fr.po msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -64,17 +54,13 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles l-vala-fr.po.tmp l-vala-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-vala-fr.po.tmp l-vala-fr.po l-vala-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-vala-fr.po.tmp > l-vala-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-vala-fr.po.tmp l-vala-fr.po l-vala-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-vala-fr.po.tmp > l-vala-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-vala-fr.po l-vala-fr.po.new || exit 1 -tmpfiles="$tmpfiles l-vala" test -d l-vala || mkdir l-vala test -d l-vala/fr || mkdir l-vala/fr test -d l-vala/fr/LC_MESSAGES || mkdir l-vala/fr/LC_MESSAGES @@ -82,7 +68,6 @@ test -d l-vala/fr/LC_MESSAGES || mkdir l-vala/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o l-vala/fr/LC_MESSAGES/prog.mo l-vala-fr.po -tmpfiles="$tmpfiles l-vala-prog.ok l-vala-prog.oku l-vala-prog.out" : ${DIFF=diff} cat <<\EOF > l-vala-prog.ok Votre commande, s'il vous plait, dit le garon. @@ -117,9 +102,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/lang-ycp b/gettext-tools/tests/lang-ycp index 01b9b3a..fba8b12 100755..100644 --- a/gettext-tools/tests/lang-ycp +++ b/gettext-tools/tests/lang-ycp @@ -3,10 +3,6 @@ # Test of gettext facilities in the YCP language. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles prog.ycp" cat <<\EOF > prog.ycp { textdomain "prog"; @@ -17,14 +13,10 @@ cat <<\EOF > prog.ycp } EOF -tmpfiles="$tmpfiles l-ycp-prog.tmp l-ycp-prog.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o l-ycp-prog.tmp --omit-header --no-location prog.ycp -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-ycp-prog.tmp > l-ycp-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o l-ycp-prog.tmp --omit-header --no-location prog.ycp || exit 1 +LC_ALL=C tr -d '\r' < l-ycp-prog.tmp > l-ycp-prog.pot || exit 1 -tmpfiles="$tmpfiles l-ycp-prog.ok" cat <<EOF > l-ycp-prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" @@ -43,7 +35,6 @@ EOF : ${DIFF=diff} ${DIFF} l-ycp-prog.ok l-ycp-prog.pot || exit 1 -tmpfiles="$tmpfiles l-ycp-fr.po" cat <<\EOF > l-ycp-fr.po msgid "" msgstr "" @@ -66,16 +57,11 @@ msgid "%1 is replaced by %2." msgstr "%2 remplace %1." EOF -tmpfiles="$tmpfiles l-ycp-fr.po.tmp l-ycp-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o l-ycp-fr.po.tmp l-ycp-fr.po l-ycp-prog.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < l-ycp-fr.po.tmp > l-ycp-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o l-ycp-fr.po.tmp l-ycp-fr.po l-ycp-prog.pot || exit 1 +LC_ALL=C tr -d '\r' < l-ycp-fr.po.tmp > l-ycp-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} l-ycp-fr.po l-ycp-fr.po.new || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/msgattrib-1 b/gettext-tools/tests/msgattrib-1 index 02ece63..72aa4f4 100755..100644 --- a/gettext-tools/tests/msgattrib-1 +++ b/gettext-tools/tests/msgattrib-1 @@ -3,10 +3,6 @@ # Test --translated option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test1.po" cat <<\EOF > ma-test1.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test1.tmp > ma-test1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --translated -o ma-test1.tmp ma-test1.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test1.tmp > ma-test1.out || exit 1 -tmpfiles="$tmpfiles ma-test1.ok" cat <<\EOF > ma-test1.ok # HEADER. # @@ -102,6 +94,4 @@ EOF ${DIFF} ma-test1.ok ma-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-10 b/gettext-tools/tests/msgattrib-10 index b639ae1..ba529db 100755..100644 --- a/gettext-tools/tests/msgattrib-10 +++ b/gettext-tools/tests/msgattrib-10 @@ -4,10 +4,6 @@ # Test --set-obsolete option. Note that the output routines drop untranslated # obsolete messages. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test10.po" cat <<\EOF > ma-test10.po # HEADER. # @@ -58,14 +54,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test10.tmp > ma-test10.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --set-obsolete -o ma-test10.tmp ma-test10.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test10.tmp > ma-test10.out || exit 1 -tmpfiles="$tmpfiles ma-test10.ok" cat <<\EOF > ma-test10.ok # HEADER. # @@ -103,6 +95,4 @@ EOF ${DIFF} ma-test10.ok ma-test10.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-11 b/gettext-tools/tests/msgattrib-11 index 9184309..d036296 100755..100644 --- a/gettext-tools/tests/msgattrib-11 +++ b/gettext-tools/tests/msgattrib-11 @@ -3,10 +3,6 @@ # Test --clear-obsolete option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test11.po" cat <<\EOF > ma-test11.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test11.tmp > ma-test11.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --clear-obsolete -o ma-test11.tmp ma-test11.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test11.tmp > ma-test11.out || exit 1 -tmpfiles="$tmpfiles ma-test11.ok" cat <<\EOF > ma-test11.ok # HEADER. # @@ -119,6 +111,4 @@ EOF ${DIFF} ma-test11.ok ma-test11.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-12 b/gettext-tools/tests/msgattrib-12 index a056b29..9587f1d 100755..100644 --- a/gettext-tools/tests/msgattrib-12 +++ b/gettext-tools/tests/msgattrib-12 @@ -3,10 +3,6 @@ # Test --fuzzy option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test12.po" cat <<\EOF > ma-test12.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test12.tmp > ma-test12.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --fuzzy -o ma-test12.tmp ma-test12.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test12.tmp > ma-test12.out || exit 1 -tmpfiles="$tmpfiles ma-test12.ok" cat <<\EOF > ma-test12.ok # HEADER. # @@ -86,6 +78,4 @@ EOF ${DIFF} ma-test12.ok ma-test12.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-13 b/gettext-tools/tests/msgattrib-13 index 90d68c6..f352983 100755..100644 --- a/gettext-tools/tests/msgattrib-13 +++ b/gettext-tools/tests/msgattrib-13 @@ -3,10 +3,6 @@ # Test --obsolete option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test13.po" cat <<\EOF > ma-test13.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test13.tmp > ma-test13.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --obsolete -o ma-test13.tmp ma-test13.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test13.tmp > ma-test13.out || exit 1 -tmpfiles="$tmpfiles ma-test13.ok" cat <<\EOF > ma-test13.ok # HEADER. # @@ -93,6 +85,4 @@ EOF ${DIFF} ma-test13.ok ma-test13.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-14 b/gettext-tools/tests/msgattrib-14 index 507f83d..7c811c6 100755..100644 --- a/gettext-tools/tests/msgattrib-14 +++ b/gettext-tools/tests/msgattrib-14 @@ -3,10 +3,6 @@ # Test combination of selection and manipulation option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test14.po" cat <<\EOF > ma-test14.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test14.tmp > ma-test14.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.tmp ma-test14.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test14.tmp > ma-test14.out || exit 1 -tmpfiles="$tmpfiles ma-test14.ok" cat <<\EOF > ma-test14.ok # HEADER. # @@ -89,6 +81,4 @@ EOF ${DIFF} ma-test14.ok ma-test14.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-15 b/gettext-tools/tests/msgattrib-15 index 5ddf085..d32e534 100755..100644 --- a/gettext-tools/tests/msgattrib-15 +++ b/gettext-tools/tests/msgattrib-15 @@ -3,10 +3,6 @@ # Test msgattrib on a PO file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test15.po" cat <<\EOF > ma-test15.po msgid "" msgstr "" @@ -52,17 +48,12 @@ msgstr "photocopieur" #~ msgstr "Enregistrer sous" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test15.tmp > ma-test15.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --clear-fuzzy -o ma-test15.tmp ma-test15.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test15.tmp > ma-test15.out || exit 1 : ${DIFF=diff} ${DIFF} ma-test15.po ma-test15.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-16 b/gettext-tools/tests/msgattrib-16 index f88b545..72fefd1 100755..100644 --- a/gettext-tools/tests/msgattrib-16 +++ b/gettext-tools/tests/msgattrib-16 @@ -3,10 +3,6 @@ # Test msgattrib on a PO file with previous msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test16.po" cat <<\EOF > ma-test16.po msgid "" msgstr "" @@ -45,14 +41,10 @@ msgstr "Argumente fehlen." #~ msgstr "%s: ung端ltige Option -- %c\n" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test16.tmp > ma-test16.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --fuzzy -o ma-test16.tmp ma-test16.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test16.tmp > ma-test16.out || exit 1 -tmpfiles="$tmpfiles ma-test16.ok" cat <<\EOF > ma-test16.ok msgid "" msgstr "" @@ -83,6 +75,4 @@ EOF ${DIFF} ma-test16.ok ma-test16.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-17 b/gettext-tools/tests/msgattrib-17 index 22835dc..fcfe915 100755..100644 --- a/gettext-tools/tests/msgattrib-17 +++ b/gettext-tools/tests/msgattrib-17 @@ -3,10 +3,6 @@ # Test msgattrib option --clear-previous. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test17.po" cat <<\EOF > ma-test17.po msgid "" msgstr "" @@ -45,14 +41,10 @@ msgstr "Argumente fehlen." #~ msgstr "%s: ung端ltige Option -- %c\n" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test17.tmp > ma-test17.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --clear-previous -o ma-test17.tmp ma-test17.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test17.tmp > ma-test17.out || exit 1 -tmpfiles="$tmpfiles ma-test17.ok" cat <<\EOF > ma-test17.ok msgid "" msgstr "" @@ -91,6 +83,4 @@ EOF ${DIFF} ma-test17.ok ma-test17.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-2 b/gettext-tools/tests/msgattrib-2 index adfcb4e..0ee4f5a 100755..100644 --- a/gettext-tools/tests/msgattrib-2 +++ b/gettext-tools/tests/msgattrib-2 @@ -3,10 +3,6 @@ # Test --untranslated option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test2.po" cat <<\EOF > ma-test2.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test2.tmp > ma-test2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --untranslated -o ma-test2.tmp ma-test2.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test2.tmp > ma-test2.out || exit 1 -tmpfiles="$tmpfiles ma-test2.ok" cat <<\EOF > ma-test2.ok # HEADER. # @@ -96,6 +88,4 @@ EOF ${DIFF} ma-test2.ok ma-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-3 b/gettext-tools/tests/msgattrib-3 index 50bf750..784da59 100755..100644 --- a/gettext-tools/tests/msgattrib-3 +++ b/gettext-tools/tests/msgattrib-3 @@ -3,10 +3,6 @@ # Test --no-fuzzy option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test3.po" cat <<\EOF > ma-test3.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test3.tmp > ma-test3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --no-fuzzy -o ma-test3.tmp ma-test3.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test3.tmp > ma-test3.out || exit 1 -tmpfiles="$tmpfiles ma-test3.ok" cat <<\EOF > ma-test3.ok # HEADER. # @@ -110,6 +102,4 @@ EOF ${DIFF} ma-test3.ok ma-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-4 b/gettext-tools/tests/msgattrib-4 index bf0b476..913d148 100755..100644 --- a/gettext-tools/tests/msgattrib-4 +++ b/gettext-tools/tests/msgattrib-4 @@ -3,10 +3,6 @@ # Test --only-fuzzy option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test4.po" cat <<\EOF > ma-test4.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test4.tmp > ma-test4.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --only-fuzzy -o ma-test4.tmp ma-test4.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test4.tmp > ma-test4.out || exit 1 -tmpfiles="$tmpfiles ma-test4.ok" cat <<\EOF > ma-test4.ok # HEADER. # @@ -88,6 +80,4 @@ EOF ${DIFF} ma-test4.ok ma-test4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-5 b/gettext-tools/tests/msgattrib-5 index f6953a9..56ef8ff 100755..100644 --- a/gettext-tools/tests/msgattrib-5 +++ b/gettext-tools/tests/msgattrib-5 @@ -3,10 +3,6 @@ # Test --no-obsolete option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test5.po" cat <<\EOF > ma-test5.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test5.tmp > ma-test5.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --no-obsolete -o ma-test5.tmp ma-test5.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test5.tmp > ma-test5.out || exit 1 -tmpfiles="$tmpfiles ma-test5.ok" cat <<\EOF > ma-test5.ok # HEADER. # @@ -105,6 +97,4 @@ EOF ${DIFF} ma-test5.ok ma-test5.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-6 b/gettext-tools/tests/msgattrib-6 index 411e695..5a9965d 100755..100644 --- a/gettext-tools/tests/msgattrib-6 +++ b/gettext-tools/tests/msgattrib-6 @@ -3,10 +3,6 @@ # Test --only-obsolete option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test6.po" cat <<\EOF > ma-test6.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test6.tmp > ma-test6.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --only-obsolete -o ma-test6.tmp ma-test6.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test6.tmp > ma-test6.out || exit 1 -tmpfiles="$tmpfiles ma-test6.ok" cat <<\EOF > ma-test6.ok # HEADER. # @@ -93,6 +85,4 @@ EOF ${DIFF} ma-test6.ok ma-test6.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-7 b/gettext-tools/tests/msgattrib-7 index 8aeed0f..0584c9e 100755..100644 --- a/gettext-tools/tests/msgattrib-7 +++ b/gettext-tools/tests/msgattrib-7 @@ -3,10 +3,6 @@ # Test combination of two selection options. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test7.po" cat <<\EOF > ma-test7.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test7.tmp > ma-test7.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --translated --only-obsolete -o ma-test7.tmp ma-test7.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test7.tmp > ma-test7.out || exit 1 -tmpfiles="$tmpfiles ma-test7.ok" cat <<\EOF > ma-test7.ok # HEADER. # @@ -93,6 +85,4 @@ EOF ${DIFF} ma-test7.ok ma-test7.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-8 b/gettext-tools/tests/msgattrib-8 index d3e356b..c187dd6 100755..100644 --- a/gettext-tools/tests/msgattrib-8 +++ b/gettext-tools/tests/msgattrib-8 @@ -4,10 +4,6 @@ # Test --set-fuzzy option. Note that the output routines ignore the fuzzy # attribute for untranslated messages. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test8.po" cat <<\EOF > ma-test8.po # HEADER. # @@ -58,14 +54,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test8.tmp > ma-test8.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --set-fuzzy -o ma-test8.tmp ma-test8.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test8.tmp > ma-test8.out || exit 1 -tmpfiles="$tmpfiles ma-test8.ok" cat <<\EOF > ma-test8.ok # HEADER. # @@ -125,6 +117,4 @@ EOF ${DIFF} ma-test8.ok ma-test8.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-9 b/gettext-tools/tests/msgattrib-9 index 8920b2a..8269652 100755..100644 --- a/gettext-tools/tests/msgattrib-9 +++ b/gettext-tools/tests/msgattrib-9 @@ -3,10 +3,6 @@ # Test --clear-fuzzy option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-test9.po" cat <<\EOF > ma-test9.po # HEADER. # @@ -57,14 +53,10 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -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; } -LC_ALL=C tr -d '\r' < ma-test9.tmp > ma-test9.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --clear-fuzzy -o ma-test9.tmp ma-test9.po || exit 1 +LC_ALL=C tr -d '\r' < ma-test9.tmp > ma-test9.out || exit 1 -tmpfiles="$tmpfiles ma-test9.ok" cat <<\EOF > ma-test9.ok # HEADER. # @@ -117,6 +109,4 @@ EOF ${DIFF} ma-test9.ok ma-test9.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgattrib-properties-1 b/gettext-tools/tests/msgattrib-properties-1 index 2286b61..4a5c523 100755..100644 --- a/gettext-tools/tests/msgattrib-properties-1 +++ b/gettext-tools/tests/msgattrib-properties-1 @@ -3,10 +3,6 @@ # Test --translated option with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles ma-s-1.properties" cat <<\EOF > ma-s-1.properties # HEADER. # @@ -33,14 +29,10 @@ with\ wives\ who\ never\ understand=und ihre Frauen verstehen sie nicht !They\ warn\ you\ and\ darn\ you= EOF -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; } -LC_ALL=C tr -d '\r' < ma-s-1.tmp > ma-s-1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.tmp ma-s-1.properties || exit 1 +LC_ALL=C tr -d '\r' < ma-s-1.tmp > ma-s-1.out || exit 1 -tmpfiles="$tmpfiles ma-s-1.ok" cat <<\EOF > ma-s-1.ok # HEADER. # @@ -58,6 +50,4 @@ EOF ${DIFF} ma-s-1.ok ma-s-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-1 b/gettext-tools/tests/msgcat-1 index b4ab067..189c95b 100755..100644 --- a/gettext-tools/tests/msgcat-1 +++ b/gettext-tools/tests/msgcat-1 @@ -4,10 +4,6 @@ # Verify that msgcat doesn't introduce alternative syntax if all translations # have the same msgstr. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test1.in1 mcat-test1.in2" cat <<EOF > mcat-test1.in1 msgid "" msgstr "" @@ -42,14 +38,10 @@ msgid "1" msgstr "eins" EOF -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; } -LC_ALL=C tr -d '\r' < mcat-test1.tmp > mcat-test1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} -o mcat-test1.tmp mcat-test1.in1 mcat-test1.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test1.tmp > mcat-test1.out || exit 1 -tmpfiles="$tmpfiles mcat-test1.ok" cat << EOF > mcat-test1.ok msgid "" msgstr "" @@ -71,6 +63,4 @@ EOF ${DIFF} mcat-test1.ok mcat-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-10 b/gettext-tools/tests/msgcat-10 index d501a77..624d8c3 100755..100644 --- a/gettext-tools/tests/msgcat-10 +++ b/gettext-tools/tests/msgcat-10 @@ -7,10 +7,6 @@ # translator attention; in other words, an msgstr which is valid in both input # files is also valid in the result. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test10.in1 mcat-test10.in2" cat <<\EOF > mcat-test10.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -60,17 +56,13 @@ msgstr "" "Glckwunsch!" EOF -tmpfiles="$tmpfiles mcat-test10.tmp mcat-test10.out" rm -f mcat-test10.tmp : ${MSGCAT=msgcat} ${MSGCAT} --more-than=0 -o mcat-test10.tmp \ - mcat-test10.in1 mcat-test10.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test10.tmp > mcat-test10.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcat-test10.in1 mcat-test10.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test10.tmp > mcat-test10.out || exit 1 -tmpfiles="$tmpfiles mcat-test10.ok" cat <<\EOF > mcat-test10.ok # #-#-#-#-# mcat-test10.in1 (xyz) #-#-#-#-# # German message file for xyz. @@ -104,6 +96,4 @@ EOF ${DIFF} mcat-test10.ok mcat-test10.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-11 b/gettext-tools/tests/msgcat-11 index 5c75430..24854b6 100755..100644 --- a/gettext-tools/tests/msgcat-11 +++ b/gettext-tools/tests/msgcat-11 @@ -4,10 +4,6 @@ # Verify that msgcat leaves #: lines in place even if they have a bizarre # syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test11.in" cat <<\EOF > mcat-test11.in #: basctl/source\basicide\basidesh.src#RID_STR_NOMODULE.text msgid "Simple" @@ -34,17 +30,12 @@ msgid "whenever" msgstr "immer" EOF -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; } -LC_ALL=C tr -d '\r' < mcat-test11.tmp > mcat-test11.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} -o mcat-test11.tmp mcat-test11.in || exit 1 +LC_ALL=C tr -d '\r' < mcat-test11.tmp > mcat-test11.out || exit 1 : ${DIFF=diff} ${DIFF} mcat-test11.in mcat-test11.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-12 b/gettext-tools/tests/msgcat-12 index a0677c7..31a1528 100755..100644 --- a/gettext-tools/tests/msgcat-12 +++ b/gettext-tools/tests/msgcat-12 @@ -3,10 +3,6 @@ # Verify that msgcat complains when it would need to change msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test12.in1 mcat-test12.in2" cat <<\EOF > mcat-test12.in1 msgid "" msgstr "" @@ -45,12 +41,9 @@ msgid "Oc copier" msgstr "photocopieur Oc" EOF -tmpfiles="$tmpfiles mcat-test12.out" rm -f mcat-test12.out : ${MSGCAT=msgcat} ${MSGCAT} -o mcat-test12.out mcat-test12.in1 mcat-test12.in2 2>/dev/null -test $? = 1 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +test $? = 1 || { exit 1; } exit 0 diff --git a/gettext-tools/tests/msgcat-13 b/gettext-tools/tests/msgcat-13 index 4a6616c..9f972eb 100755..100644 --- a/gettext-tools/tests/msgcat-13 +++ b/gettext-tools/tests/msgcat-13 @@ -3,10 +3,6 @@ # Test msgcat on PO files with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test13.in1 mcat-test13.in2" cat <<\EOF > mcat-test13.in1 msgid "" msgstr "" @@ -69,15 +65,11 @@ msgstr "photocopieur" #~ msgstr "Enregistrer l'as" EOF -tmpfiles="$tmpfiles mcat-test13.tmp mcat-test13.out" 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; } -LC_ALL=C tr -d '\r' < mcat-test13.tmp > mcat-test13.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} -o mcat-test13.tmp mcat-test13.in1 mcat-test13.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test13.tmp > mcat-test13.out || exit 1 -tmpfiles="$tmpfiles mcat-test13.ok" cat <<\EOF > mcat-test13.ok msgid "" msgstr "" @@ -137,6 +129,4 @@ EOF ${DIFF} mcat-test13.ok mcat-test13.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-14 b/gettext-tools/tests/msgcat-14 index d3844c7..475e9e6 100755..100644 --- a/gettext-tools/tests/msgcat-14 +++ b/gettext-tools/tests/msgcat-14 @@ -3,10 +3,6 @@ # Verify that msgcat complains when it would need to change msgctxts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test14.in1 mcat-test14.in2" cat <<\EOF > mcat-test14.in1 msgid "" msgstr "" @@ -69,12 +65,9 @@ msgstr "photocopieur" #~ msgstr "Enregistrer l'as" EOF -tmpfiles="$tmpfiles mcat-test14.out" rm -f mcat-test14.out : ${MSGCAT=msgcat} ${MSGCAT} -o mcat-test14.out mcat-test14.in1 mcat-test14.in2 2>/dev/null -test $? = 1 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +test $? = 1 || { exit 1; } exit 0 diff --git a/gettext-tools/tests/msgcat-15 b/gettext-tools/tests/msgcat-15 index 44f164f..046502c 100755..100644 --- a/gettext-tools/tests/msgcat-15 +++ b/gettext-tools/tests/msgcat-15 @@ -3,10 +3,6 @@ # Test msgcat on a PO file with previous msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test15.in" cat <<\EOF > mcat-test15.in msgid "" msgstr "" @@ -45,27 +41,20 @@ msgstr "Argumente fehlen." #~ msgstr "%s: ung端ltige Option -- %c\n" EOF -tmpfiles="$tmpfiles mcat-test15.tmp1 mcat-test15.out1" rm -f mcat-test15.tmp1 : ${MSGCAT=msgcat} -${MSGCAT} -o mcat-test15.tmp1 mcat-test15.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} -o mcat-test15.tmp1 mcat-test15.in || exit 1 +LC_ALL=C tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1 || exit 1 : ${DIFF=diff} ${DIFF} mcat-test15.in mcat-test15.out1 result=$? -tmpfiles="$tmpfiles mcat-test15.tmp2 mcat-test15.out2" rm -f mcat-test15.tmp2 : ${MSGCAT=msgcat} -${MSGCAT} --indent -o mcat-test15.tmp2 mcat-test15.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} --indent -o mcat-test15.tmp2 mcat-test15.in || exit 1 +LC_ALL=C tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2 || exit 1 -tmpfiles="$tmpfiles mcat-test15.ok" cat <<\EOF > mcat-test15.ok msgid "" msgstr "Report-Msgid-Bugs-To: \n" @@ -107,6 +96,4 @@ EOF ${DIFF} mcat-test15.ok mcat-test15.out2 result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-16 b/gettext-tools/tests/msgcat-16 index 44dbaab..7a8a479 100755..100644 --- a/gettext-tools/tests/msgcat-16 +++ b/gettext-tools/tests/msgcat-16 @@ -3,10 +3,6 @@ # Test msgcat on a PO files with previous msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test16.in1" cat <<\EOF > mcat-test16.in1 msgid "" msgstr "" @@ -30,7 +26,6 @@ msgid "Missing arguments." msgstr "Argumente fehlen." EOF -tmpfiles="$tmpfiles mcat-test16.in2" cat <<\EOF > mcat-test16.in2 msgid "" msgstr "" @@ -46,15 +41,11 @@ msgid "too large arguments" msgstr "zu wenige Argumente" EOF -tmpfiles="$tmpfiles mcat-test16.tmp mcat-test16.out" 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; } -LC_ALL=C tr -d '\r' < mcat-test16.tmp > mcat-test16.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} -o mcat-test16.tmp mcat-test16.in1 mcat-test16.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test16.tmp > mcat-test16.out || exit 1 -tmpfiles="$tmpfiles mcat-test16.ok" cat <<\EOF > mcat-test16.ok msgid "" msgstr "" @@ -85,6 +76,4 @@ EOF ${DIFF} mcat-test16.ok mcat-test16.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-17 b/gettext-tools/tests/msgcat-17 index 86189a6..40bc785 100755..100644 --- a/gettext-tools/tests/msgcat-17 +++ b/gettext-tools/tests/msgcat-17 @@ -3,10 +3,6 @@ # Test msgcat with --width option. Check that format strings are not broken. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test17.in" cat <<\EOF > mcat-test17.in msgid "" msgstr "" @@ -22,15 +18,11 @@ msgid "write error of a big result on a too small disk% s% s" msgstr "Fehler beim Schreiben eines groen Ergebnisses auf eine zu kleine Platte% s% smit der jederzeitigen M旦glichkeit eines Fehlers in jedem Moment und an jeder Stelle" EOF -tmpfiles="$tmpfiles mcat-test17.tmp mcat-test17.out" rm -f mcat-test17.tmp : ${MSGCAT=msgcat} -${MSGCAT} -o mcat-test17.tmp --width=80 mcat-test17.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test17.tmp > mcat-test17.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} -o mcat-test17.tmp --width=80 mcat-test17.in || exit 1 +LC_ALL=C tr -d '\r' < mcat-test17.tmp > mcat-test17.out || exit 1 -tmpfiles="$tmpfiles mcat-test17.ok" cat <<\EOF > mcat-test17.ok msgid "" msgstr "" @@ -56,6 +48,4 @@ EOF ${DIFF} mcat-test17.ok mcat-test17.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-18 b/gettext-tools/tests/msgcat-18 index af5a188..afe9d57 100755..100644 --- a/gettext-tools/tests/msgcat-18 +++ b/gettext-tools/tests/msgcat-18 @@ -3,10 +3,6 @@ # Test msgcat: handling of 'range:' flags. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test18.in1 mcat-test18.in2" cat <<\EOF > mcat-test18.in1 msgid "one day" msgid_plural "%d days" @@ -57,15 +53,11 @@ msgstr[0] "" msgstr[1] "" EOF -tmpfiles="$tmpfiles mcat-test18.tmp mcat-test18.out" rm -f mcat-test18.tmp : ${MSGCAT=msgcat} -${MSGCAT} -o mcat-test18.tmp mcat-test18.in1 mcat-test18.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test18.tmp > mcat-test18.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} -o mcat-test18.tmp mcat-test18.in1 mcat-test18.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test18.tmp > mcat-test18.out || exit 1 -tmpfiles="$tmpfiles mcat-test18.ok" cat <<\EOF > mcat-test18.ok #, c-format msgid "one day" @@ -96,6 +88,4 @@ EOF ${DIFF} mcat-test18.ok mcat-test18.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-2 b/gettext-tools/tests/msgcat-2 index b91c25b..11439f9 100755..100644 --- a/gettext-tools/tests/msgcat-2 +++ b/gettext-tools/tests/msgcat-2 @@ -3,10 +3,6 @@ # Test handling of input files with different charsets. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test2.in1 mcat-test2.in2" cat <<\EOF > mcat-test2.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -54,7 +50,6 @@ msgid "You can log in as \"%1\"." msgstr "Sie k旦nnen sich als \"%1\" einloggen." EOF -tmpfiles="$tmpfiles mcat-test2.tmp mcat-test2.err mcat-test2.out" rm -f mcat-test2.tmp : ${MSGCAT=msgcat} @@ -63,11 +58,9 @@ ${MSGCAT} --more-than=0 -o mcat-test2.tmp \ mcat-test2.in1 mcat-test2.in2 >mcat-test2.err 2>&1 result=$? cat mcat-test2.err | grep -v 'warning: .* encodings' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test2.tmp > mcat-test2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mcat-test2.tmp > mcat-test2.out || exit 1 -tmpfiles="$tmpfiles mcat-test2.ok" cat << \EOF > mcat-test2.ok # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -100,6 +93,4 @@ EOF ${DIFF} mcat-test2.ok mcat-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-3 b/gettext-tools/tests/msgcat-3 index 7247b02..990b612 100755..100644 --- a/gettext-tools/tests/msgcat-3 +++ b/gettext-tools/tests/msgcat-3 @@ -4,10 +4,6 @@ # Test handling of input files with different charsets. # 1. ISO-8859-1, 2. UTF-8; plus --use-first -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test3.in1 mcat-test3.in2" cat <<\EOF > mcat-test3.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -55,7 +51,6 @@ msgid "You can log in as \"%1\"." msgstr "Sie k旦nnen sich als \"%1\" einloggen." EOF -tmpfiles="$tmpfiles mcat-test3.tmp mcat-test3.err mcat-test3.out" rm -f mcat-test3.tmp : ${MSGCAT=msgcat} @@ -64,11 +59,9 @@ ${MSGCAT} --use-first --more-than=0 -o mcat-test3.tmp \ mcat-test3.in1 mcat-test3.in2 >mcat-test3.err 2>&1 result=$? cat mcat-test3.err | grep -v 'warning: .* encodings' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test3.tmp > mcat-test3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mcat-test3.tmp > mcat-test3.out || exit 1 -tmpfiles="$tmpfiles mcat-test3.ok" cat << \EOF > mcat-test3.ok # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -101,6 +94,4 @@ EOF ${DIFF} mcat-test3.ok mcat-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-4 b/gettext-tools/tests/msgcat-4 index 9af0074..b593fd4 100755..100644 --- a/gettext-tools/tests/msgcat-4 +++ b/gettext-tools/tests/msgcat-4 @@ -4,10 +4,6 @@ # Test handling of input files with different charsets: # 1. UTF-8, 2. ISO-8859-1; plus --use-first -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test4.in1 mcat-test4.in2" cat <<\EOF > mcat-test4.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -55,7 +51,6 @@ msgstr "" "Glckwunsch!" EOF -tmpfiles="$tmpfiles mcat-test4.tmp mcat-test4.err mcat-test4.out" rm -f mcat-test4.tmp : ${MSGCAT=msgcat} @@ -64,11 +59,9 @@ ${MSGCAT} --use-first --more-than=0 -o mcat-test4.tmp \ mcat-test4.in1 mcat-test4.in2 >mcat-test4.err 2>&1 result=$? cat mcat-test4.err | grep -v 'warning: .* encodings' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test4.tmp > mcat-test4.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mcat-test4.tmp > mcat-test4.out || exit 1 -tmpfiles="$tmpfiles mcat-test4.ok" cat << \EOF > mcat-test4.ok # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -101,6 +94,4 @@ EOF ${DIFF} mcat-test4.ok mcat-test4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-5 b/gettext-tools/tests/msgcat-5 index 6040eee..8cdde50 100755..100644 --- a/gettext-tools/tests/msgcat-5 +++ b/gettext-tools/tests/msgcat-5 @@ -4,10 +4,6 @@ # Test handling of input files with different translations: # try --use-first -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test5.in1 mcat-test5.in2" cat <<\EOF > mcat-test5.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -56,17 +52,13 @@ msgstr "" "Herzlichen Glckwunsch!" EOF -tmpfiles="$tmpfiles mcat-test5.tmp mcat-test5.out" rm -f mcat-test5.tmp : ${MSGCAT=msgcat} ${MSGCAT} --use-first --more-than=0 -o mcat-test5.tmp \ - mcat-test5.in1 mcat-test5.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test5.tmp > mcat-test5.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcat-test5.in1 mcat-test5.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test5.tmp > mcat-test5.out || exit 1 -tmpfiles="$tmpfiles mcat-test5.ok" cat << \EOF > mcat-test5.ok # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -93,6 +85,4 @@ EOF ${DIFF} mcat-test5.ok mcat-test5.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-6 b/gettext-tools/tests/msgcat-6 index f5cff7e..dbb2cff 100755..100644 --- a/gettext-tools/tests/msgcat-6 +++ b/gettext-tools/tests/msgcat-6 @@ -4,10 +4,6 @@ # Test handling of input files with different translations: # preserve all variants, add markers -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test6.in1 mcat-test6.in2" cat <<\EOF > mcat-test6.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -56,17 +52,13 @@ msgstr "" "Herzlichen Glckwunsch!" EOF -tmpfiles="$tmpfiles mcat-test6.tmp mcat-test6.out" rm -f mcat-test6.tmp : ${MSGCAT=msgcat} ${MSGCAT} --more-than=0 -o mcat-test6.tmp \ - mcat-test6.in1 mcat-test6.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test6.tmp > mcat-test6.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcat-test6.in1 mcat-test6.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test6.tmp > mcat-test6.out || exit 1 -tmpfiles="$tmpfiles mcat-test6.ok" cat << \EOF > mcat-test6.ok # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -98,6 +90,4 @@ EOF ${DIFF} mcat-test6.ok mcat-test6.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-7 b/gettext-tools/tests/msgcat-7 index bdca902..9a11f27 100755..100644 --- a/gettext-tools/tests/msgcat-7 +++ b/gettext-tools/tests/msgcat-7 @@ -3,10 +3,6 @@ # Verify 'msgcat --sort-output' -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test7.in1" cat <<EOF > mcat-test7.in1 #: clients/inst_language.ycp:119 msgid "two" @@ -19,15 +15,11 @@ msgstr "" "1" EOF -tmpfiles="$tmpfiles mcat-test7.tmp mcat-test7.out" rm -f mcat-test7.tmp : ${MSGCAT=msgcat} -${MSGCAT} --sort-output -o mcat-test7.tmp mcat-test7.in1 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test7.tmp > mcat-test7.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} --sort-output -o mcat-test7.tmp mcat-test7.in1 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test7.tmp > mcat-test7.out || exit 1 -tmpfiles="$tmpfiles mcat-test7.ok" cat << EOF > mcat-test7.ok #: clients/inst_language.ycp:108 msgid "one" @@ -42,6 +34,4 @@ EOF ${DIFF} mcat-test7.ok mcat-test7.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-8 b/gettext-tools/tests/msgcat-8 index f3abdf4..f757138 100755..100644 --- a/gettext-tools/tests/msgcat-8 +++ b/gettext-tools/tests/msgcat-8 @@ -4,10 +4,6 @@ # Verify msgcat of two files, when the header entries have different comments # and different contents. The resulting header entry must be marked fuzzy. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test8.in1 mcat-test8.in2" cat <<\EOF > mcat-test8.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -57,17 +53,13 @@ msgstr "" "Glckwunsch!" EOF -tmpfiles="$tmpfiles mcat-test8.tmp mcat-test8.out" rm -f mcat-test8.tmp : ${MSGCAT=msgcat} ${MSGCAT} --more-than=0 -o mcat-test8.tmp \ - mcat-test8.in1 mcat-test8.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test8.tmp > mcat-test8.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcat-test8.in1 mcat-test8.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test8.tmp > mcat-test8.out || exit 1 -tmpfiles="$tmpfiles mcat-test8.ok" cat <<\EOF > mcat-test8.ok # #-#-#-#-# mcat-test8.in1 (xyz) #-#-#-#-# # German message file for xyz. @@ -112,6 +104,4 @@ EOF ${DIFF} mcat-test8.ok mcat-test8.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-9 b/gettext-tools/tests/msgcat-9 index 5178fb1..54f6cf1 100755..100644 --- a/gettext-tools/tests/msgcat-9 +++ b/gettext-tools/tests/msgcat-9 @@ -4,10 +4,6 @@ # Verify msgcat of two files, when the header entries have the same comments # but different contents. The resulting header entry must be marked fuzzy. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-test9.in1 mcat-test9.in2" cat <<\EOF > mcat-test9.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -56,17 +52,13 @@ msgstr "" "Glckwunsch!" EOF -tmpfiles="$tmpfiles mcat-test9.tmp mcat-test9.out" rm -f mcat-test9.tmp : ${MSGCAT=msgcat} ${MSGCAT} --more-than=0 -o mcat-test9.tmp \ - mcat-test9.in1 mcat-test9.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcat-test9.tmp > mcat-test9.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcat-test9.in1 mcat-test9.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-test9.tmp > mcat-test9.out || exit 1 -tmpfiles="$tmpfiles mcat-test9.ok" cat <<\EOF > mcat-test9.ok # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -104,6 +96,4 @@ EOF ${DIFF} mcat-test9.ok mcat-test9.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-properties-1 b/gettext-tools/tests/msgcat-properties-1 index 73a16f8..1c53524 100755..100644 --- a/gettext-tools/tests/msgcat-properties-1 +++ b/gettext-tools/tests/msgcat-properties-1 @@ -3,10 +3,6 @@ # Test --use-first option with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-p-1.in1 mcat-p-1.in2" cat <<\EOF > mcat-p-1.in1 #. Help text (HTML-like) START #: clients/inst_ask_config.ycp:119 @@ -19,17 +15,13 @@ cat <<\EOF > mcat-p-1.in2 Congratulations\!=Herzlichen Gl\u00fcckwunsch\! EOF -tmpfiles="$tmpfiles mcat-p-1.tmp mcat-p-1.out" rm -f mcat-p-1.tmp : ${MSGCAT=msgcat} ${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; } -LC_ALL=C tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -o mcat-p-1.tmp mcat-p-1.in1 mcat-p-1.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out || exit 1 -tmpfiles="$tmpfiles mcat-p-1.ok" cat << \EOF > mcat-p-1.ok #. Help text (HTML-like) START #: clients/inst_ask_config.ycp:119 @@ -40,6 +32,4 @@ EOF ${DIFF} mcat-p-1.ok mcat-p-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-properties-2 b/gettext-tools/tests/msgcat-properties-2 index 4b29ff0..3c57dea 100755..100644 --- a/gettext-tools/tests/msgcat-properties-2 +++ b/gettext-tools/tests/msgcat-properties-2 @@ -4,25 +4,17 @@ # Test conversion from UTF-8 to BIG5 is a NOP with Java .properties syntax. # Test that encoding names are case insensitive. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-p-2.properties" cat <<\EOF > mcat-p-2.properties #: src/msgcmp.c:155 src/msgmerge.c:273 exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6307\u5b9a\u5169\u500b\u8f38\u5165\u6a94 EOF -tmpfiles="$tmpfiles mcat-p-2.out" : ${MSGCAT=msgcat} -${MSGCAT} --properties-input --properties-output -t Big5 -o mcat-p-2.out mcat-p-2.properties -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} --properties-input --properties-output -t Big5 -o mcat-p-2.out mcat-p-2.properties || exit 1 : ${DIFF=diff} # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes. ${DIFF} mcat-p-2.properties mcat-p-2.out >/dev/null result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcat-stringtable-1 b/gettext-tools/tests/msgcat-stringtable-1 index a227a48..2ab9295 100755..100644 --- a/gettext-tools/tests/msgcat-stringtable-1 +++ b/gettext-tools/tests/msgcat-stringtable-1 @@ -3,10 +3,6 @@ # Test reading in NeXTstep/GNUstep .strings syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcat-s-1.in" cat <<\EOF > mcat-s-1.in /* This is an example of a string table file. Everything inside a comment is completely ignored, even if in "quotes", or \escape characters, etc. @@ -28,18 +24,15 @@ is completely ignored, even if in "quotes", or \escape characters, etc. "hoe322070.element"; EOF -tmpfiles="$tmpfiles mcat-s-1.tmp mcat-s-1.err mcat-s-1.out" rm -f mcat-s-1.tmp : ${MSGCAT=msgcat} LC_MESSAGES=C LC_ALL= \ ${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; } -LC_ALL=C tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out || exit 1 -tmpfiles="$tmpfiles mcat-s-1.ok" cat << \EOF > mcat-s-1.ok # This is an example of a string table file. Everything inside a comment # is completely ignored, even if in "quotes", or \escape characters, etc. @@ -70,6 +63,4 @@ EOF ${DIFF} mcat-s-1.ok mcat-s-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcmp-1 b/gettext-tools/tests/msgcmp-1 index e354dd6..17f70aa 100755..100644 --- a/gettext-tools/tests/msgcmp-1 +++ b/gettext-tools/tests/msgcmp-1 @@ -3,10 +3,6 @@ # Test a succeeding comparison. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mc-test1.in1 mc-test1.in2" cat <<EOF > mc-test1.in1 msgid "one" msgstr "first" msgid "two" msgstr "second" @@ -23,6 +19,4 @@ EOF ${MSGCMP} mc-test1.in1 mc-test1.in2 > /dev/null 2>&1 result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcmp-2 b/gettext-tools/tests/msgcmp-2 index f0443b3..9adc651 100755..100644 --- a/gettext-tools/tests/msgcmp-2 +++ b/gettext-tools/tests/msgcmp-2 @@ -3,10 +3,6 @@ # Test a failing comparison. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mc-test2.in1 mc-test2.in2" cat <<EOF > mc-test2.in1 msgid "one" msgstr "first" msgid "two" msgstr "second" @@ -20,12 +16,10 @@ msgid "one" msgstr "" msgid "two" msgstr "" 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|' -e 's|^msgcmp\.exe|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test2.out -tmpfiles="$tmpfiles mc-test2.ok" cat <<EOF > mc-test2.ok mc-test2.in2:1: this message is used but not defined... mc-test2.in1:3: ...but this definition is similar @@ -37,6 +31,4 @@ EOF ${DIFF} mc-test2.ok mc-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcmp-3 b/gettext-tools/tests/msgcmp-3 index ec19ae7..e303ff0 100755..100644 --- a/gettext-tools/tests/msgcmp-3 +++ b/gettext-tools/tests/msgcmp-3 @@ -3,10 +3,6 @@ # Test a failing comparison with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mc-test3.in1 mc-test3.in2" cat <<EOF > mc-test3.in1 one=first two=second @@ -20,12 +16,10 @@ cat <<EOF > mc-test3.in2 !two= 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|' -e 's|^msgcmp\.exe|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test3.out -tmpfiles="$tmpfiles mc-test3.ok" cat <<EOF > mc-test3.ok mc-test3.in2:1: this message is used but not defined... mc-test3.in1:3: ...but this definition is similar @@ -37,6 +31,4 @@ EOF ${DIFF} mc-test3.ok mc-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcmp-4 b/gettext-tools/tests/msgcmp-4 index ad1e707..1f80683 100755..100644 --- a/gettext-tools/tests/msgcmp-4 +++ b/gettext-tools/tests/msgcmp-4 @@ -4,10 +4,6 @@ # Test comparison with PO files with previous msgids. # Test --use-fuzzy option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mc-test4.pot" cat <<\EOF > mc-test4.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -46,7 +42,6 @@ msgid "Missing arguments." msgstr "" EOF -tmpfiles="$tmpfiles mc-test4.po1" cat <<\EOF > mc-test4.po1 msgid "" msgstr "" @@ -89,25 +84,20 @@ msgstr "%s: ung端ltige Option -- %c\n" EOF # Verify that with fuzzies, all msgids of the POT file are covered. -tmpfiles="$tmpfiles mc-test4.out11" : ${MSGCMP=msgcmp} LC_MESSAGES=C LC_ALL= \ -${MSGCMP} --use-fuzzy mc-test4.po1 mc-test4.pot > mc-test4.out11 2>&1 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCMP} --use-fuzzy mc-test4.po1 mc-test4.pot > mc-test4.out11 2>&1 || exit 1 if grep -v 'warning:' mc-test4.out11 > /dev/null; then - rm -fr $tmpfiles; exit 1; + exit 1; fi # Verify that without fuzzies, not all msgids of the POT file are covered. -tmpfiles="$tmpfiles mc-test4.out12" : ${MSGCMP=msgcmp} LC_MESSAGES=C LC_ALL= \ ${MSGCMP} mc-test4.po1 mc-test4.pot > mc-test4.out12 2>&1 -test $? = 1 || { rm -fr $tmpfiles; exit 1; } -grep -v 'warning:' mc-test4.out12 > /dev/null -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $? = 1 || { exit 1; } +grep -v 'warning:' mc-test4.out12 > /dev/null || exit 1 -tmpfiles="$tmpfiles mc-test4.po2" cat <<\EOF > mc-test4.po2 msgid "" msgstr "" @@ -152,15 +142,11 @@ EOF # Verify that without fuzzies, all msgids of the POT file are covered. # Verify that previous msgids are ignored even when specified on non-fuzzy # messages. -tmpfiles="$tmpfiles mc-test4.out2" : ${MSGCMP=msgcmp} LC_MESSAGES=C LC_ALL= \ -${MSGCMP} mc-test4.po2 mc-test4.pot > mc-test4.out2 2>&1 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCMP} mc-test4.po2 mc-test4.pot > mc-test4.out2 2>&1 || exit 1 if grep -v 'warning:' mc-test4.out2 > /dev/null; then - rm -fr $tmpfiles; exit 1; + exit 1; fi -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-1 b/gettext-tools/tests/msgcomm-1 index 8eaabb0..52b8e0a 100755..100644 --- a/gettext-tools/tests/msgcomm-1 +++ b/gettext-tools/tests/msgcomm-1 @@ -3,10 +3,6 @@ # Test --more-than=0 option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test1.in1 mcomm-test1.in2" cat <<EOF > mcomm-test1.in1 #: first.c:123 msgid "1" @@ -19,14 +15,10 @@ msgid "2" msgstr "2x" EOF -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; } -LC_ALL=C tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} --more-than=0 -o mcomm-test1.tmp mcomm-test1.in1 mcomm-test1.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out || exit 1 -tmpfiles="$tmpfiles mcomm-test1.ok" cat << EOF > mcomm-test1.ok #: first.c:123 msgid "1" @@ -41,6 +33,4 @@ EOF ${DIFF} mcomm-test1.ok mcomm-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-10 b/gettext-tools/tests/msgcomm-10 index 443fa86..71402f4 100755..100644 --- a/gettext-tools/tests/msgcomm-10 +++ b/gettext-tools/tests/msgcomm-10 @@ -3,10 +3,6 @@ # Test merge of common entries with --more-than=1 and --omit-header. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test10.in1 mcomm-test10.in2" cat <<EOF > mcomm-test10.in1 msgid "" msgstr "" @@ -41,15 +37,11 @@ msgid "1" msgstr "" EOF -tmpfiles="$tmpfiles mcomm-test10.tmp mcomm-test10.out" : ${MSGCOMM=msgcomm} ${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; } -LC_ALL=C tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test10.in1 mcomm-test10.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out || exit 1 -tmpfiles="$tmpfiles mcomm-test10.ok" cat << EOF > mcomm-test10.ok msgid "1" msgstr "1x" @@ -59,6 +51,4 @@ EOF ${DIFF} mcomm-test10.ok mcomm-test10.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-11 b/gettext-tools/tests/msgcomm-11 index 0820872..7994cec 100755..100644 --- a/gettext-tools/tests/msgcomm-11 +++ b/gettext-tools/tests/msgcomm-11 @@ -3,10 +3,6 @@ # Test that --more-than=1 drops entries which occur only once. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test11.in1 mcomm-test11.in2" cat <<EOF > mcomm-test11.in1 msgid "" msgstr "" @@ -45,15 +41,11 @@ msgid "1" msgstr "" EOF -tmpfiles="$tmpfiles mcomm-test11.tmp mcomm-test11.out" : ${MSGCOMM=msgcomm} ${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; } -LC_ALL=C tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test11.in1 mcomm-test11.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out || exit 1 -tmpfiles="$tmpfiles mcomm-test11.ok" cat << EOF > mcomm-test11.ok msgid "1" msgstr "1x" @@ -63,6 +55,4 @@ EOF ${DIFF} mcomm-test11.ok mcomm-test11.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-12 b/gettext-tools/tests/msgcomm-12 index 675d651..3f494f3 100755..100644 --- a/gettext-tools/tests/msgcomm-12 +++ b/gettext-tools/tests/msgcomm-12 @@ -4,12 +4,8 @@ # Test that --less-than=2 removes entries which occur twice and keeps entries # which occur only once. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # unique msg in in3 -tmpfiles="$tmpfiles mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3" cat <<EOF > mcomm-test12.in1 msgid "" msgstr "" @@ -64,18 +60,14 @@ msgid "2" msgstr "" EOF -tmpfiles="$tmpfiles mcomm-test12.tmp mcomm-test12.out" : ${MSGCOMM=msgcomm} # --unique is shorthand for --less-than=2; do we've to test both # switches? Are 'for' loops allowed? -ke- ${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; } -LC_ALL=C tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out || exit 1 -tmpfiles="$tmpfiles mcomm-test12.ok" cat << EOF > mcomm-test12.ok msgid "" msgstr "" @@ -97,6 +89,4 @@ EOF ${DIFF} mcomm-test12.ok mcomm-test12.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-13 b/gettext-tools/tests/msgcomm-13 index 3bf7737..04eebb4 100755..100644 --- a/gettext-tools/tests/msgcomm-13 +++ b/gettext-tools/tests/msgcomm-13 @@ -3,13 +3,9 @@ # Test that --less-than=2 removes entries which occur more than twice. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # one msg occurs 3 times (has to go away). # An unique msg in in3 has to stay. -tmpfiles="$tmpfiles mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3" cat <<EOF > mcomm-test13.in1 msgid "" msgstr "" @@ -67,18 +63,14 @@ msgid "2" msgstr "" EOF -tmpfiles="$tmpfiles mcomm-test13.tmp mcomm-test13.out" : ${MSGCOMM=msgcomm} # --unique is shorthand for --less-than=2; do we've to test both # switches? Are 'for' loops allowed? -ke- ${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; } -LC_ALL=C tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out || exit 1 -tmpfiles="$tmpfiles mcomm-test13.ok" cat << EOF > mcomm-test13.ok msgid "" msgstr "" @@ -100,6 +92,4 @@ EOF ${DIFF} mcomm-test13.ok mcomm-test13.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-14 b/gettext-tools/tests/msgcomm-14 index 10e688a..6741a5a 100755..100644 --- a/gettext-tools/tests/msgcomm-14 +++ b/gettext-tools/tests/msgcomm-14 @@ -3,13 +3,9 @@ # Test --force-po option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # no unique msg in input files. # without --force-po don't create any PO file; cf. msgcomm-15 -tmpfiles="$tmpfiles mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3" cat <<EOF > mcomm-test14.in1 msgid "" msgstr "" @@ -62,18 +58,14 @@ msgid "1" msgstr "" EOF -tmpfiles="$tmpfiles mcomm-test14.tmp mcomm-test14.out" : ${MSGCOMM=msgcomm} # --unique is shorthand for --less-than=2; do we've to test both # switches? Are 'for' loops allowed? -ke- ${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; } -LC_ALL=C tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out || exit 1 -tmpfiles="$tmpfiles mcomm-test14.ok" cat << EOF > mcomm-test14.ok msgid "" msgstr "" @@ -91,6 +83,4 @@ EOF ${DIFF} mcomm-test14.ok mcomm-test14.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-15 b/gettext-tools/tests/msgcomm-15 index e85bdd3..291e349 100755..100644 --- a/gettext-tools/tests/msgcomm-15 +++ b/gettext-tools/tests/msgcomm-15 @@ -4,13 +4,9 @@ # Test that without --force-po option, a PO file without translations is # not created. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # no unique msg in input files. # with --force-po create an empty PO file; cf. msgcomm-14 -tmpfiles="$tmpfiles mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3" cat <<EOF > mcomm-test15.in1 msgid "" msgstr "" @@ -63,7 +59,6 @@ msgid "1" msgstr "" EOF -tmpfiles="$tmpfiles mcomm-test15.out" rm -f mcomm-test15.out : ${MSGCOMM=msgcomm} @@ -71,8 +66,7 @@ rm -f mcomm-test15.out # --unique is shorthand for --less-than=2; do we've to test both # switches? Are 'for' loops allowed? -ke- ${MSGCOMM} --less-than=2 --no-location -o mcomm-test15.out \ - mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3 || exit 1 # we've no unique msg; thus no PO should be created. if test -f mcomm-test15.out; then @@ -82,6 +76,4 @@ else result=0 fi -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-16 b/gettext-tools/tests/msgcomm-16 index 7ebe18b..f0a3b13 100755..100644 --- a/gettext-tools/tests/msgcomm-16 +++ b/gettext-tools/tests/msgcomm-16 @@ -3,10 +3,6 @@ # Test handling of input files with different charsets. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test16.in1 mcomm-test16.in2" cat <<\EOF > mcomm-test16.in1 # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -54,7 +50,6 @@ msgid "You can log in as \"%1\"." msgstr "Sie k旦nnen sich als \"%1\" einloggen." EOF -tmpfiles="$tmpfiles mcomm-test16.tmp mcomm-test16.err mcomm-test16.out" rm -f mcomm-test16.tmp : ${MSGCOMM=msgcomm} @@ -63,11 +58,9 @@ ${MSGCOMM} --more-than=0 -o mcomm-test16.tmp \ mcomm-test16.in1 mcomm-test16.in2 >mcomm-test16.err 2>&1 result=$? cat mcomm-test16.err | grep -v 'warning: .* encodings' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out || exit 1 -tmpfiles="$tmpfiles mcomm-test16.ok" cat << \EOF > mcomm-test16.ok # German message file for xyz. # Copyright (C) 1999, 2000, 2001 xyz. @@ -100,6 +93,4 @@ EOF ${DIFF} mcomm-test16.ok mcomm-test16.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-17 b/gettext-tools/tests/msgcomm-17 index 67dfe0d..1867fe9 100755..100644 --- a/gettext-tools/tests/msgcomm-17 +++ b/gettext-tools/tests/msgcomm-17 @@ -5,10 +5,6 @@ # entries only (entries occurring less than 2 times). But don't drop the # header entry; otherwise msgcomm will fail for multibyte strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3" cat <<EOF > mcomm-test17.in1 msgid "" msgstr "" @@ -66,17 +62,13 @@ msgid "5" msgstr "fnf" EOF -tmpfiles="$tmpfiles mcomm-test17.tmp mcomm-test17.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} -u \ -o mcomm-test17.tmp \ - mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out || exit 1 -tmpfiles="$tmpfiles mcomm-test17.ok" cat << \EOF > mcomm-test17.ok msgid "" msgstr "" @@ -99,6 +91,4 @@ EOF ${DIFF} mcomm-test17.ok mcomm-test17.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-18 b/gettext-tools/tests/msgcomm-18 index 0c929ed..d57af85 100755..100644 --- a/gettext-tools/tests/msgcomm-18 +++ b/gettext-tools/tests/msgcomm-18 @@ -3,10 +3,6 @@ # Test --more-than=0; identical message are wanted once only. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test18.in1 mcomm-test18.in2" cat <<EOF > mcomm-test18.in1 # Sure. #: first.c:123 @@ -21,14 +17,10 @@ msgid "1" msgstr "1x" EOF -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; } -LC_ALL=C tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} --more-than=0 -o mcomm-test18.tmp mcomm-test18.in1 mcomm-test18.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out || exit 1 -tmpfiles="$tmpfiles mcomm-test18.ok" cat << EOF > mcomm-test18.ok # Sure. #: first.c:123 hunt.c:759 @@ -40,6 +32,4 @@ EOF ${DIFF} mcomm-test18.ok mcomm-test18.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-19 b/gettext-tools/tests/msgcomm-19 index d7b4ad9..2587bc4 100755..100644 --- a/gettext-tools/tests/msgcomm-19 +++ b/gettext-tools/tests/msgcomm-19 @@ -4,10 +4,6 @@ # Test --more-than=0; identical message are wanted once only. # If the first occurrence is fuzzy, keep the fuzzy mark. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test19.in1 mcomm-test19.in2" cat <<EOF > mcomm-test19.in1 # Not sure. #: first.c:123 @@ -23,14 +19,10 @@ msgid "1" msgstr "1x" EOF -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; } -LC_ALL=C tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} --more-than=0 -o mcomm-test19.tmp mcomm-test19.in1 mcomm-test19.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out || exit 1 -tmpfiles="$tmpfiles mcomm-test19.ok" cat << EOF > mcomm-test19.ok # Not sure. #: first.c:123 hunt.c:759 @@ -43,6 +35,4 @@ EOF ${DIFF} mcomm-test19.ok mcomm-test19.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-2 b/gettext-tools/tests/msgcomm-2 index be2b073..ae26bd0 100755..100644 --- a/gettext-tools/tests/msgcomm-2 +++ b/gettext-tools/tests/msgcomm-2 @@ -3,10 +3,6 @@ # Test --no-location option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test2.in1 mcomm-test2.in2" cat <<EOF > mcomm-test2.in1 #: first.c:123 msgid "1" @@ -19,15 +15,11 @@ msgid "2" msgstr "2x" EOF -tmpfiles="$tmpfiles mcomm-test2.tmp mcomm-test2.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 --no-location -o mcomm-test2.tmp \ - mcomm-test2.in1 mcomm-test2.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test2.in1 mcomm-test2.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out || exit 1 -tmpfiles="$tmpfiles mcomm-test2.ok" cat << EOF > mcomm-test2.ok msgid "1" msgstr "1x" @@ -40,6 +32,4 @@ EOF ${DIFF} mcomm-test2.ok mcomm-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-20 b/gettext-tools/tests/msgcomm-20 index e78ead1..69b2ff1 100755..100644 --- a/gettext-tools/tests/msgcomm-20 +++ b/gettext-tools/tests/msgcomm-20 @@ -4,10 +4,6 @@ # Test --more-than=0; identical message are wanted once only. # If the first occurrence is not fuzzy, don't make the result fuzzy. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test20.in1 mcomm-test20.in2" cat <<EOF > mcomm-test20.in1 # Sure. #: first.c:123 @@ -23,15 +19,11 @@ msgid "1" msgstr "1x" EOF -tmpfiles="$tmpfiles mcomm-test20.tmp mcomm-test20.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 -o mcomm-test20.tmp \ - mcomm-test20.in1 mcomm-test20.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test20.in1 mcomm-test20.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out || exit 1 -tmpfiles="$tmpfiles mcomm-test20.ok" cat << EOF > mcomm-test20.ok # Sure. #: first.c:123 hunt.c:759 @@ -43,6 +35,4 @@ EOF ${DIFF} mcomm-test20.ok mcomm-test20.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21 index a3ed946..9d3adc2 100755..100644 --- a/gettext-tools/tests/msgcomm-21 +++ b/gettext-tools/tests/msgcomm-21 @@ -4,10 +4,6 @@ # Test --more-than=0; identical message are wanted once only. # If both occurrences are fuzzy, keep the fuzzy mark. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test21.in1 mcomm-test21.in2" cat <<EOF > mcomm-test21.in1 # Not sure. #: first.c:123 @@ -24,14 +20,10 @@ msgid "1" msgstr "1x" EOF -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; } -LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out || exit 1 -tmpfiles="$tmpfiles mcomm-test21.ok" cat << EOF > mcomm-test21.ok # Not sure. #: first.c:123 hunt.c:759 @@ -44,6 +36,4 @@ EOF ${DIFF} mcomm-test21.ok mcomm-test21.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-22 b/gettext-tools/tests/msgcomm-22 index 7b49062..6b07432 100755..100644 --- a/gettext-tools/tests/msgcomm-22 +++ b/gettext-tools/tests/msgcomm-22 @@ -3,10 +3,6 @@ # Verify that the header entry is kept, otherwise the encoding is unknown. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test22.in1 mcomm-test22.in2" cat <<\EOF > mcomm-test22.in1 # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -63,18 +59,14 @@ msgid "memory exhausted" msgstr "virtueller Speicher erschpft" EOF -tmpfiles="$tmpfiles mcomm-test22.tmp mcomm-test22.out" rm -f mcomm-test22.tmp : ${MSGCOMM=msgcomm} ${MSGCOMM} --less-than=2 -o mcomm-test22.tmp \ - mcomm-test22.in1 mcomm-test22.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test22.in1 mcomm-test22.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out || exit 1 -tmpfiles="$tmpfiles mcomm-test22.ok" cat << \EOF > mcomm-test22.ok # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -116,6 +108,4 @@ EOF ${DIFF} mcomm-test22.ok mcomm-test22.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-23 b/gettext-tools/tests/msgcomm-23 index ccc0846..c9d7846 100755..100644 --- a/gettext-tools/tests/msgcomm-23 +++ b/gettext-tools/tests/msgcomm-23 @@ -3,24 +3,15 @@ # "msgcomm INPUT INPUT" is equivalent to "msguniq INPUT" -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-23.in1 mcomm-23.in2" cp "$abs_srcdir"/msguniq-a.in mcomm-23.in1 cp "$abs_srcdir"/msguniq-a.in mcomm-23.in2 -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; } -LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} -w 1000 -o mcomm-23.tmp mcomm-23.in1 mcomm-23.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out || exit 1 : ${DIFF=diff} ${DIFF} "$abs_srcdir"/msguniq-a.out mcomm-23.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-24 b/gettext-tools/tests/msgcomm-24 index 6eddf8d..f56f378 100755..100644 --- a/gettext-tools/tests/msgcomm-24 +++ b/gettext-tools/tests/msgcomm-24 @@ -3,10 +3,6 @@ # Test --more-than=0 option with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test24.in1 mcomm-test24.in2" cat <<EOF > mcomm-test24.in1 #: first.c:123 1=1x @@ -17,14 +13,10 @@ cat <<EOF > mcomm-test24.in2 2=2x EOF -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; } -LC_ALL=C tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} --more-than=0 --properties-input --properties-output -o mcomm-test24.tmp mcomm-test24.in1 mcomm-test24.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out || exit 1 -tmpfiles="$tmpfiles mcomm-test24.ok" cat << EOF > mcomm-test24.ok #: first.c:123 1=1x @@ -37,6 +29,4 @@ EOF ${DIFF} mcomm-test24.ok mcomm-test24.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-25 b/gettext-tools/tests/msgcomm-25 index 8196dd3..0b766b6 100755..100644 --- a/gettext-tools/tests/msgcomm-25 +++ b/gettext-tools/tests/msgcomm-25 @@ -3,10 +3,6 @@ # Test msgcomm on PO files with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test25.in1 mcomm-test25.in2" cat <<\EOF > mcomm-test25.in1 msgid "" msgstr "" @@ -69,14 +65,10 @@ msgstr "photocopieur" #~ msgstr "Enregistrer l'as" EOF -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; } -LC_ALL=C tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} --more-than=0 -o mcomm-test25.tmp mcomm-test25.in1 mcomm-test25.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out || exit 1 -tmpfiles="$tmpfiles mcomm-test25.ok" cat <<\EOF > mcomm-test25.ok msgid "" msgstr "" @@ -126,6 +118,4 @@ EOF ${DIFF} mcomm-test25.ok mcomm-test25.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-26 b/gettext-tools/tests/msgcomm-26 index ef9df7b..dfb3ab9 100755..100644 --- a/gettext-tools/tests/msgcomm-26 +++ b/gettext-tools/tests/msgcomm-26 @@ -3,10 +3,6 @@ # Test msgcomm on PO files with previous msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test26.in1" cat <<\EOF > mcomm-test26.in1 msgid "" msgstr "" @@ -45,7 +41,6 @@ msgid "%s: invalid option -- %c\n" msgstr "%s: ung端ltige Option -- %c\n" EOF -tmpfiles="$tmpfiles mcomm-test26.in2" cat <<\EOF > mcomm-test26.in2 msgid "" msgstr "" @@ -72,14 +67,10 @@ msgid "%s: illegal option -- %c\n" msgstr "%s: ung端ltige Optionen -- %c\n" EOF -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; } -LC_ALL=C tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} -o mcomm-test26.tmp mcomm-test26.in1 mcomm-test26.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out || exit 1 -tmpfiles="$tmpfiles mcomm-test26.ok" cat <<\EOF > mcomm-test26.ok msgid "" msgstr "" @@ -110,6 +101,4 @@ EOF ${DIFF} mcomm-test26.ok mcomm-test26.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-27 b/gettext-tools/tests/msgcomm-27 index 7115e3d..b11a0eb 100755..100644 --- a/gettext-tools/tests/msgcomm-27 +++ b/gettext-tools/tests/msgcomm-27 @@ -3,10 +3,6 @@ # Test handling of format and 'range:' flag. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test27.in1 mcomm-test27.in2" cat <<EOF > mcomm-test27.in1 msgid "one day" msgid_plural "%d days" @@ -57,14 +53,10 @@ msgstr[0] "" msgstr[1] "" EOF -tmpfiles="$tmpfiles mcomm-test27.tmp mcomm-test27.out" : ${MSGCOMM=msgcomm} -${MSGCOMM} -o mcomm-test27.tmp mcomm-test27.in1 mcomm-test27.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test27.tmp > mcomm-test27.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCOMM} -o mcomm-test27.tmp mcomm-test27.in1 mcomm-test27.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test27.tmp > mcomm-test27.out || exit 1 -tmpfiles="$tmpfiles mcomm-test27.ok" cat << EOF > mcomm-test27.ok #, c-format msgid "one day" @@ -95,6 +87,4 @@ EOF ${DIFF} mcomm-test27.ok mcomm-test27.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-3 b/gettext-tools/tests/msgcomm-3 index 5d82f7a..d5871e5 100755..100644 --- a/gettext-tools/tests/msgcomm-3 +++ b/gettext-tools/tests/msgcomm-3 @@ -3,10 +3,6 @@ # Test --omit-header option when there is no header. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test3.in1 mcomm-test3.in2" cat <<EOF > mcomm-test3.in1 #: first.c:123 msgid "1" @@ -19,15 +15,11 @@ msgid "2" msgstr "2x" EOF -tmpfiles="$tmpfiles mcomm-test3.tmp mcomm-test3.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test3.tmp \ - mcomm-test3.in1 mcomm-test3.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test3.in1 mcomm-test3.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out || exit 1 -tmpfiles="$tmpfiles mcomm-test3.ok" cat << EOF > mcomm-test3.ok #: first.c:123 msgid "1" @@ -42,6 +34,4 @@ EOF ${DIFF} mcomm-test3.ok mcomm-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-4 b/gettext-tools/tests/msgcomm-4 index a419fa7..de9c9c1 100755..100644 --- a/gettext-tools/tests/msgcomm-4 +++ b/gettext-tools/tests/msgcomm-4 @@ -3,10 +3,6 @@ # Test what happens with the header entry. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test4.in1 mcomm-test4.in2" cat <<EOF > mcomm-test4.in1 msgid "" msgstr "" @@ -30,15 +26,11 @@ msgid "2" msgstr "2x" EOF -tmpfiles="$tmpfiles mcomm-test4.tmp mcomm-test4.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 -o mcomm-test4.tmp \ - mcomm-test4.in1 mcomm-test4.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test4.in1 mcomm-test4.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out || exit 1 -tmpfiles="$tmpfiles mcomm-test4.ok" cat << EOF > mcomm-test4.ok msgid "" msgstr "" @@ -64,6 +56,4 @@ EOF ${DIFF} mcomm-test4.ok mcomm-test4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-5 b/gettext-tools/tests/msgcomm-5 index b3159e9..d17467d 100755..100644 --- a/gettext-tools/tests/msgcomm-5 +++ b/gettext-tools/tests/msgcomm-5 @@ -3,10 +3,6 @@ # Test --omit-header option when there is a header. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test5.in1 mcomm-test5.in2" cat <<EOF > mcomm-test5.in1 msgid "" msgstr "" @@ -30,15 +26,11 @@ msgid "2" msgstr "2x" EOF -tmpfiles="$tmpfiles mcomm-test5.tmp mcomm-test5.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test5.tmp \ - mcomm-test5.in1 mcomm-test5.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test5.in1 mcomm-test5.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out || exit 1 -tmpfiles="$tmpfiles mcomm-test5.ok" cat << EOF > mcomm-test5.ok #: first.c:123 msgid "1" @@ -53,6 +45,4 @@ EOF ${DIFF} mcomm-test5.ok mcomm-test5.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-6 b/gettext-tools/tests/msgcomm-6 index 1abfa4f..9b0a5a1 100755..100644 --- a/gettext-tools/tests/msgcomm-6 +++ b/gettext-tools/tests/msgcomm-6 @@ -3,10 +3,6 @@ # Test --no-location option when there is a header. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test6.in1 mcomm-test6.in2" cat <<EOF > mcomm-test6.in1 msgid "" msgstr "" @@ -30,15 +26,11 @@ msgid "2" msgstr "2x" EOF -tmpfiles="$tmpfiles mcomm-test6.tmp mcomm-test6.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=0 --no-location -o mcomm-test6.tmp \ - mcomm-test6.in1 mcomm-test6.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test6.in1 mcomm-test6.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out || exit 1 -tmpfiles="$tmpfiles mcomm-test6.ok" cat << EOF > mcomm-test6.ok msgid "" msgstr "" @@ -62,6 +54,4 @@ EOF ${DIFF} mcomm-test6.ok mcomm-test6.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-7 b/gettext-tools/tests/msgcomm-7 index 776b4b7..1b5c812 100755..100644 --- a/gettext-tools/tests/msgcomm-7 +++ b/gettext-tools/tests/msgcomm-7 @@ -3,10 +3,6 @@ # Test --no-location and --omit-header options together. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test7.in1 mcomm-test7.in2" cat <<EOF > mcomm-test7.in1 msgid "" msgstr "" @@ -30,15 +26,11 @@ msgid "2" msgstr "2x" EOF -tmpfiles="$tmpfiles mcomm-test7.tmp mcomm-test7.out" : ${MSGCOMM=msgcomm} ${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; } -LC_ALL=C tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test7.in1 mcomm-test7.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out || exit 1 -tmpfiles="$tmpfiles mcomm-test7.ok" cat << EOF > mcomm-test7.ok msgid "1" msgstr "1x" @@ -51,6 +43,4 @@ EOF ${DIFF} mcomm-test7.ok mcomm-test7.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-8 b/gettext-tools/tests/msgcomm-8 index 0c58289..e08e70f 100755..100644 --- a/gettext-tools/tests/msgcomm-8 +++ b/gettext-tools/tests/msgcomm-8 @@ -3,10 +3,6 @@ # Test merge of common entries with --more-than=1. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test8.in1 mcomm-test8.in2" cat <<EOF > mcomm-test8.in1 msgid "" msgstr "" @@ -41,15 +37,11 @@ msgid "1" msgstr "" EOF -tmpfiles="$tmpfiles mcomm-test8.tmp mcomm-test8.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=1 -o mcomm-test8.tmp \ - mcomm-test8.in1 mcomm-test8.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test8.in1 mcomm-test8.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out || exit 1 -tmpfiles="$tmpfiles mcomm-test8.ok" cat << EOF > mcomm-test8.ok msgid "" msgstr "" @@ -71,6 +63,4 @@ EOF ${DIFF} mcomm-test8.ok mcomm-test8.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgcomm-9 b/gettext-tools/tests/msgcomm-9 index b6da6db..632ec1f 100755..100644 --- a/gettext-tools/tests/msgcomm-9 +++ b/gettext-tools/tests/msgcomm-9 @@ -3,10 +3,6 @@ # Test merge of common entries with --more-than=1 and --no-location. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mcomm-test9.in1 mcomm-test9.in2" cat <<EOF > mcomm-test9.in1 msgid "" msgstr "" @@ -41,15 +37,11 @@ msgid "1" msgstr "" EOF -tmpfiles="$tmpfiles mcomm-test9.tmp mcomm-test9.out" : ${MSGCOMM=msgcomm} ${MSGCOMM} --more-than=1 --no-location -o mcomm-test9.tmp \ - mcomm-test9.in1 mcomm-test9.in2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mcomm-test9.in1 mcomm-test9.in2 || exit 1 +LC_ALL=C tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out || exit 1 -tmpfiles="$tmpfiles mcomm-test9.ok" cat << EOF > mcomm-test9.ok msgid "" msgstr "" @@ -70,6 +62,4 @@ EOF ${DIFF} mcomm-test9.ok mcomm-test9.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgconv-1 b/gettext-tools/tests/msgconv-1 index b38864f..148f982 100755..100644 --- a/gettext-tools/tests/msgconv-1 +++ b/gettext-tools/tests/msgconv-1 @@ -3,10 +3,6 @@ # Test conversion from BIG5 to UTF-8. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mco-test1.po" cat <<\EOF > mco-test1.po # Chinese translation for GNU gettext messages. # @@ -21,12 +17,9 @@ msgid "exactly 2 input files required" msgstr "好\犹櫚n螟nw皚喊蕕J隻" EOF -tmpfiles="$tmpfiles mco-test1.out" : ${MSGCONV=msgconv} -${MSGCONV} --to-code=UTF-8 -o mco-test1.out mco-test1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCONV} --to-code=UTF-8 -o mco-test1.out mco-test1.po || exit 1 -tmpfiles="$tmpfiles mco-test1.ok" cat <<\EOF > mco-test1.ok # Chinese translation for GNU gettext messages. # @@ -46,6 +39,4 @@ EOF ${DIFF} mco-test1.ok mco-test1.out >/dev/null result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2 index e3f5232..936197c 100755..100644 --- a/gettext-tools/tests/msgconv-2 +++ b/gettext-tools/tests/msgconv-2 @@ -4,10 +4,6 @@ # Test conversion from UTF-8 to BIG5. # Test that encoding names are case insensitive. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mco-test2.po" cat <<\EOF > mco-test2.po # Chinese translation for GNU gettext messages. # @@ -22,12 +18,9 @@ msgid "exactly 2 input files required" msgstr "罩ゅ初荀医ソ絎莠後ユ" EOF -tmpfiles="$tmpfiles mco-test2.out" : ${MSGCONV=msgconv} -${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po || exit 1 -tmpfiles="$tmpfiles mco-test2.ok" cat <<\EOF > mco-test2.ok # Chinese translation for GNU gettext messages. # @@ -47,6 +40,4 @@ EOF ${DIFF} mco-test2.ok mco-test2.out >/dev/null result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgconv-3 b/gettext-tools/tests/msgconv-3 index 8b8c2e2..ac44d96 100755..100644 --- a/gettext-tools/tests/msgconv-3 +++ b/gettext-tools/tests/msgconv-3 @@ -3,10 +3,6 @@ # Test failing conversion from ISO-8859-15 to ISO-8859-1. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mco-test3.po" cat <<\EOF > mco-test3.po msgid "" msgstr "" @@ -24,12 +20,9 @@ msgid "Werk" msgstr "uvre" EOF -tmpfiles="$tmpfiles mco-test3.out" : ${MSGCONV=msgconv} ${MSGCONV} -t ISO-8859-1 mco-test3.po -o mco-test3.out 2>/dev/null test $? = 1 result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgconv-4 b/gettext-tools/tests/msgconv-4 index 469a3b8..b901142 100755..100644 --- a/gettext-tools/tests/msgconv-4 +++ b/gettext-tools/tests/msgconv-4 @@ -4,25 +4,17 @@ # Test conversion from UTF-8 to BIG5 is a NOP with Java .properties syntax. # Test that encoding names are case insensitive. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mco-test4.properties" cat <<\EOF > mco-test4.properties #: src/msgcmp.c:155 src/msgmerge.c:273 exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6307\u5b9a\u5169\u500b\u8f38\u5165\u6a94 EOF -tmpfiles="$tmpfiles mco-test4.out" : ${MSGCONV=msgconv} -${MSGCONV} --properties-input --properties-output -t Big5 -o mco-test4.out mco-test4.properties -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCONV} --properties-input --properties-output -t Big5 -o mco-test4.out mco-test4.properties || exit 1 : ${DIFF=diff} # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes. ${DIFF} mco-test4.properties mco-test4.out >/dev/null result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgconv-5 b/gettext-tools/tests/msgconv-5 index dcf52bd..800805f 100755..100644 --- a/gettext-tools/tests/msgconv-5 +++ b/gettext-tools/tests/msgconv-5 @@ -3,10 +3,6 @@ # Test msgconv on a PO file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mco-test5.po" cat <<\EOF > mco-test5.po msgid "" msgstr "" @@ -52,14 +48,10 @@ msgstr "photocopieur" #~ msgstr "Enregistrer sous" EOF -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; } -LC_ALL=C tr -d '\r' < mco-test5.tmp > mco-test5.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCONV} --to-code=UTF-8 -o mco-test5.tmp mco-test5.po || exit 1 +LC_ALL=C tr -d '\r' < mco-test5.tmp > mco-test5.out || exit 1 -tmpfiles="$tmpfiles mco-test5.ok" cat <<\EOF > mco-test5.ok msgid "" msgstr "" @@ -109,6 +101,4 @@ EOF ${DIFF} mco-test5.ok mco-test5.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgconv-6 b/gettext-tools/tests/msgconv-6 index 8f01c91..c4e9844 100755..100644 --- a/gettext-tools/tests/msgconv-6 +++ b/gettext-tools/tests/msgconv-6 @@ -3,10 +3,6 @@ # Test msgconv on a PO file with previous msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mco-test6.po" cat <<\EOF > mco-test6.po msgid "" msgstr "" @@ -25,14 +21,10 @@ msgid "full turn" msgstr "Volle 360 Grad" EOF -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; } -LC_ALL=C tr -d '\r' < mco-test6.tmp > mco-test6.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCONV} --to-code=ISO-8859-1 -o mco-test6.tmp mco-test6.po || exit 1 +LC_ALL=C tr -d '\r' < mco-test6.tmp > mco-test6.out || exit 1 -tmpfiles="$tmpfiles mco-test6.ok" cat <<\EOF > mco-test6.ok msgid "" msgstr "" @@ -55,6 +47,4 @@ EOF ${DIFF} mco-test6.ok mco-test6.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgen-1 b/gettext-tools/tests/msgen-1 index cb52c68..f68cd7e 100755..100644 --- a/gettext-tools/tests/msgen-1 +++ b/gettext-tools/tests/msgen-1 @@ -3,10 +3,6 @@ # Test general operation. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles men-test1.po" cat <<EOF > men-test1.po # HEADER. # @@ -30,14 +26,10 @@ msgstr[0] "" msgstr[1] "" EOF -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; } -LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGEN} -o men-test1.tmp men-test1.po || exit 1 +LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || exit 1 -tmpfiles="$tmpfiles men-test1.ok" cat <<EOF > men-test1.ok # HEADER. # @@ -65,6 +57,4 @@ EOF ${DIFF} men-test1.ok men-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgen-2 b/gettext-tools/tests/msgen-2 index 6057515..170ebd7 100755..100644 --- a/gettext-tools/tests/msgen-2 +++ b/gettext-tools/tests/msgen-2 @@ -3,10 +3,6 @@ # Test general operation with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles men-test2.properties" cat <<\EOF > men-test2.properties !height\ must\ be\ positive= @@ -15,14 +11,10 @@ color\ cannot\ be\ transparent=colour cannot be transparent width\ must\ be\ positive= EOF -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; } -LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties || exit 1 +LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out || exit 1 -tmpfiles="$tmpfiles men-test2.ok" cat <<\EOF > men-test2.ok height\ must\ be\ positive=height must be positive @@ -35,6 +27,4 @@ EOF ${DIFF} men-test2.ok men-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgen-3 b/gettext-tools/tests/msgen-3 index 318b330..2b09c1d 100755..100644 --- a/gettext-tools/tests/msgen-3 +++ b/gettext-tools/tests/msgen-3 @@ -3,10 +3,6 @@ # Test msgen on a POT file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles men-test3.pot" cat <<\EOF > men-test3.pot msgid "" msgstr "" @@ -44,14 +40,10 @@ msgid "copier" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < men-test3.tmp > men-test3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGEN} -o men-test3.tmp men-test3.pot || exit 1 +LC_ALL=C tr -d '\r' < men-test3.tmp > men-test3.out || exit 1 -tmpfiles="$tmpfiles men-test3.ok" cat <<\EOF > men-test3.ok msgid "" msgstr "" @@ -93,6 +85,4 @@ EOF ${DIFF} men-test3.ok men-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgexec-1 b/gettext-tools/tests/msgexec-1 index 3809d83..e9094fc 100755..100644 --- a/gettext-tools/tests/msgexec-1 +++ b/gettext-tools/tests/msgexec-1 @@ -3,10 +3,6 @@ # Test of an external command. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mex-test1.po" cat <<\EOF > mex-test1.po # HEADER. # @@ -58,7 +54,6 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -tmpfiles="$tmpfiles mex-test1.sh" cat <<\EOF > mex-test1.sh #! /bin/sh echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r' @@ -72,15 +67,13 @@ exit 0 EOF chmod a+x mex-test1.sh -tmpfiles="$tmpfiles mex-test1.out mex-test1.err" : ${MSGEXEC=msgexec} LC_ALL=C \ ${MSGEXEC} -i mex-test1.po ./mex-test1.sh > mex-test1.out 2> mex-test1.err result=$? cat mex-test1.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } -tmpfiles="$tmpfiles mex-test1.ok" cat <<\EOF > mex-test1.ok ========================= mex-test1.po:4 ========================= @@ -136,6 +129,4 @@ EOF ${DIFF} mex-test1.ok mex-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2 index c25eabb..fcdb078 100755..100644 --- a/gettext-tools/tests/msgexec-2 +++ b/gettext-tools/tests/msgexec-2 @@ -3,9 +3,6 @@ # Test the builtin command "0". -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Find a 'tr' program that supports NUL bytes in the input. # Solaris /usr/bin/tr does not. if test -f /usr/xpg6/bin/tr; then @@ -18,7 +15,6 @@ else fi fi -tmpfiles="$tmpfiles mex-test2.po" cat <<\EOF > mex-test2.po # HEADER. # @@ -70,20 +66,16 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -tmpfiles="$tmpfiles mex-test2.tmp mex-test2.out mex-test2.err" : ${MSGEXEC=msgexec} LC_ALL=C \ ${MSGEXEC} -i mex-test2.po 0 > mex-test2.tmp 2> mex-test2.err result=$? cat mex-test2.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out || exit 1 : ${CMP=cmp} ${CMP} "$abs_srcdir"/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgexec-3 b/gettext-tools/tests/msgexec-3 index 771f067..7955d63 100755..100644 --- a/gettext-tools/tests/msgexec-3 +++ b/gettext-tools/tests/msgexec-3 @@ -3,10 +3,6 @@ # Test of an external command with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mex-test3.properties" cat <<\EOF > mex-test3.properties # HEADER. # @@ -33,7 +29,6 @@ with\ wives\ who\ never\ understand=und ihre Frauen verstehen sie nicht !They\ warn\ you\ and\ darn\ you= EOF -tmpfiles="$tmpfiles mex-test3.sh" cat <<\EOF > mex-test3.sh #! /bin/sh echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r' @@ -47,12 +42,9 @@ exit 0 EOF chmod a+x mex-test3.sh -tmpfiles="$tmpfiles mex-test3.out" : ${MSGEXEC=msgexec} -${MSGEXEC} --properties-input -i mex-test3.properties ./mex-test3.sh > mex-test3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGEXEC} --properties-input -i mex-test3.properties ./mex-test3.sh > mex-test3.out || exit 1 -tmpfiles="$tmpfiles mex-test3.ok" cat <<\EOF > mex-test3.ok ========================= mex-test3.properties:3 ========================= @@ -89,6 +81,4 @@ EOF ${DIFF} mex-test3.ok mex-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgexec-4 b/gettext-tools/tests/msgexec-4 index 4f67a7b..e786322 100755..100644 --- a/gettext-tools/tests/msgexec-4 +++ b/gettext-tools/tests/msgexec-4 @@ -16,10 +16,6 @@ # in the GetACP() encoding). This has been reported at # <http://cygwin.com/ml/cygwin/2009-08/msg00430.html>. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mex-test4.po" cat <<\EOF > mex-test4.po msgid "" msgstr "" @@ -65,7 +61,6 @@ msgstr "photocopieur" #~ msgstr "Enregistrer sous" EOF -tmpfiles="$tmpfiles mex-test4.sh" cat <<\EOF > mex-test4.sh #! /bin/sh echo "========================= $MSGEXEC_LOCATION =========================" | LC_ALL=C tr -d '\r' @@ -82,15 +77,13 @@ exit 0 EOF chmod a+x mex-test4.sh -tmpfiles="$tmpfiles mex-test4.out mex-test4.err" : ${MSGEXEC=msgexec} LC_ALL=C \ ${MSGEXEC} -i mex-test4.po ./mex-test4.sh > mex-test4.out 2> mex-test4.err result=$? cat mex-test4.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } -tmpfiles="$tmpfiles mex-test4.ok" cat <<\EOF > mex-test4.ok ========================= mex-test4.po:2 ========================= @@ -143,6 +136,4 @@ EOF ${DIFF} mex-test4.ok mex-test4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfilter-1 b/gettext-tools/tests/msgfilter-1 index 5db8830..c1569a0 100755..100644 --- a/gettext-tools/tests/msgfilter-1 +++ b/gettext-tools/tests/msgfilter-1 @@ -3,9 +3,6 @@ # Test general filter execution. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -22,13 +19,13 @@ fi # spaces. echo abc | fold -b -s -w 20 >/dev/null 2>&1 || { echo "Skipping test: fold program not POSIX compliant" - rm -fr $tmpfiles; exit 77 + exit 77 } # Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping. echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || { echo "Skipping test: fold program trims trailing spaces" - rm -fr $tmpfiles; exit 77 + exit 77 } # Some fold programs (like HP-UX) insert a newline at the end, if the last @@ -37,10 +34,9 @@ foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c` foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ ]//g'` test "$foldoutputcount" = 3 || { echo "Skipping test: fold program inserts extra newline" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles mfi-test1.po" cat <<\EOF > mfi-test1.po # HEADER. # @@ -91,15 +87,13 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -tmpfiles="$tmpfiles mfi-test1.out mfi-test1.err" : ${MSGFILTER=msgfilter} LC_ALL=C \ ${MSGFILTER} -i mfi-test1.po -o mfi-test1.out fold -b -s -w 20 >mfi-test1.err 2>&1 result=$? cat mfi-test1.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } -tmpfiles="$tmpfiles mfi-test1.ok" cat <<\EOF > mfi-test1.ok # HEADER. # @@ -172,6 +166,4 @@ EOF ${DIFF} mfi-test1.ok mfi-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfilter-2 b/gettext-tools/tests/msgfilter-2 index c0e436f..036cb87 100755..100644 --- a/gettext-tools/tests/msgfilter-2 +++ b/gettext-tools/tests/msgfilter-2 @@ -3,9 +3,6 @@ # Test sed execution. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -23,7 +20,7 @@ fi sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/` test -n "$sedoutput" || { echo "Skipping test: sed program is broken" - rm -fr $tmpfiles; exit 77 + exit 77 } # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it @@ -32,10 +29,9 @@ sedoutputcount=`echo $ac_n "abc$ac_c" | sed -e s/x/x/ | wc -c` sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ ]//g'` test "$sedoutputcount" = 3 || { echo "Skipping test: sed program inserts extra newline" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles mfi-test2.po" cat <<\EOF > mfi-test2.po # HEADER. # @@ -86,7 +82,6 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -tmpfiles="$tmpfiles mfi-test2.out mfi-test2.err" : ${MSGFILTER=msgfilter} sedexpr1='1{ s/^/\[\[/ @@ -98,9 +93,8 @@ LC_ALL=C \ ${MSGFILTER} -i mfi-test2.po -o mfi-test2.out sed -e "$sedexpr1" -e "$sedexpr2" >mfi-test2.err 2>&1 result=$? cat mfi-test2.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } -tmpfiles="$tmpfiles mfi-test2.ok" cat <<\EOF > mfi-test2.ok # HEADER. # @@ -155,6 +149,4 @@ EOF ${DIFF} mfi-test2.ok mfi-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfilter-3 b/gettext-tools/tests/msgfilter-3 index 8ee5fc6..02e74ec 100755..100644 --- a/gettext-tools/tests/msgfilter-3 +++ b/gettext-tools/tests/msgfilter-3 @@ -3,9 +3,6 @@ # Test general filter execution with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -22,13 +19,13 @@ fi # spaces. echo abc | fold -b -s -w 20 >/dev/null 2>&1 || { echo "Skipping test: fold program not POSIX compliant" - rm -fr $tmpfiles; exit 77 + exit 77 } # Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping. echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || { echo "Skipping test: fold program trims trailing spaces" - rm -fr $tmpfiles; exit 77 + exit 77 } # Some fold programs (like HP-UX) insert a newline at the end, if the last @@ -37,10 +34,9 @@ foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c` foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ ]//g'` test "$foldoutputcount" = 3 || { echo "Skipping test: fold program inserts extra newline" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles mfi-test3.properties" cat <<\EOF > mfi-test3.properties # HEADER. # @@ -67,14 +63,12 @@ with\ wives\ who\ never\ understand=und ihre Frauen verstehen sie nicht !They\ warn\ you\ and\ darn\ you= EOF -tmpfiles="$tmpfiles mfi-test3.out" : ${MSGFILTER=msgfilter} LC_ALL=C \ ${MSGFILTER} --properties-input --properties-output -i mfi-test3.properties -o mfi-test3.out fold -b -s -w 20 result=$? -test $result = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } -tmpfiles="$tmpfiles mfi-test3.ok" cat <<\EOF > mfi-test3.ok # HEADER. # @@ -105,6 +99,4 @@ EOF ${DIFF} mfi-test3.ok mfi-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfilter-4 b/gettext-tools/tests/msgfilter-4 index 7017145..6c9feee 100755..100644 --- a/gettext-tools/tests/msgfilter-4 +++ b/gettext-tools/tests/msgfilter-4 @@ -3,9 +3,6 @@ # Test msgfilter on a PO file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -23,7 +20,7 @@ fi sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/` test -n "$sedoutput" || { echo "Skipping test: sed program is broken" - rm -fr $tmpfiles; exit 77 + exit 77 } # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it @@ -32,10 +29,9 @@ sedoutputcount=`echo $ac_n "abc$ac_c" | sed -e s/x/x/ | wc -c` sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ ]//g'` test "$sedoutputcount" = 3 || { echo "Skipping test: sed program inserts extra newline" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles mfi-test4.po" cat <<\EOF > mfi-test4.po msgid "" msgstr "" @@ -81,7 +77,6 @@ msgstr "photocopieur" #~ msgstr "Enregistrer sous" EOF -tmpfiles="$tmpfiles mfi-test4.out mfi-test4.err" : ${MSGFILTER=msgfilter} sedexpr1='1{ s/^/\[\[/ @@ -93,9 +88,8 @@ LC_ALL=C \ ${MSGFILTER} -i mfi-test4.po -o mfi-test4.out sed -e "$sedexpr1" -e "$sedexpr2" >mfi-test4.err 2>&1 result=$? cat mfi-test4.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } -tmpfiles="$tmpfiles mfi-test4.ok" cat <<\EOF > mfi-test4.ok msgid "" msgstr "" @@ -145,6 +139,4 @@ EOF ${DIFF} mfi-test4.ok mfi-test4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfilter-sr-latin-1 b/gettext-tools/tests/msgfilter-sr-latin-1 index 69af7d3..2999a62 100755..100644 --- a/gettext-tools/tests/msgfilter-sr-latin-1 +++ b/gettext-tools/tests/msgfilter-sr-latin-1 @@ -4,10 +4,6 @@ # Test msgfilter with command recode-sr-latin1. # Verify that it converts to UTF-8. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mfi-srl-1.po" cat <<\EOF > mfi-srl-1.po # Serbian translation of gettext-runtime # Copyright (C) 2003 Free Software Foundation, Inc. @@ -313,17 +309,13 @@ EOF # of here documents in /bin/sh is too buggy. Skip the test in this case. head -n 1 mfi-srl-1.po | grep Serbian > /dev/null || { echo "Skipping test: /bin/sh is too buggy" - rm -fr $tmpfiles; exit 77 + exit 77 } -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; } -LC_ALL=C tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFILTER} -i mfi-srl-1.po -o mfi-srl-1.tmp recode-sr-latin || exit 1 +LC_ALL=C tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out || exit 1 -tmpfiles="$tmpfiles mfi-srl-1.ok" cat <<\EOF > mfi-srl-1.ok # Serbian translation of gettext-runtime # Copyright (C) 2003 Free Software Foundation, Inc. @@ -629,6 +621,4 @@ EOF ${DIFF} mfi-srl-1.ok mfi-srl-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-1 b/gettext-tools/tests/msgfmt-1 index 0e7315b..fd3981d 100755..100644 --- a/gettext-tools/tests/msgfmt-1 +++ b/gettext-tools/tests/msgfmt-1 @@ -3,14 +3,9 @@ # Test basic functionality, duplicate detection, multiple domains. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-1" test -d mf-1 || mkdir mf-1 test -d mf-1/LC_MESSAGES || mkdir mf-1/LC_MESSAGES -tmpfiles="$tmpfiles mf-1-module1.po mf-1-module2.po" cat <<EOF > mf-1-module1.po #default domain "messages.mo" msgid "SYS_(C)\n" @@ -49,25 +44,19 @@ EOF # Without use of msgcat, expect a "duplicate message definition" error. : ${MSGFMT=msgfmt} if ${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-module1.po mf-1-module2.po 2> /dev/null; then - rm -fr $tmpfiles exit 1 fi # With msgcat, it should work. -tmpfiles="$tmpfiles mf-1-modules.po" : ${MSGCAT=msgcat} ${MSGFMT=msgfmt} -${MSGCAT} --use-first -o mf-1-modules.po mf-1-module1.po mf-1-module2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-modules.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} --use-first -o mf-1-modules.po mf-1-module1.po mf-1-module2.po || exit 1 +${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-modules.po || exit 1 -tmpfiles="$tmpfiles mf-test1.out" : ${GETTEXT=gettext} TEXTDOMAINDIR=. LANGUAGE=mf-1 \ ${GETTEXT} --env LC_ALL=en gen 'SYS_(C) ' | LC_ALL=C tr -d '\r' > mf-test1.out -tmpfiles="$tmpfiles gtmf-test1.ok" cat <<EOF > gtmf-test1.ok MSGFMT(3) portable message object file compiler Copyright (C) 1995 Free Software Foundation @@ -78,6 +67,4 @@ EOF ${DIFF} gtmf-test1.ok mf-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10 index 70f0f6b..d49ffdc 100755..100644 --- a/gettext-tools/tests/msgfmt-10 +++ b/gettext-tools/tests/msgfmt-10 @@ -3,10 +3,6 @@ # Test format string checking in plural entries. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-test10.po1" cat <<\EOF > mf-test10.po1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -40,10 +36,8 @@ msgstr[1] "%d yararsz kurals" EOF : ${MSGFMT=msgfmt} -${MSGFMT} --check -o /dev/null mf-test10.po1 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} --check -o /dev/null mf-test10.po1 || exit 1 -tmpfiles="$tmpfiles mf-test10.po2" cat <<\EOF > mf-test10.po2 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -68,13 +62,11 @@ msgstr[0] "%d yararsz kural" msgstr[1] "%d yararsz kural%s" EOF -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|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test10.err -tmpfiles="$tmpfiles mf-test10.ok" cat << EOF > mf-test10.ok mf-test10.po2:6: warning: header field 'Language' missing in header mf-test10.po2:20: number of format specifications in 'msgid_plural' and 'msgstr[1]' does not match @@ -85,6 +77,4 @@ EOF ${DIFF} mf-test10.ok mf-test10.err result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-11 b/gettext-tools/tests/msgfmt-11 index 002d696..ebafb01 100755..100644 --- a/gettext-tools/tests/msgfmt-11 +++ b/gettext-tools/tests/msgfmt-11 @@ -3,10 +3,6 @@ # Test handling of invalid multibyte sequences. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-11.po" cat <<\EOF > mf-11.po msgid "" msgstr "" @@ -23,7 +19,6 @@ msgid "_Enable keyboard accessibility" msgstr "_廢曜燐塢 嗤澱α蒙陸 溶嵬夫腕圖 北宋α壞夘" EOF -tmpfiles="$tmpfiles mf-11.mo core *.core" : ${MSGFMT=msgfmt} ${MSGFMT} --check -o mf-11.mo mf-11.po 2>/dev/null # Exit code must be 1. @@ -32,6 +27,4 @@ ${MSGFMT} --check -o mf-11.mo mf-11.po 2>/dev/null test $? = 1 result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-12 b/gettext-tools/tests/msgfmt-12 index 24743eb..f3d1f38 100755..100644 --- a/gettext-tools/tests/msgfmt-12 +++ b/gettext-tools/tests/msgfmt-12 @@ -3,10 +3,6 @@ # Test ISO C 99 <inttypes.h> format string directives. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-12.po" cat <<\EOF > mf-12.po msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -23,19 +19,13 @@ msgid "<PRIXFAST16> errors" msgstr "<PRIXFAST16> Fehler" EOF -tmpfiles="$tmpfiles mf-12.mo" : ${MSGFMT=msgfmt} -${MSGFMT} -o mf-12.mo mf-12.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} -o mf-12.mo mf-12.po || exit 1 -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; } -LC_ALL=C tr -d '\r' < mf-12.tmp > mf-12.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o mf-12.tmp mf-12.mo || exit 1 +LC_ALL=C tr -d '\r' < mf-12.tmp > mf-12.out || exit 1 -tmpfiles="$tmpfiles mf-12.ok" cat <<\EOF > mf-12.ok msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -56,6 +46,4 @@ EOF ${DIFF} mf-12.ok mf-12.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-13 b/gettext-tools/tests/msgfmt-13 index d9cb017..b7e2657 100755..100644 --- a/gettext-tools/tests/msgfmt-13 +++ b/gettext-tools/tests/msgfmt-13 @@ -3,10 +3,6 @@ # Test that an out-of-range Unicode character doesn't lead to a crash. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-test13.po" cat <<\EOF >mf-test13.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -29,7 +25,6 @@ msgstr " [Gehe zu] [Zur端ck] [Anzeigen] [Markieren] [Markierung l械en] [O EOF -tmpfiles="$tmpfiles mf-test13.mo" : ${MSGFMT=msgfmt} ${MSGFMT} mf-test13.po -o mf-test13.mo 2>/dev/null # Exit code must be 1. @@ -38,6 +33,4 @@ ${MSGFMT} mf-test13.po -o mf-test13.mo 2>/dev/null test $? = 1 result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-14 b/gettext-tools/tests/msgfmt-14 index da98462..3a44ac7 100755..100644 --- a/gettext-tools/tests/msgfmt-14 +++ b/gettext-tools/tests/msgfmt-14 @@ -3,10 +3,6 @@ # Test msgfmt and msgunfmt on a PO file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-14.po" cat <<\EOF > mf-14.po msgid "" msgstr "" @@ -52,19 +48,13 @@ msgstr "photocopieur" #~ msgstr "Enregistrer sous" EOF -tmpfiles="$tmpfiles mf-14.mo" : ${MSGFMT=msgfmt} -${MSGFMT} -o mf-14.mo mf-14.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} -o mf-14.mo mf-14.po || exit 1 -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; } -LC_ALL=C tr -d '\r' < mf-14.tmp > mf-14.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o mf-14.tmp mf-14.mo || exit 1 +LC_ALL=C tr -d '\r' < mf-14.tmp > mf-14.out || exit 1 -tmpfiles="$tmpfiles mf-14.ok" cat <<\EOF > mf-14.ok msgid "" msgstr "" @@ -100,6 +90,4 @@ EOF ${DIFF} mf-14.ok mf-14.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-15 b/gettext-tools/tests/msgfmt-15 index 731b16a..5ff7c4b 100755..100644 --- a/gettext-tools/tests/msgfmt-15 +++ b/gettext-tools/tests/msgfmt-15 @@ -3,9 +3,6 @@ # Test plural formula dependent checking of format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Take as example a plural formula which takes the values 0 and 2 infinitely # often, and value 1 only a few times. # Test: 1 - have %d everywhere - OK @@ -13,7 +10,6 @@ trap 'rm -fr $tmpfiles' 1 2 3 15 # 3 - lack %d for value 1 - OK # 4 - lack %d for value 2 - error -tmpfiles="$tmpfiles mf-15.po1" cat <<\EOF > mf-15.po1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -41,10 +37,8 @@ msgstr[2] "%d der unn端tzen Nichtterminale" EOF : ${MSGFMT=msgfmt} -${MSGFMT} --check -o /dev/null mf-15.po1 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} --check -o /dev/null mf-15.po1 || exit 1 -tmpfiles="$tmpfiles mf-15.po2" cat <<\EOF > mf-15.po2 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -73,9 +67,8 @@ EOF : ${MSGFMT=msgfmt} ${MSGFMT} --check -o /dev/null mf-15.po2 2>/dev/null -test $? = 1 || { rm -fr $tmpfiles; exit 1; } +test $? = 1 || { exit 1; } -tmpfiles="$tmpfiles mf-15.po3" cat <<\EOF > mf-15.po3 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -103,10 +96,8 @@ msgstr[2] "%d der unn端tzen Nichtterminale" EOF : ${MSGFMT=msgfmt} -${MSGFMT} --check -o /dev/null mf-15.po3 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} --check -o /dev/null mf-15.po3 || exit 1 -tmpfiles="$tmpfiles mf-15.po4" cat <<\EOF > mf-15.po4 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -135,8 +126,6 @@ EOF : ${MSGFMT=msgfmt} ${MSGFMT} --check -o /dev/null mf-15.po4 2>/dev/null -test $? = 1 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +test $? = 1 || { exit 1; } exit $result diff --git a/gettext-tools/tests/msgfmt-16 b/gettext-tools/tests/msgfmt-16 index deccad5..f2641f5 100755..100644 --- a/gettext-tools/tests/msgfmt-16 +++ b/gettext-tools/tests/msgfmt-16 @@ -3,10 +3,6 @@ # Test msgfmt on a PO file with previous msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-16.po" cat <<\EOF > mf-16.po msgid "" msgstr "" @@ -45,19 +41,13 @@ msgstr "Argumente fehlen." #~ msgstr "%s: ung端ltige Option -- %c\n" EOF -tmpfiles="$tmpfiles mf-16.mo" : ${MSGFMT=msgfmt} -${MSGFMT} -o mf-16.mo mf-16.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} -o mf-16.mo mf-16.po || exit 1 -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; } -LC_ALL=C tr -d '\r' < mf-16.tmp > mf-16.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o mf-16.tmp mf-16.mo || exit 1 +LC_ALL=C tr -d '\r' < mf-16.tmp > mf-16.out || exit 1 -tmpfiles="$tmpfiles mf-16.ok" cat <<\EOF > mf-16.ok msgid "" msgstr "" @@ -73,6 +63,4 @@ EOF ${DIFF} mf-16.ok mf-16.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-17 b/gettext-tools/tests/msgfmt-17 index 44a730e..cc98b96 100755..100644 --- a/gettext-tools/tests/msgfmt-17 +++ b/gettext-tools/tests/msgfmt-17 @@ -3,16 +3,12 @@ # Test range dependent checking of format strings with plural forms. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Take as example a plural formula which takes all values infinitely often. # Test: 1 - lack %d for value 0 - error # 2 - lack %d for value 0 but limited range such that only one n - ok # 3 - lack %d for value 1 - error # 4 - lack %d for value 1 but limited range such that multiple n - error -tmpfiles="$tmpfiles mf-17.po1" cat <<\EOF > mf-17.po1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -41,9 +37,8 @@ EOF : ${MSGFMT=msgfmt} ${MSGFMT} --check -o /dev/null mf-17.po1 2>/dev/null -test $? = 1 || { rm -fr $tmpfiles; exit 1; } +test $? = 1 || { exit 1; } -tmpfiles="$tmpfiles mf-17.po2" cat <<\EOF > mf-17.po2 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -71,10 +66,8 @@ msgstr[2] "舒 亳 %(number)s 亠于亠亠亶" EOF : ${MSGFMT=msgfmt} -${MSGFMT} --check -o /dev/null mf-17.po2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} --check -o /dev/null mf-17.po2 || exit 1 -tmpfiles="$tmpfiles mf-17.po3" cat <<\EOF > mf-17.po3 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -103,9 +96,8 @@ EOF : ${MSGFMT=msgfmt} ${MSGFMT} --check -o /dev/null mf-17.po3 2>/dev/null -test $? = 1 || { rm -fr $tmpfiles; exit 1; } +test $? = 1 || { exit 1; } -tmpfiles="$tmpfiles mf-17.po4" cat <<\EOF > mf-17.po4 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -134,8 +126,6 @@ EOF : ${MSGFMT=msgfmt} ${MSGFMT} --check -o /dev/null mf-17.po4 2>/dev/null -test $? = 1 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +test $? = 1 || { exit 1; } exit $result diff --git a/gettext-tools/tests/msgfmt-2 b/gettext-tools/tests/msgfmt-2 index fdaf965..4a24487 100755..100644 --- a/gettext-tools/tests/msgfmt-2 +++ b/gettext-tools/tests/msgfmt-2 @@ -15,14 +15,9 @@ else ac_n= ac_c='\c' ac_t= fi -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-2" test -d mf-2 || mkdir mf-2 test -d mf-2/LC_MESSAGES || mkdir mf-2/LC_MESSAGES -tmpfiles="$tmpfiles mf-2-module1.po mf-2-module2.po" cat <<EOF > mf-2-module1.po #default domain "messages.mo" msgid "SYS_(C)\n" @@ -61,30 +56,22 @@ EOF # Without use of msgcat, expect a "duplicate message definition" error. : ${MSGFMT=msgfmt} if ${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-module1.po mf-2-module2.po 2> /dev/null; then - rm -fr $tmpfiles exit 1 fi # With msgcat, it should work. -tmpfiles="$tmpfiles mf-2-modules.po" : ${MSGCAT=msgcat} ${MSGFMT=msgfmt} -${MSGCAT} --use-first -o mf-2-modules.po mf-2-module1.po mf-2-module2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-modules.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} --use-first -o mf-2-modules.po mf-2-module1.po mf-2-module2.po || exit 1 +${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-modules.po || exit 1 -tmpfiles="$tmpfiles mf-test2.out" : ${GETTEXT=gettext} TEXTDOMAINDIR=. LANGUAGE=mf-2 \ ${GETTEXT} --env LC_ALL=en gen 'error 3' > mf-test2.out -tmpfiles="$tmpfiles gtmf-test2.ok" echo $ac_n "error 3 translation$ac_c" > gtmf-test2.ok : ${DIFF=diff} ${DIFF} gtmf-test2.ok mf-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-3 b/gettext-tools/tests/msgfmt-3 index fe40ee8..a46f88f 100755..100644 --- a/gettext-tools/tests/msgfmt-3 +++ b/gettext-tools/tests/msgfmt-3 @@ -3,10 +3,6 @@ # Test that an empty header entry is OK. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-test3.po" cat <<EOF >mf-test3.po # # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -21,17 +17,14 @@ msgid "" msgstr "" EOF -tmpfiles="$tmpfiles mftest3.mo mftest3.err" : ${MSGFMT=msgfmt} LC_MESSAGES=C LC_ALL= \ ${MSGFMT} -o mftest3.mo mf-test3.po >mftest3.err 2>&1 result=$? cat mftest3.err | grep -v 'warning: Charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } test ! -f mftest3.mo result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-4 b/gettext-tools/tests/msgfmt-4 index 3868c20..5630257 100755..100644 --- a/gettext-tools/tests/msgfmt-4 +++ b/gettext-tools/tests/msgfmt-4 @@ -3,10 +3,6 @@ # Test c-format handling. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-test4.po" cat <<EOF >mf-test4.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -40,6 +36,4 @@ EOF ${MSGFMT} -o /dev/null mf-test4.po 2> /dev/null result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-5 b/gettext-tools/tests/msgfmt-5 index 46c101b..f4fb368 100755..100644 --- a/gettext-tools/tests/msgfmt-5 +++ b/gettext-tools/tests/msgfmt-5 @@ -3,10 +3,6 @@ # Test multi-domain handling. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles foo.po" cat <<\EOF > foo.po domain "foo-de" msgid "" @@ -33,23 +29,15 @@ msgid "bye" msgstr "A bientt" EOF -tmpfiles="$tmpfiles foo-de.mo foo-fr.mo" : ${MSGFMT=msgfmt} -${MSGFMT} foo.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} foo.po || exit 1 -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; } -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; } -LC_ALL=C tr -d '\r' < foo-fr.tmp > foo-fr.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -tmpfiles="$tmpfiles foo-de.ok" +${MSGUNFMT} -o foo-de.tmp foo-de.mo || exit 1 +LC_ALL=C tr -d '\r' < foo-de.tmp > foo-de.out || exit 1 +${MSGUNFMT} -o foo-fr.tmp foo-fr.mo || exit 1 +LC_ALL=C tr -d '\r' < foo-fr.tmp > foo-fr.out || exit 1 + cat <<\EOF > foo-de.ok msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -61,7 +49,6 @@ msgid "hello" msgstr "Hallo" EOF -tmpfiles="$tmpfiles foo-fr.ok" cat <<\EOF > foo-fr.ok msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -77,6 +64,4 @@ EOF ${DIFF} foo-de.ok foo-de.out && ${DIFF} foo-fr.ok foo-fr.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-6 b/gettext-tools/tests/msgfmt-6 index f2a0837..aededbc 100755..100644 --- a/gettext-tools/tests/msgfmt-6 +++ b/gettext-tools/tests/msgfmt-6 @@ -6,10 +6,6 @@ # Note: On AIX 3 with xlc, this test fails. To make it work, add "-qcheck" # to the CFLAGS, or use gcc. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-6.po" cat <<EOF > mf-6.po msgid "" msgstr "" @@ -23,7 +19,6 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(1 + (1 / (n - 257)));\n" EOF -tmpfiles="$tmpfiles mf-6.mo core *.core" : ${MSGFMT=msgfmt} ${MSGFMT} --check -o mf-6.mo mf-6.po 2>/dev/null # Exit code must be 1. @@ -32,6 +27,4 @@ ${MSGFMT} --check -o mf-6.mo mf-6.po 2>/dev/null test $? = 1 result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-7 b/gettext-tools/tests/msgfmt-7 index bdcf97f..f07a6b0 100755..100644 --- a/gettext-tools/tests/msgfmt-7 +++ b/gettext-tools/tests/msgfmt-7 @@ -3,10 +3,6 @@ # Check for duplicates with identical translations -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-test7.in1" cat <<EOF > mf-test7.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -27,13 +23,11 @@ msgid "3" msgstr "3" msgid "3" msgstr "3" EOF -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|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test7.err -tmpfiles="$tmpfiles mf-test7.ok" cat << EOF > mf-test7.ok mf-test7.in1:17: duplicate message definition... mf-test7.in1:16: ...this is the location of the first definition @@ -44,6 +38,4 @@ EOF ${DIFF} mf-test7.ok mf-test7.err result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-8 b/gettext-tools/tests/msgfmt-8 index fd81344..9afea69 100755..100644 --- a/gettext-tools/tests/msgfmt-8 +++ b/gettext-tools/tests/msgfmt-8 @@ -3,10 +3,6 @@ # Check for duplicates with different translations -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-test8.in1" cat <<EOF > mf-test8.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -27,13 +23,11 @@ msgid "3" msgstr "3" msgid "3" msgstr "three ha ha" EOF -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|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test8.err -tmpfiles="$tmpfiles mf-test8.ok" cat << EOF > mf-test8.ok mf-test8.in1:17: duplicate message definition... mf-test8.in1:16: ...this is the location of the first definition @@ -44,6 +38,4 @@ EOF ${DIFF} mf-test8.ok mf-test8.err result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-9 b/gettext-tools/tests/msgfmt-9 index 4704341..316bacf 100755..100644 --- a/gettext-tools/tests/msgfmt-9 +++ b/gettext-tools/tests/msgfmt-9 @@ -3,10 +3,6 @@ # Duplicates are also fatal in obsolete marked entries. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-test9.in1" cat <<EOF > mf-test9.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -30,13 +26,11 @@ msgid "3" msgstr "3" #~ "ha ha" EOF -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|' -e 's|^msgfmt\.exe|msgfmt|' | LC_ALL=C tr -d '\r' > mf-test9.err -tmpfiles="$tmpfiles mf-test9.ok" cat << EOF > mf-test9.ok mf-test9.in1:17: duplicate message definition... mf-test9.in1:15: ...this is the location of the first definition @@ -47,6 +41,4 @@ EOF ${DIFF} mf-test9.ok mf-test9.err result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1 index de9320a..8851cc9 100755..100644 --- a/gettext-tools/tests/msgfmt-properties-1 +++ b/gettext-tools/tests/msgfmt-properties-1 @@ -3,14 +3,9 @@ # Test basic functioning with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-p-1" test -d mf-p-1 || mkdir mf-p-1 test -d mf-p-1/LC_MESSAGES || mkdir mf-p-1/LC_MESSAGES -tmpfiles="$tmpfiles mf-p-1-1.properties mf-p-1-2.properties" cat <<\EOF > mf-p-1-1.properties SYS_(C)\n=MSGFMT(3) portable message object file compiler\nCopyright (C) 1995 Free Software Foundation\nReport bugs to <bug-gnu-utils@gnu.org>\n msg\ 1=msg 1 translation @@ -29,25 +24,19 @@ EOF # Without use of msgcat, expect a "duplicate message definition" error. : ${MSGFMT=msgfmt} if ${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-1.properties mf-p-1-2.properties 2> /dev/null; then - rm -fr $tmpfiles exit 1 fi # With msgcat, it should work. -tmpfiles="$tmpfiles mf-p-1-s.properties" : ${MSGCAT=msgcat} ${MSGFMT=msgfmt} -${MSGCAT} --properties-input --properties-output --use-first -o mf-p-1-s.properties mf-p-1-1.properties mf-p-1-2.properties -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-s.properties -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} --properties-input --properties-output --use-first -o mf-p-1-s.properties mf-p-1-1.properties mf-p-1-2.properties || exit 1 +${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-s.properties || exit 1 -tmpfiles="$tmpfiles mf-p-test1.out" : ${GETTEXT=gettext} TEXTDOMAINDIR=. LANGUAGE=mf-p-1 \ ${GETTEXT} --env LC_ALL=en gen 'SYS_(C) ' | LC_ALL=C tr -d '\r' > mf-p-test1.out -tmpfiles="$tmpfiles gtmf-p-test1.ok" cat <<EOF > gtmf-p-test1.ok MSGFMT(3) portable message object file compiler Copyright (C) 1995 Free Software Foundation @@ -58,6 +47,4 @@ EOF ${DIFF} gtmf-p-test1.ok mf-p-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1 index 7335764..f5dff9d 100755..100644 --- a/gettext-tools/tests/msgfmt-qt-1 +++ b/gettext-tools/tests/msgfmt-qt-1 @@ -3,18 +3,11 @@ # Test output in Qt .qm format. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-qt-1.qm" : ${MSGFMT=msgfmt} -${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po || exit 1 : ${CMP=cmp} ${CMP} "$abs_srcdir"/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgfmt-qt-2 b/gettext-tools/tests/msgfmt-qt-2 index eef7531..99cf145 100755..100644 --- a/gettext-tools/tests/msgfmt-qt-2 +++ b/gettext-tools/tests/msgfmt-qt-2 @@ -3,18 +3,11 @@ # Test msgfmt --qt on a PO file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mf-qt-2.qm" : ${MSGFMT=msgfmt} -${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm || exit 1 : ${CMP=cmp} ${CMP} "$abs_srcdir"/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-1 b/gettext-tools/tests/msggrep-1 index da20529..33d4181 100755..100644 --- a/gettext-tools/tests/msggrep-1 +++ b/gettext-tools/tests/msggrep-1 @@ -3,10 +3,6 @@ # Test --location option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test1.po" cat <<\EOF > mg-test1.po # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -156,14 +152,10 @@ msgid "%s subprocess got fatal signal" msgstr "Subprozess %s hat ein fatales Signal erhalten" EOF -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; } -LC_ALL=C tr -d '\r' < mg-test1.tmp > mg-test1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGGREP} -N pipe-bidi.c -o mg-test1.tmp mg-test1.po || exit 1 +LC_ALL=C tr -d '\r' < mg-test1.tmp > mg-test1.out || exit 1 -tmpfiles="$tmpfiles mg-test1.ok" cat <<\EOF > mg-test1.ok # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -194,6 +186,4 @@ EOF ${DIFF} mg-test1.ok mg-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-10 b/gettext-tools/tests/msggrep-10 index 140ea6d..753220b 100755..100644 --- a/gettext-tools/tests/msggrep-10 +++ b/gettext-tools/tests/msggrep-10 @@ -5,13 +5,7 @@ # <https://bugzilla.redhat.com/show_bug.cgi?id=483181> # <https://savannah.gnu.org/bugs/?25437> -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - : ${MSGGREP=msggrep} -echo a=b | LC_MESSAGES=C LC_ALL= ${MSGGREP} -P -K -e '^a$' > /dev/null -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +echo a=b | LC_MESSAGES=C LC_ALL= ${MSGGREP} -P -K -e '^a$' > /dev/null || exit 1 exit $result diff --git a/gettext-tools/tests/msggrep-2 b/gettext-tools/tests/msggrep-2 index c7047a5..62eafbc 100755..100644 --- a/gettext-tools/tests/msggrep-2 +++ b/gettext-tools/tests/msggrep-2 @@ -3,10 +3,6 @@ # Test --domain option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test2.po" cat <<\EOF > mg-test2.po domain "de" @@ -153,14 +149,10 @@ msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'option -W %s ne tolre pas d'argument\n" EOF -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; } -LC_ALL=C tr -d '\r' < mg-test2.tmp > mg-test2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGGREP} -M fr -o mg-test2.tmp mg-test2.po || exit 1 +LC_ALL=C tr -d '\r' < mg-test2.tmp > mg-test2.out || exit 1 -tmpfiles="$tmpfiles mg-test2.ok" cat <<\EOF > mg-test2.ok domain "de" @@ -256,6 +248,4 @@ EOF ${DIFF} mg-test2.ok mg-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-3 b/gettext-tools/tests/msggrep-3 index 5cd44b3..fbcbf93 100755..100644 --- a/gettext-tools/tests/msggrep-3 +++ b/gettext-tools/tests/msggrep-3 @@ -3,10 +3,6 @@ # Test --msgid and --msgstr options. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test3.po" cat <<\EOF > mg-test3.po # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -160,17 +156,14 @@ msgid "GSG-9" msgstr "Antiterror-Einheit" EOF -tmpfiles="$tmpfiles mg-test3.tmp mg-test3.err mg-test3.out" : ${MSGGREP=msggrep} LC_MESSAGES=C LC_ALL= \ ${MSGGREP} -K -e error -T -e Speicher -o mg-test3.tmp mg-test3.po >mg-test3.err 2>&1 result=$? cat mg-test3.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mg-test3.tmp > mg-test3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mg-test3.tmp > mg-test3.out || exit 1 -tmpfiles="$tmpfiles mg-test3.ok" cat <<\EOF > mg-test3.ok # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -219,6 +212,4 @@ EOF ${DIFF} mg-test3.ok mg-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-4 b/gettext-tools/tests/msggrep-4 index 4677b0a..b15b51a 100755..100644 --- a/gettext-tools/tests/msggrep-4 +++ b/gettext-tools/tests/msggrep-4 @@ -3,10 +3,6 @@ # Test multiple -e and multiple -f options. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test4.po" cat <<\EOF > mg-test4.po # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -156,23 +152,18 @@ msgid "%s subprocess got fatal signal" msgstr "Subprozess %s hat ein fatales Signal erhalten" EOF -tmpfiles="$tmpfiles mg-test4.in1" echo 'invalid' > mg-test4.in1 -tmpfiles="$tmpfiles mg-test4.in2" echo 'illegal' > mg-test4.in2 -tmpfiles="$tmpfiles mg-test4.tmp mg-test4.err mg-test4.out" : ${MSGGREP=msggrep} LC_MESSAGES=C LC_ALL= \ ${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot -o mg-test4.tmp mg-test4.po > mg-test4.err 2>&1 result=$? cat mg-test4.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mg-test4.tmp > mg-test4.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mg-test4.tmp > mg-test4.out || exit 1 -tmpfiles="$tmpfiles mg-test4.ok" cat <<\EOF > mg-test4.ok # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -241,6 +232,4 @@ EOF ${DIFF} mg-test4.ok mg-test4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-5 b/gettext-tools/tests/msggrep-5 index 4494905..9252f38 100755..100644 --- a/gettext-tools/tests/msggrep-5 +++ b/gettext-tools/tests/msggrep-5 @@ -3,10 +3,6 @@ # Test --comment option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test5.po" cat <<\EOF > mg-test5.po # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -168,17 +164,14 @@ msgid "GSG-9" msgstr "Antiterror-Einheit" EOF -tmpfiles="$tmpfiles mg-test5.tmp mg-test5.err mg-test5.out" : ${MSGGREP=msggrep} LC_MESSAGES=C LC_ALL= \ ${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; } -LC_ALL=C tr -d '\r' < mg-test5.tmp > mg-test5.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mg-test5.tmp > mg-test5.out || exit 1 -tmpfiles="$tmpfiles mg-test5.ok" cat <<\EOF > mg-test5.ok # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -232,6 +225,4 @@ EOF ${DIFF} mg-test5.ok mg-test5.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-6 b/gettext-tools/tests/msggrep-6 index 79b5a03..20b5310 100755..100644 --- a/gettext-tools/tests/msggrep-6 +++ b/gettext-tools/tests/msggrep-6 @@ -3,10 +3,6 @@ # Test --msgid and --msgstr options with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test6.properties" cat <<\EOF > mg-test6.properties #: argmatch.c:141 #, c-format @@ -115,16 +111,13 @@ cannot\ create\ pipe=Es ist nicht m\u00f6glich, eine Pipe zu erzeugen GSG-9=Antiterror-Einheit EOF -tmpfiles="$tmpfiles mg-test6.tmp mg-test6.out" : ${MSGGREP=msggrep} 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; } -LC_ALL=C tr -d '\r' < mg-test6.tmp > mg-test6.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mg-test6.tmp > mg-test6.out || exit 1 -tmpfiles="$tmpfiles mg-test6.ok" cat <<\EOF > mg-test6.ok #: copy-file.c:60 #, c-format @@ -153,6 +146,4 @@ EOF ${DIFF} mg-test6.ok mg-test6.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-7 b/gettext-tools/tests/msggrep-7 index 287187c..18fcd44 100755..100644 --- a/gettext-tools/tests/msggrep-7 +++ b/gettext-tools/tests/msggrep-7 @@ -3,10 +3,6 @@ # Test msggrep on a PO file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test7.po" cat <<\EOF > mg-test7.po msgid "" msgstr "" @@ -52,17 +48,14 @@ msgstr "photocopieur" #~ msgstr "Enregistrer sous" EOF -tmpfiles="$tmpfiles mg-test7.tmp mg-test7.out mg-test7.err" : ${MSGGREP=msggrep} LC_MESSAGES=C LC_ALL= \ ${MSGGREP} -J -e "File|" -o mg-test7.tmp mg-test7.po 2> mg-test7.err result=$? cat mg-test7.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out || exit 1 -tmpfiles="$tmpfiles mg-test7.ok" cat <<\EOF > mg-test7.ok msgid "" msgstr "" @@ -89,6 +82,4 @@ EOF ${DIFF} mg-test7.ok mg-test7.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-8 b/gettext-tools/tests/msggrep-8 index 42fef13..10f4457 100755..100644 --- a/gettext-tools/tests/msggrep-8 +++ b/gettext-tools/tests/msggrep-8 @@ -3,10 +3,6 @@ # Test --extracted-comment option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test8.po" cat <<\EOF > mg-test8.po msgid "" msgstr "" @@ -36,17 +32,14 @@ msgid "repeat %d times" msgstr "%d mal wiederholen" EOF -tmpfiles="$tmpfiles mg-test8.tmp mg-test8.err mg-test8.out" : ${MSGGREP=msggrep} LC_MESSAGES=C LC_ALL= \ ${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; } -LC_ALL=C tr -d '\r' < mg-test8.tmp > mg-test8.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mg-test8.tmp > mg-test8.out || exit 1 -tmpfiles="$tmpfiles mg-test8.ok" cat <<\EOF > mg-test8.ok msgid "" msgstr "" @@ -70,6 +63,4 @@ EOF ${DIFF} mg-test8.ok mg-test8.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msggrep-9 b/gettext-tools/tests/msggrep-9 index 6a0750c..9be93d3 100755..100644 --- a/gettext-tools/tests/msggrep-9 +++ b/gettext-tools/tests/msggrep-9 @@ -3,10 +3,6 @@ # Test interpretation of $ as end-of-line anchor. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mg-test9.po" cat <<\EOF > mg-test9.po # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -158,17 +154,14 @@ msgid "%s subprocess got fatal signal" msgstr "Subprozess %s hat ein fatales Signal erhalten" EOF -tmpfiles="$tmpfiles mg-test9.tmp mg-test9.err mg-test9.out" : ${MSGGREP=msggrep} LC_MESSAGES=C LC_ALL= \ ${MSGGREP} -K -e 'argument$' -o mg-test9.tmp mg-test9.po > mg-test9.err 2>&1 result=$? cat mg-test9.err | grep -v 'warning: Locale charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mg-test9.tmp > mg-test9.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mg-test9.tmp > mg-test9.out || exit 1 -tmpfiles="$tmpfiles mg-test9.ok" cat <<\EOF > mg-test9.ok # German translations for GNU gettext package. # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc. @@ -226,6 +219,4 @@ EOF ${DIFF} mg-test9.ok mg-test9.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msginit-1 b/gettext-tools/tests/msginit-1 index 820a35a..71754d2 100755..100644 --- a/gettext-tools/tests/msginit-1 +++ b/gettext-tools/tests/msginit-1 @@ -3,10 +3,6 @@ # Test plural count for locales with nplurals != 2. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mi-test1.pot" cat <<\EOF > mi-test1.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -41,16 +37,13 @@ msgid "%s is replaced by %s." msgstr "" EOF -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; } +test $? = 0 || { cat mi-test1.err 1>&2; exit 1; } # The charset stored in the header entry is the locale encoding of the gl_IE # locale, which is system dependent, or ASCII if the locale does not exist. -sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out || exit 1 -tmpfiles="$tmpfiles mi-test1.ok" cat <<\EOF > mi-test1.ok "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -80,6 +73,4 @@ EOF ${DIFF} mi-test1.ok mi-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msginit-2 b/gettext-tools/tests/msginit-2 index cbe681d..bd8c5af 100755..100644 --- a/gettext-tools/tests/msginit-2 +++ b/gettext-tools/tests/msginit-2 @@ -3,10 +3,6 @@ # Test msginit on a POT file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mi-test2.pot" cat <<\EOF > mi-test2.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -65,14 +61,11 @@ msgstr "" #~ msgstr "" EOF -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 | LC_ALL=C tr -d '\r' > mi-test2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat mi-test2.err 1>&2; exit 1; } +sed -e '1,10d' < mi-test2.tmp | LC_ALL=C tr -d '\r' > mi-test2.out || exit 1 -tmpfiles="$tmpfiles mi-test2.ok" cat <<\EOF > mi-test2.ok "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -117,6 +110,4 @@ EOF ${DIFF} mi-test2.ok mi-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-1 b/gettext-tools/tests/msgmerge-1 index 386f64e..dd1f689 100755..100644 --- a/gettext-tools/tests/msgmerge-1 +++ b/gettext-tools/tests/msgmerge-1 @@ -3,10 +3,6 @@ # Test general operation and line wrapping. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test1.in1 mm-test1.in2" cat <<EOF > mm-test1.in1 # first #. this should be discarded @@ -39,14 +35,10 @@ msgid "3" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test1.tmp > mm-test1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test1.tmp mm-test1.in1 mm-test1.in2 || exit 1 +LC_ALL=C tr -d '\r' < mm-test1.tmp > mm-test1.out || exit 1 -tmpfiles="$tmpfiles mm-test1.ok" cat << EOF > mm-test1.ok # first #. this is the first @@ -73,6 +65,4 @@ EOF ${DIFF} mm-test1.ok mm-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-10 b/gettext-tools/tests/msgmerge-10 index c108bb1..eb1a429 100755..100644 --- a/gettext-tools/tests/msgmerge-10 +++ b/gettext-tools/tests/msgmerge-10 @@ -4,10 +4,6 @@ # Test merging of a message which has plural forms in ref.pot but not # in def.po. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test10.po" cat <<EOF > mm-test10.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -30,7 +26,6 @@ msgid "%d error" msgstr "%d erreur" EOF -tmpfiles="$tmpfiles mm-test10.pot" cat <<EOF > mm-test10.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -55,14 +50,10 @@ msgstr[0] "" msgstr[1] "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test10.tmp mm-test10.po mm-test10.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out || exit 1 -tmpfiles="$tmpfiles mm-test10.ok" cat <<EOF > mm-test10.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -92,6 +83,4 @@ EOF ${DIFF} mm-test10.ok mm-test10.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11 index a0203f5..bb5d757 100755..100644 --- a/gettext-tools/tests/msgmerge-11 +++ b/gettext-tools/tests/msgmerge-11 @@ -4,10 +4,6 @@ # Test merging of a message which has plural forms in ref.pot but not # in def.po. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test11.po" cat <<EOF > mm-test11.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -32,7 +28,6 @@ msgid "%d error" msgstr "%d erreur" EOF -tmpfiles="$tmpfiles mm-test11.pot" cat <<EOF > mm-test11.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -57,14 +52,10 @@ msgstr[0] "" msgstr[1] "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test11.tmp mm-test11.po mm-test11.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out || exit 1 -tmpfiles="$tmpfiles mm-test11.ok" cat <<EOF > mm-test11.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -98,6 +89,4 @@ EOF ${DIFF} mm-test11.ok mm-test11.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-12 b/gettext-tools/tests/msgmerge-12 index d6d629a..46c25a6 100755..100644 --- a/gettext-tools/tests/msgmerge-12 +++ b/gettext-tools/tests/msgmerge-12 @@ -4,10 +4,6 @@ # Test merging of a message which has plural forms in def.po but not # in ref.pot. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test12.po" cat <<EOF > mm-test12.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -32,7 +28,6 @@ msgstr[0] "%d erreur" msgstr[1] "%d erreurs" EOF -tmpfiles="$tmpfiles mm-test12.pot" cat <<EOF > mm-test12.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -55,14 +50,10 @@ msgid "%d error" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test12.tmp mm-test12.po mm-test12.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out || exit 1 -tmpfiles="$tmpfiles mm-test12.ok" cat <<EOF > mm-test12.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -90,6 +81,4 @@ EOF ${DIFF} mm-test12.ok mm-test12.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-13 b/gettext-tools/tests/msgmerge-13 index 3521867..2887698 100755..100644 --- a/gettext-tools/tests/msgmerge-13 +++ b/gettext-tools/tests/msgmerge-13 @@ -4,10 +4,6 @@ # Test merging of a message which has c-format specified in ref.pot but not # in def.po. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test13.po" cat <<EOF > mm-test13.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -47,7 +43,6 @@ msgid "%age" msgstr "%-Satz" EOF -tmpfiles="$tmpfiles mm-test13.pot" cat <<EOF > mm-test13.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -88,14 +83,10 @@ msgid "%age" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test13.tmp mm-test13.po mm-test13.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out || exit 1 -tmpfiles="$tmpfiles mm-test13.ok" cat <<EOF > mm-test13.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -141,6 +132,4 @@ EOF ${DIFF} mm-test13.ok mm-test13.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-14 b/gettext-tools/tests/msgmerge-14 index ae94811..7c15d2f 100755..100644 --- a/gettext-tools/tests/msgmerge-14 +++ b/gettext-tools/tests/msgmerge-14 @@ -5,10 +5,6 @@ # encoding (that was produced from an older version of ref.pot, in ASCII # encoding). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test14-ru.po" cat <<\EOF > mm-test14-ru.po # Russian messages for CLISP # Copyright (C) 1998 Free Software Foundation, Inc. @@ -31,7 +27,6 @@ msgid "Division durch Null" msgstr "津姪良 料 燐蒙" EOF -tmpfiles="$tmpfiles mm-test14.pot" cat <<\EOF > mm-test14.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -59,14 +54,10 @@ msgid "berlauf" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test14.tmp > mm-test14.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test14.tmp mm-test14-ru.po mm-test14.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test14.tmp > mm-test14.out || exit 1 -tmpfiles="$tmpfiles mm-test14.ok" cat <<\EOF > mm-test14.ok # Russian messages for CLISP # Copyright (C) 1998 Free Software Foundation, Inc. @@ -98,6 +89,4 @@ EOF ${DIFF} mm-test14.ok mm-test14.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-15 b/gettext-tools/tests/msgmerge-15 index 84d50f8..a7a80aa 100755..100644 --- a/gettext-tools/tests/msgmerge-15 +++ b/gettext-tools/tests/msgmerge-15 @@ -3,10 +3,6 @@ # Test pseudo-comments containing filenames that start with a digit. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test15.pot mm-test15.po" cat <<\EOF > mm-test15.pot msgid "" msgstr "" @@ -30,14 +26,10 @@ msgid "invalid argument `%s' for `%s'" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test15.tmp mm-test15.pot mm-test15.po || exit 1 +LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out || exit 1 -tmpfiles="$tmpfiles mm-test15.ok" cat <<\EOF > mm-test15.ok msgid "" msgstr "" @@ -58,6 +50,4 @@ EOF ${DIFF} mm-test15.ok mm-test15.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-16 b/gettext-tools/tests/msgmerge-16 index f23eb1f..ed726c2 100755..100644 --- a/gettext-tools/tests/msgmerge-16 +++ b/gettext-tools/tests/msgmerge-16 @@ -4,10 +4,6 @@ # Test non-ASCII msgids when the PO file and the POT file are in different # encodings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test16.po" cat <<\EOF > mm-test16.po msgid "" msgstr "" @@ -32,7 +28,6 @@ msgid "error %1." msgstr "b咳d %1." EOF -tmpfiles="$tmpfiles mm-test16.pot" cat <<EOF > mm-test16.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Yoyodyne, Inc. @@ -61,14 +56,10 @@ msgid "error %1." msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test16.tmp.po mm-test16.po mm-test16.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po || exit 1 -tmpfiles="$tmpfiles mm-test16.ok" cat <<\EOF > mm-test16.ok msgid "" msgstr "" @@ -98,6 +89,4 @@ EOF ${DIFF} mm-test16.ok mm-test16.new.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-17 b/gettext-tools/tests/msgmerge-17 index c730cc9..7342061 100755..100644 --- a/gettext-tools/tests/msgmerge-17 +++ b/gettext-tools/tests/msgmerge-17 @@ -4,10 +4,6 @@ # Test that untranslated messages that are brought over from the .pot file # get the right number of msgstrs. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test17.po" cat <<\EOF > mm-test17.po # Irish translations. msgid "" @@ -21,7 +17,6 @@ msgid "'Your command, please?', asked the waiter." msgstr "" EOF -tmpfiles="$tmpfiles mm-test17.pot" cat <<\EOF > mm-test17.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -55,14 +50,10 @@ msgid "%s is replaced by %s." msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test17.tmp.po mm-test17.po mm-test17.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po || exit 1 -tmpfiles="$tmpfiles mm-test17.ok" cat <<\EOF > mm-test17.ok # Irish translations. msgid "" @@ -92,6 +83,4 @@ EOF ${DIFF} mm-test17.ok mm-test17.new.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-18 b/gettext-tools/tests/msgmerge-18 index f7b3bfc..6037379 100755..100644 --- a/gettext-tools/tests/msgmerge-18 +++ b/gettext-tools/tests/msgmerge-18 @@ -3,10 +3,6 @@ # Test msgmerge and msgcmp on a PO file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test18.po" cat <<\EOF > mm-test18.po msgid "" msgstr "" @@ -52,7 +48,6 @@ msgid "copier" msgstr "photocopieur" EOF -tmpfiles="$tmpfiles mm-test18.pot" cat <<\EOF > mm-test18.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -119,16 +114,12 @@ EOF : ${MSGCMP=msgcmp} ${MSGCMP} --use-fuzzy --use-untranslated mm-test18.po mm-test18.pot 2>/dev/null -test $? = 1 || { rm -fr $tmpfiles; exit 1; } +test $? = 1 || { exit 1; } -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; } -LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test18.tmp.po mm-test18.po mm-test18.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po || exit 1 -tmpfiles="$tmpfiles mm-test18.ok" # Note that the fuzzy guess for "Open" in context "Door state" could be either # "Ouvrir" (from context "File|") or "Ouvert" (from context "Lock state"). cat <<\EOF > mm-test18.ok @@ -195,13 +186,9 @@ msgstr "photocopieur" EOF : ${DIFF=diff} -${DIFF} mm-test18.ok mm-test18.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${DIFF} mm-test18.ok mm-test18.new.po || exit 1 : ${MSGCMP=msgcmp} -${MSGCMP} --use-fuzzy --use-untranslated mm-test18.new.po mm-test18.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${MSGCMP} --use-fuzzy --use-untranslated mm-test18.new.po mm-test18.pot || exit 1 exit 0 diff --git a/gettext-tools/tests/msgmerge-19 b/gettext-tools/tests/msgmerge-19 index 2a08ddf..740b7ae 100755..100644 --- a/gettext-tools/tests/msgmerge-19 +++ b/gettext-tools/tests/msgmerge-19 @@ -3,10 +3,6 @@ # Test msgmerge --previous option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test19.po" cat <<\EOF > mm-test19.po msgid "" msgstr "" @@ -32,7 +28,6 @@ msgid "%s: invalid option -- %c\n" msgstr "%s: ung端ltige Option -- %c\n" EOF -tmpfiles="$tmpfiles mm-test19.pot" cat <<\EOF > mm-test19.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -81,14 +76,10 @@ msgid "%s: invalid option -- %c\n" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.po mm-test19.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po || exit 1 -tmpfiles="$tmpfiles mm-test19.ok1" cat <<\EOF > mm-test19.ok1 msgid "" msgstr "" @@ -129,10 +120,8 @@ msgstr "%s: ung端ltige Option -- %c\n" EOF : ${DIFF=diff} -${DIFF} mm-test19.ok1 mm-test19.new1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${DIFF} mm-test19.ok1 mm-test19.new1.po || exit 1 -tmpfiles="$tmpfiles mm-test19.pot" cat <<\EOF > mm-test19.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -171,14 +160,10 @@ msgid "Missing arguments." msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.new1.po mm-test19.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po || exit 1 -tmpfiles="$tmpfiles mm-test19.ok2" cat <<\EOF > mm-test19.ok2 msgid "" msgstr "" @@ -218,9 +203,6 @@ msgstr "Argumente fehlen" EOF : ${DIFF=diff} -${DIFF} mm-test19.ok2 mm-test19.new2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${DIFF} mm-test19.ok2 mm-test19.new2.po || exit 1 exit 0 diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2 index f3564e3..b2b7527 100755..100644 --- a/gettext-tools/tests/msgmerge-2 +++ b/gettext-tools/tests/msgmerge-2 @@ -3,10 +3,6 @@ # Test recognition of duplicates. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test2.in1 mm-test2.in2" cat <<EOF > mm-test2.in1 msgid "2" msgstr "2" msgid "3" msgstr "3" @@ -19,13 +15,11 @@ msgid "2" msgstr "" msgid "3" msgstr "" EOF -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|' -e 's|^msgmerge\.exe|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test2.out -tmpfiles="$tmpfiles mm-test2.ok" cat << EOF > mm-test2.ok mm-test2.in1:3: duplicate message definition... mm-test2.in1:1: ...this is the location of the first definition @@ -36,6 +30,4 @@ EOF ${DIFF} mm-test2.ok mm-test2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-20 b/gettext-tools/tests/msgmerge-20 index 0b53b6f..f752fd9 100755..100644 --- a/gettext-tools/tests/msgmerge-20 +++ b/gettext-tools/tests/msgmerge-20 @@ -4,10 +4,6 @@ # Test msgmerge when the second argument is a PO file with obsolete messages # (e.g. the result of an earlier msgmerge operation). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test20.po" cat <<\EOF > mm-test20.po msgid "" msgstr "" @@ -36,7 +32,6 @@ msgid "This program is running as process number {pid}." msgstr "Dieses Programm l辰uft mit der Proze-Nummer {pid}." EOF -tmpfiles="$tmpfiles mm-test20.pot" cat <<\EOF > mm-test20.pot #, fuzzy msgid "" @@ -76,14 +71,10 @@ msgstr "" #~ msgstr "Dieses Programm l辰uft mit der Proze-Nummer {pid}." EOF -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; } -LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test20.tmp.po mm-test20.po mm-test20.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po || exit 1 -tmpfiles="$tmpfiles mm-test20.ok" cat <<\EOF > mm-test20.ok msgid "" msgstr "" @@ -118,9 +109,6 @@ msgstr "" EOF : ${DIFF=diff} -${DIFF} mm-test20.ok mm-test20.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${DIFF} mm-test20.ok mm-test20.new.po || exit 1 exit 0 diff --git a/gettext-tools/tests/msgmerge-21 b/gettext-tools/tests/msgmerge-21 index bc49276..6e1c6f5 100755..100644 --- a/gettext-tools/tests/msgmerge-21 +++ b/gettext-tools/tests/msgmerge-21 @@ -4,10 +4,6 @@ # Test msgmerge when a message's flags have been changed from c-format to # kde-format. Reported by Chusslove Illich (丼舒仍舒于 仍亳). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test21.po" cat <<\EOF > mm-test21.po msgid "" msgstr "" @@ -29,7 +25,6 @@ msgstr[0] "Engadir un recurso dende o libro de enderezos" msgstr[1] "Engadir %n recursos dende o libro de enderezos" EOF -tmpfiles="$tmpfiles mm-test21.pot" cat <<\EOF > mm-test21.pot msgid "" msgstr "" @@ -50,14 +45,10 @@ msgstr[0] "" msgstr[1] "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test21.tmp.po mm-test21.po mm-test21.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po || exit 1 -tmpfiles="$tmpfiles mm-test21.ok" cat <<\EOF > mm-test21.ok msgid "" msgstr "" @@ -81,14 +72,9 @@ msgstr[1] "Engadir %n recursos dende o libro de enderezos" EOF : ${DIFF=diff} -${DIFF} mm-test21.ok mm-test21.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${DIFF} mm-test21.ok mm-test21.new.po || exit 1 -tmpfiles="$tmpfiles mm-test21.mo" : ${MSGFMT=msgfmt} -${MSGFMT} --check -o mm-test21.mo mm-test21.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${MSGFMT} --check -o mm-test21.mo mm-test21.new.po || exit 1 exit 0 diff --git a/gettext-tools/tests/msgmerge-22 b/gettext-tools/tests/msgmerge-22 index d8c975d..b0882d7 100755..100644 --- a/gettext-tools/tests/msgmerge-22 +++ b/gettext-tools/tests/msgmerge-22 @@ -4,10 +4,6 @@ # Test msgmerge when a msgid_plural changed but msgid remained the same. # Reported by Chusslove Illich (丼舒仍舒于 仍亳). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test22.po" cat <<\EOF > mm-test22.po msgid "" msgstr "" @@ -28,7 +24,6 @@ msgstr[0] "Engadir un recurso dende o libro de enderezos" msgstr[1] "Engadir %n recursos dende o libro de enderezos" EOF -tmpfiles="$tmpfiles mm-test22.pot" cat <<\EOF > mm-test22.pot msgid "" msgstr "" @@ -48,14 +43,10 @@ msgstr[0] "" msgstr[1] "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test22.tmp.po mm-test22.po mm-test22.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po || exit 1 -tmpfiles="$tmpfiles mm-test22.ok" cat <<\EOF > mm-test22.ok msgid "" msgstr "" @@ -79,14 +70,9 @@ msgstr[1] "Engadir %n recursos dende o libro de enderezos" EOF : ${DIFF=diff} -${DIFF} mm-test22.ok mm-test22.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${DIFF} mm-test22.ok mm-test22.new.po || exit 1 -tmpfiles="$tmpfiles mm-test22.mo" : ${MSGFMT=msgfmt} -${MSGFMT} --check -o mm-test22.mo mm-test22.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${MSGFMT} --check -o mm-test22.mo mm-test22.new.po || exit 1 exit 0 diff --git a/gettext-tools/tests/msgmerge-23 b/gettext-tools/tests/msgmerge-23 index b6d2927..757e190 100755..100644 --- a/gettext-tools/tests/msgmerge-23 +++ b/gettext-tools/tests/msgmerge-23 @@ -5,10 +5,6 @@ # and --previous was specified. # Reported by Chusslove Illich (丼舒仍舒于 仍亳). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test23.po" cat <<\EOF > mm-test23.po msgid "" msgstr "" @@ -45,7 +41,6 @@ msgstr[0] "Ein Band" msgstr[1] "%n B辰nde" EOF -tmpfiles="$tmpfiles mm-test23.pot" cat <<\EOF > mm-test23.pot msgid "" msgstr "" @@ -81,14 +76,10 @@ msgstr[0] "" msgstr[1] "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --previous -o mm-test23.tmp.po mm-test23.po mm-test23.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po || exit 1 -tmpfiles="$tmpfiles mm-test23.ok" cat <<\EOF > mm-test23.ok msgid "" msgstr "" @@ -129,14 +120,9 @@ msgstr[1] "%n B辰nde" EOF : ${DIFF=diff} -${DIFF} mm-test23.ok mm-test23.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${DIFF} mm-test23.ok mm-test23.new.po || exit 1 -tmpfiles="$tmpfiles mm-test23.mo" : ${MSGFMT=msgfmt} -${MSGFMT} --check -o mm-test23.mo mm-test23.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${MSGFMT} --check -o mm-test23.mo mm-test23.new.po || exit 1 exit 0 diff --git a/gettext-tools/tests/msgmerge-24 b/gettext-tools/tests/msgmerge-24 index 4e1c0a5..a919147 100755..100644 --- a/gettext-tools/tests/msgmerge-24 +++ b/gettext-tools/tests/msgmerge-24 @@ -3,10 +3,6 @@ # Test msgmerge and msgcmp: handling of 'range:' flags. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test24.po" cat <<\EOF > mm-test24.po msgid "" msgstr "" @@ -50,7 +46,6 @@ msgstr[0] "cinq semaines et un jour" msgstr[1] "cinq semaines et %d jours" EOF -tmpfiles="$tmpfiles mm-test24.pot" cat <<\EOF > mm-test24.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -107,17 +102,12 @@ msgstr[1] "" EOF : ${MSGCMP=msgcmp} -${MSGCMP} --use-fuzzy --use-untranslated mm-test24.po mm-test24.pot 2>/dev/null -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCMP} --use-fuzzy --use-untranslated mm-test24.po mm-test24.pot 2>/dev/null || exit 1 -tmpfiles="$tmpfiles mm-test24.tmp.po mm-test24.new.po" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o mm-test24.tmp.po mm-test24.po mm-test24.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-test24.tmp.po > mm-test24.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test24.tmp.po mm-test24.po mm-test24.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test24.tmp.po > mm-test24.new.po || exit 1 -tmpfiles="$tmpfiles mm-test24.ok" cat <<\EOF > mm-test24.ok msgid "" msgstr "" @@ -163,13 +153,9 @@ msgstr[1] "cinq semaines et %d jours" EOF : ${DIFF=diff} -${DIFF} mm-test24.ok mm-test24.new.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${DIFF} mm-test24.ok mm-test24.new.po || exit 1 : ${MSGCMP=msgcmp} -${MSGCMP} --use-fuzzy --use-untranslated mm-test24.new.po mm-test24.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${MSGCMP} --use-fuzzy --use-untranslated mm-test24.new.po mm-test24.pot || exit 1 exit 0 diff --git a/gettext-tools/tests/msgmerge-3 b/gettext-tools/tests/msgmerge-3 index 92a04be..b03d47e 100755..100644 --- a/gettext-tools/tests/msgmerge-3 +++ b/gettext-tools/tests/msgmerge-3 @@ -3,10 +3,6 @@ # Test handling of obsolete/untranslated messages. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test3.in1 mm-test3.in2" cat <<EOF > mm-test3.in1 # # def.po @@ -53,14 +49,10 @@ msgstr "" # trailing comments should be removed, even here EOF -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; } -LC_ALL=C tr -d '\r' < mm-test3.tmp > mm-test3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test3.tmp mm-test3.in1 mm-test3.in2 || exit 1 +LC_ALL=C tr -d '\r' < mm-test3.tmp > mm-test3.out || exit 1 -tmpfiles="$tmpfiles mm-test3.ok" cat << EOF > mm-test3.ok #: file3:102 msgid "still existing" @@ -84,6 +76,4 @@ EOF ${DIFF} mm-test3.ok mm-test3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-4 b/gettext-tools/tests/msgmerge-4 index 6329d70..df23377 100755..100644 --- a/gettext-tools/tests/msgmerge-4 +++ b/gettext-tools/tests/msgmerge-4 @@ -3,10 +3,6 @@ # Test handling of comments. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test4.in1.po mm-test4.in2.po" cat <<EOF > mm-test4.in1.po msgid "one" msgstr "eins" @@ -28,14 +24,10 @@ msgid "three" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test4.tmp mm-test4.in1.po mm-test4.in2.po || exit 1 +LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out || exit 1 -tmpfiles="$tmpfiles mm-test4.ok" cat <<EOF > mm-test4.ok msgid "one" msgstr "eins" @@ -57,6 +49,4 @@ EOF ${DIFF} mm-test4.ok mm-test4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-5 b/gettext-tools/tests/msgmerge-5 index 3c53aab..db90c6f 100755..100644 --- a/gettext-tools/tests/msgmerge-5 +++ b/gettext-tools/tests/msgmerge-5 @@ -3,10 +3,6 @@ # Test handling of header entry. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test5.in1.po mm-test5.in2.po" cat <<EOF > mm-test5.in1.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -40,17 +36,14 @@ msgstr "" "blah blah blah blah blah blah blah blah blah blah blah blah blah bla bla bla\n" EOF -tmpfiles="$tmpfiles mm-test5.tmp mm-test5.out mm-test5.err" : ${MSGMERGE=msgmerge} LC_MESSAGES=C LC_ALL= \ ${MSGMERGE} -q -o mm-test5.tmp mm-test5.in1.po mm-test5.in2.po >mm-test5.err 2>&1 result=$? cat mm-test5.err | grep -v 'warning: Charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } +LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out || exit 1 -tmpfiles="$tmpfiles mm-test5.ok" cat <<EOF > mm-test5.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -79,6 +72,4 @@ EOF ${DIFF} mm-test5.ok mm-test5.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6 index 93dabcd..1d07320 100755..100644 --- a/gettext-tools/tests/msgmerge-6 +++ b/gettext-tools/tests/msgmerge-6 @@ -3,10 +3,6 @@ # Test non-ASCII character at the end of msgstr. (Triggered a glibc-2.1 bug.) -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test6.in1.po mm-test6.in2.po" cat <<\EOF > mm-test6.in1.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -57,15 +53,11 @@ msgid "was correct." msgstr "" EOF -tmpfiles="$tmpfiles mm-test6.tmp mm-test6.out" : ${MSGMERGE=msgmerge} 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; } -LC_ALL=C tr -d '\r' < mm-test6.tmp > mm-test6.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test6.tmp mm-test6.in1.po mm-test6.in2.po || exit 1 +LC_ALL=C tr -d '\r' < mm-test6.tmp > mm-test6.out || exit 1 -tmpfiles="$tmpfiles mm-test6.ok" cat <<\EOF > mm-test6.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -100,6 +92,4 @@ EOF ${DIFF} mm-test6.ok mm-test6.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-7 b/gettext-tools/tests/msgmerge-7 index bb4fc5b..de33984 100755..100644 --- a/gettext-tools/tests/msgmerge-7 +++ b/gettext-tools/tests/msgmerge-7 @@ -3,10 +3,6 @@ # Test multi-domain handling. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test7.po" cat <<\EOF > mm-test7.po domain "foo-de" msgid "" @@ -33,7 +29,6 @@ msgid "bye" msgstr "A bientt" EOF -tmpfiles="$tmpfiles mm-test7.pot" cat <<EOF > mm-test7.pot domain "foo-de" msgid "Hello" @@ -43,14 +38,10 @@ msgid "Hello" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o mm-test7.tmp mm-test7.po mm-test7.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out || exit 1 -tmpfiles="$tmpfiles mm-test7.ok" cat <<\EOF > mm-test7.ok domain "foo-de" @@ -85,6 +76,4 @@ EOF ${DIFF} mm-test7.ok mm-test7.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-8 b/gettext-tools/tests/msgmerge-8 index 2bae7db..32a8373 100755..100644 --- a/gettext-tools/tests/msgmerge-8 +++ b/gettext-tools/tests/msgmerge-8 @@ -3,10 +3,6 @@ # Test multi-domain handling. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test8.po" cat <<\EOF > mm-test8.po domain "foo-de" msgid "" @@ -33,20 +29,15 @@ msgid "bye" msgstr "A bientt" EOF -tmpfiles="$tmpfiles mm-test8.pot" cat <<EOF > mm-test8.pot msgid "Hello" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-test8.tmp > mm-test8.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} --multi-domain -q -o mm-test8.tmp mm-test8.po mm-test8.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-test8.tmp > mm-test8.out || exit 1 -tmpfiles="$tmpfiles mm-test8.ok" cat <<\EOF > mm-test8.ok domain "foo-de" @@ -81,6 +72,4 @@ EOF ${DIFF} mm-test8.ok mm-test8.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-9 index 2477ec1..0fae9a3 100755..100644 --- a/gettext-tools/tests/msgmerge-9 +++ b/gettext-tools/tests/msgmerge-9 @@ -3,10 +3,6 @@ # Duplicates are also fatal in obsolete marked entries (cf. msgmerge-3). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-test9.in1 mm-test9.in2" cat <<EOF > mm-test9.in1 msgid "2" msgstr "2" msgid "3" msgstr "3" @@ -22,13 +18,11 @@ msgid "2" msgstr "" msgid "3" msgstr "" EOF -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|' -e 's|^msgmerge\.exe|msgmerge|' | LC_ALL=C tr -d '\r' > mm-test9.err -tmpfiles="$tmpfiles mm-test9.ok" cat << EOF > mm-test9.ok mm-test9.in1:3: duplicate message definition... mm-test9.in1:1: ...this is the location of the first definition @@ -39,6 +33,4 @@ EOF ${DIFF} mm-test9.ok mm-test9.err result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1 index 8b949eb..449a1b8 100755..100644 --- a/gettext-tools/tests/msgmerge-compendium-1 +++ b/gettext-tools/tests/msgmerge-compendium-1 @@ -3,10 +3,6 @@ # Test compendium option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-c-1.in1 mm-c-1.com mm-c-1.pot" cat <<EOF > mm-c-1.in1 #: file.c:123 msgid "1" @@ -29,14 +25,10 @@ msgid "2" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-c-1.tmp > mm-c-1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.tmp mm-c-1.in1 mm-c-1.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-1.tmp > mm-c-1.out || exit 1 -tmpfiles="$tmpfiles mm-c-1.ok" cat << EOF > mm-c-1.ok #: file.c:123 msgid "1" @@ -51,6 +43,4 @@ EOF ${DIFF} mm-c-1.ok mm-c-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-compendium-2 b/gettext-tools/tests/msgmerge-compendium-2 index 61cad22..cace4b6 100755..100644 --- a/gettext-tools/tests/msgmerge-compendium-2 +++ b/gettext-tools/tests/msgmerge-compendium-2 @@ -3,10 +3,6 @@ # Test compendium option with fuzziness. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-c-2.in1 mm-c-2.com mm-c-2.pot" cat <<EOF > mm-c-2.in1 #: file.c:123 msgid "1" @@ -29,14 +25,10 @@ msgid "one, two, three..." msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-c-2.tmp > mm-c-2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.tmp mm-c-2.in1 mm-c-2.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-2.tmp > mm-c-2.out || exit 1 -tmpfiles="$tmpfiles mm-c-2.ok" cat << EOF > mm-c-2.ok #: file.c:123 msgid "1" @@ -52,6 +44,4 @@ EOF ${DIFF} mm-c-2.ok mm-c-2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-compendium-3 b/gettext-tools/tests/msgmerge-compendium-3 index dc89ea5..d209305 100755..100644 --- a/gettext-tools/tests/msgmerge-compendium-3 +++ b/gettext-tools/tests/msgmerge-compendium-3 @@ -7,10 +7,6 @@ # the old translation file (mm-c-3.in1) contains the same msgid # Why not make use of the translation from the compendium? -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-c-3.in1 mm-c-3.com mm-c-3.pot" cat <<EOF > mm-c-3.in1 #: file.c:123 msgid "1" @@ -37,14 +33,10 @@ msgid "one, two, three" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-c-3.tmp > mm-c-3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.tmp mm-c-3.in1 mm-c-3.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-3.tmp > mm-c-3.out || exit 1 -tmpfiles="$tmpfiles mm-c-3.ok" cat << EOF > mm-c-3.ok #: file.c:123 msgid "1" @@ -59,6 +51,4 @@ EOF ${DIFF} mm-c-3.ok mm-c-3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-compendium-4 b/gettext-tools/tests/msgmerge-compendium-4 index d119a52..a831624 100755..100644 --- a/gettext-tools/tests/msgmerge-compendium-4 +++ b/gettext-tools/tests/msgmerge-compendium-4 @@ -4,10 +4,6 @@ # Test compendium option. Use it there was no "old" PO file at all # (merely use /dev/null). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-c-4.com mm-c-4.pot" cat <<\EOF > mm-c-4.com msgid "" @@ -30,14 +26,10 @@ msgid "5" msgstr "" EOF -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; } -LC_ALL=C tr -d '\r' < mm-c-4.tmp > mm-c-4.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.tmp /dev/null mm-c-4.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-4.tmp > mm-c-4.out || exit 1 -tmpfiles="$tmpfiles mm-c-4.ok" cat << \EOF > mm-c-4.ok msgid "" msgstr "" @@ -57,6 +49,4 @@ EOF ${DIFF} mm-c-4.ok mm-c-4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-compendium-5 b/gettext-tools/tests/msgmerge-compendium-5 index bd0a3be..eb80ed4 100755..100644 --- a/gettext-tools/tests/msgmerge-compendium-5 +++ b/gettext-tools/tests/msgmerge-compendium-5 @@ -3,22 +3,14 @@ # Test compendium option with a large compendium. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-c-5.tmp mm-c-5.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-5.tmp \ --compendium "$abs_srcdir"/mm-viet.comp.po \ - /dev/null "$abs_srcdir"/mm-viet.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + /dev/null "$abs_srcdir"/mm-viet.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out || exit 1 : ${DIFF=diff} ${DIFF} "$abs_srcdir"/mm-viet.out mm-c-5.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6 index d0ea9f2..8735aca 100755..100644 --- a/gettext-tools/tests/msgmerge-compendium-6 +++ b/gettext-tools/tests/msgmerge-compendium-6 @@ -7,108 +7,75 @@ # mm-ko.ascii.pot mm-ko.euc-kr.po mm-ko-comp.euc-kr.po # mm-ko.utf-8.pot mm-ko.utf-8.po mm-ko-comp.utf-8.po -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-ko.utf-8.pot" : ${MSGCONV=msgconv} ${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$abs_srcdir"/mm-ko.ascii.pot -tmpfiles="$tmpfiles mm-ko.utf-8.po" : ${MSGCONV=msgconv} ${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.po "$abs_srcdir"/mm-ko.euc-kr.po -tmpfiles="$tmpfiles mm-ko-comp.utf-8.po" : ${MSGCONV=msgconv} ${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po "$abs_srcdir"/mm-ko-comp.euc-kr.po -tmpfiles="$tmpfiles mm-c-6-AEE.tmp mm-c-6-AEE.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-AEE.tmp \ --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \ - "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out || exit 1 -tmpfiles="$tmpfiles mm-c-6-AEU.tmp mm-c-6-AEU.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-AEU.tmp \ --compendium mm-ko-comp.utf-8.po \ - "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out || exit 1 -tmpfiles="$tmpfiles mm-c-6-AUE.tmp mm-c-6-AUE.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-AUE.tmp \ --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \ - mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out || exit 1 -tmpfiles="$tmpfiles mm-c-6-AUU.tmp mm-c-6-AUU.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-AUU.tmp \ --compendium mm-ko-comp.utf-8.po \ - mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out || exit 1 -tmpfiles="$tmpfiles mm-c-6-UEE.tmp mm-c-6-UEE.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-UEE.tmp \ --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \ - "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out || exit 1 -tmpfiles="$tmpfiles mm-c-6-UEU.tmp mm-c-6-UEU.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-UEU.tmp \ --compendium mm-ko-comp.utf-8.po \ - "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out || exit 1 -tmpfiles="$tmpfiles mm-c-6-UUE.tmp mm-c-6-UUE.out" : ${MSGMERGE=msgmerge} ${MSGMERGE} -q -o mm-c-6-UUE.tmp \ --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \ - mm-ko.utf-8.po mm-ko.utf-8.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mm-ko.utf-8.po mm-ko.utf-8.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out || exit 1 -tmpfiles="$tmpfiles mm-c-6-UUU.tmp mm-c-6-UUU.out" : ${MSGMERGE=msgmerge} ${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; } -LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + mm-ko.utf-8.po mm-ko.utf-8.pot || exit 1 +LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out || 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 | 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} mm-c-6-E.ok mm-c-6-AEU.out || { rm -fr $tmpfiles; exit 1; } -${DIFF} mm-c-6-U.ok mm-c-6-AUE.out || { rm -fr $tmpfiles; exit 1; } -${DIFF} mm-c-6-U.ok mm-c-6-AUU.out || { rm -fr $tmpfiles; exit 1; } -${DIFF} mm-c-6-U.ok mm-c-6-UEE.out || { rm -fr $tmpfiles; exit 1; } -${DIFF} mm-c-6-U.ok mm-c-6-UEU.out || { rm -fr $tmpfiles; exit 1; } -${DIFF} mm-c-6-U.ok mm-c-6-UUE.out || { rm -fr $tmpfiles; exit 1; } -${DIFF} mm-c-6-U.ok mm-c-6-UUU.out || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${DIFF} mm-c-6-E.ok mm-c-6-AEE.out || { exit 1; } +${DIFF} mm-c-6-E.ok mm-c-6-AEU.out || { exit 1; } +${DIFF} mm-c-6-U.ok mm-c-6-AUE.out || { exit 1; } +${DIFF} mm-c-6-U.ok mm-c-6-AUU.out || { exit 1; } +${DIFF} mm-c-6-U.ok mm-c-6-UEE.out || { exit 1; } +${DIFF} mm-c-6-U.ok mm-c-6-UEU.out || { exit 1; } +${DIFF} mm-c-6-U.ok mm-c-6-UUE.out || { exit 1; } +${DIFF} mm-c-6-U.ok mm-c-6-UUU.out || { exit 1; } exit 0 diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1 index bf58c20..ff7c968 100755..100644 --- a/gettext-tools/tests/msgmerge-properties-1 +++ b/gettext-tools/tests/msgmerge-properties-1 @@ -3,10 +3,6 @@ # Test handling of obsolete/untranslated messages with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-p-1.in1 mm-p-1.in2" cat <<EOF > mm-p-1.in1 # # def.po @@ -38,14 +34,10 @@ still\ existing=here is normally no comment # trailing comments should be removed, even here EOF -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; } -LC_ALL=C tr -d '\r' < mm-p-1.tmp > mm-p-1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.tmp mm-p-1.in1 mm-p-1.in2 || exit 1 +LC_ALL=C tr -d '\r' < mm-p-1.tmp > mm-p-1.out || exit 1 -tmpfiles="$tmpfiles mm-p-1.ok" cat << EOF > mm-p-1.ok #: file3:102 still\ existing=translation @@ -58,6 +50,4 @@ EOF ${DIFF} mm-p-1.ok mm-p-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-properties-2 b/gettext-tools/tests/msgmerge-properties-2 index fee33e7..aace912 100755..100644 --- a/gettext-tools/tests/msgmerge-properties-2 +++ b/gettext-tools/tests/msgmerge-properties-2 @@ -4,31 +4,22 @@ # Test --update: location changed, and xgettext comment added. Both changes # must be reflected in the resulting PO file. With Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-p-2.po" cat <<\EOF > mm-p-2.po #: cogarithmetic.cc:12 white=wei\u00df EOF -tmpfiles="$tmpfiles mm-p-2.pot" cat <<EOF > mm-p-2.pot #. location changed #: cogarithmetic.cc:33 !white= EOF -tmpfiles="$tmpfiles mm-p-2.po~ mm-p-2.tmp" : ${MSGMERGE=msgmerge} -${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; } -LC_ALL=C tr -d '\r' < mm-p-2.tmp > mm-p-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --properties-input --update mm-p-2.po mm-p-2.pot || exit 1 +mv mm-p-2.po mm-p-2.tmp || { exit 1; } +LC_ALL=C tr -d '\r' < mm-p-2.tmp > mm-p-2.po || exit 1 -tmpfiles="$tmpfiles mm-p-2.ok" cat <<\EOF > mm-p-2.ok #. location changed #: cogarithmetic.cc:33 @@ -39,6 +30,4 @@ EOF ${DIFF} mm-p-2.ok mm-p-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-update-1 b/gettext-tools/tests/msgmerge-update-1 index c1dccad..4a77882 100755..100644 --- a/gettext-tools/tests/msgmerge-update-1 +++ b/gettext-tools/tests/msgmerge-update-1 @@ -3,10 +3,6 @@ # Test --update: nothing changed; don't normalize second message -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-u-1.po" cat <<\EOF > mm-u-1.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -35,7 +31,6 @@ msgstr "" "schwarz" EOF -tmpfiles="$tmpfiles mm-u-1.pot" cat <<EOF > mm-u-1.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -61,18 +56,13 @@ msgid "black" msgstr "" EOF -tmpfiles="$tmpfiles mm-u-1.bak" cp mm-u-1.po mm-u-1.bak -tmpfiles="$tmpfiles mm-u-1.po~" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q --update mm-u-1.po mm-u-1.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --update mm-u-1.po mm-u-1.pot || exit 1 : ${DIFF=diff} ${DIFF} mm-u-1.bak mm-u-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2 index 765c052..4f651ca 100755..100644 --- a/gettext-tools/tests/msgmerge-update-2 +++ b/gettext-tools/tests/msgmerge-update-2 @@ -4,10 +4,6 @@ # Test --update: location changed, and xgettext comment added. Both changes # must be reflected in the resulting PO file. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-u-2.po" cat <<\EOF > mm-u-2.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -30,7 +26,6 @@ msgid "white" msgstr "wei" EOF -tmpfiles="$tmpfiles mm-u-2.pot" cat <<EOF > mm-u-2.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -53,15 +48,11 @@ msgid "white" msgstr "" EOF -tmpfiles="$tmpfiles mm-u-2.po~ mm-u-2.tmp" : ${MSGMERGE=msgmerge} -${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; } -LC_ALL=C tr -d '\r' < mm-u-2.tmp > mm-u-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --update mm-u-2.po mm-u-2.pot || exit 1 +mv mm-u-2.po mm-u-2.tmp || { exit 1; } +LC_ALL=C tr -d '\r' < mm-u-2.tmp > mm-u-2.po || exit 1 -tmpfiles="$tmpfiles mm-u-2.ok" cat <<\EOF > mm-u-2.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -89,6 +80,4 @@ EOF ${DIFF} mm-u-2.ok mm-u-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-update-3 b/gettext-tools/tests/msgmerge-update-3 index ddc9f3a..7f45a45 100755..100644 --- a/gettext-tools/tests/msgmerge-update-3 +++ b/gettext-tools/tests/msgmerge-update-3 @@ -5,10 +5,6 @@ # in the resulting PO file; this is needed for projects which don't put the # .pot file under CVS. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-u-3.po" cat <<\EOF > mm-u-3.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -31,7 +27,6 @@ msgid "white" msgstr "wei" EOF -tmpfiles="$tmpfiles mm-u-3.pot" cat <<EOF > mm-u-3.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -53,12 +48,9 @@ msgid "white" msgstr "" EOF -tmpfiles="$tmpfiles mm-u-3.po~" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q --update mm-u-3.po mm-u-3.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --update mm-u-3.po mm-u-3.pot || exit 1 -tmpfiles="$tmpfiles mm-u-3.ok" cat <<\EOF > mm-u-3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -85,6 +77,4 @@ EOF ${DIFF} mm-u-3.ok mm-u-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgmerge-update-4 b/gettext-tools/tests/msgmerge-update-4 index 7f2e978..e76974b 100755..100644 --- a/gettext-tools/tests/msgmerge-update-4 +++ b/gettext-tools/tests/msgmerge-update-4 @@ -5,10 +5,6 @@ # must not be reflected in the resulting PO file; this is needed for projects # which don't put the .pot file under CVS. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mm-u-4.po" cat <<\EOF > mm-u-4.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -34,7 +30,6 @@ msgstr "wei" #~ msgstr "grn" EOF -tmpfiles="$tmpfiles mm-u-4.pot" cat <<EOF > mm-u-4.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -56,12 +51,9 @@ msgid "white" msgstr "" EOF -tmpfiles="$tmpfiles mm-u-4.po~" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q --update --sort-output mm-u-4.po mm-u-4.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q --update --sort-output mm-u-4.po mm-u-4.pot || exit 1 -tmpfiles="$tmpfiles mm-u-4.ok" cat <<\EOF > mm-u-4.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. @@ -91,6 +83,4 @@ EOF ${DIFF} mm-u-4.ok mm-u-4.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgunfmt-1 b/gettext-tools/tests/msgunfmt-1 index 5cddfb0..ccde087 100755..100644 --- a/gettext-tools/tests/msgunfmt-1 +++ b/gettext-tools/tests/msgunfmt-1 @@ -3,10 +3,6 @@ # Test of general operation. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mu-test1.in" cat <<EOF > mu-test1.in msgid "eight" msgstr "eighth" @@ -33,22 +29,15 @@ msgid "two" msgstr "second" EOF -tmpfiles="$tmpfiles mu-test1.mo" : ${MSGFMT=msgfmt} -${MSGFMT} -o mu-test1.mo mu-test1.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} -o mu-test1.mo mu-test1.in || exit 1 -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; } -LC_ALL=C tr -d '\r' < mu-test1.tmp > mu-test1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o mu-test1.tmp mu-test1.mo || exit 1 +LC_ALL=C tr -d '\r' < mu-test1.tmp > mu-test1.out || exit 1 : ${DIFF=diff} ${DIFF} mu-test1.in mu-test1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgunfmt-2 b/gettext-tools/tests/msgunfmt-2 index 3683854..6bbac97 100755..100644 --- a/gettext-tools/tests/msgunfmt-2 +++ b/gettext-tools/tests/msgunfmt-2 @@ -6,32 +6,21 @@ # system-dependent strings), yields a PO file with c-format annotation, so that # msgfmt applied to it will again produce a .mo file of major revision 1. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mu-2.in" cat <<EOF > mu-2.in #, c-format msgid "truncating at %<PRIuMAX> bytes in output file %s" msgstr "schneide bei %<PRIuMAX> Bytes in Ausgabedatei %s ab" EOF -tmpfiles="$tmpfiles mu-2.mo" : ${MSGFMT=msgfmt} -${MSGFMT} -o mu-2.mo mu-2.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} -o mu-2.mo mu-2.in || exit 1 -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; } -LC_ALL=C tr -d '\r' < mu-2.tmp > mu-2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o mu-2.tmp mu-2.mo || exit 1 +LC_ALL=C tr -d '\r' < mu-2.tmp > mu-2.out || exit 1 : ${DIFF=diff} ${DIFF} mu-2.in mu-2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgunfmt-csharp-1 b/gettext-tools/tests/msgunfmt-csharp-1 index 2479734..34c1141 100755..100644 --- a/gettext-tools/tests/msgunfmt-csharp-1 +++ b/gettext-tools/tests/msgunfmt-csharp-1 @@ -3,9 +3,6 @@ # Test of --csharp option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether we can compile and execute C# programs. test "${CSHARP_CHOICE}" != no || { echo "Skipping test: configured with --disable-csharp" @@ -20,7 +17,6 @@ test "${TESTCSHARP}" = yes || { exit 77 } -tmpfiles="$tmpfiles mu-cs-1" test -d mu-cs-1 || mkdir mu-cs-1 cat <<\EOF > mu-cs-1/fr.po @@ -93,6 +89,4 @@ EOF : ${DIFF=diff} ${DIFF} mu-cs-1/prog.ok mu-cs-1/prog.sort || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/msgunfmt-java-1 b/gettext-tools/tests/msgunfmt-java-1 index 5e6f303..8857eb1 100755..100644 --- a/gettext-tools/tests/msgunfmt-java-1 +++ b/gettext-tools/tests/msgunfmt-java-1 @@ -6,9 +6,6 @@ # Note: This test fails when using gcj from GCC 3.1 and GCC 3.2, due to a bug # (libgcj/6576). It is fixed in GCC 3.3. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether we can compile and execute Java programs. test "${JAVA_CHOICE}" != no || { echo "Skipping test: configured with --disable-java" @@ -23,7 +20,6 @@ test "${TESTJAVA}" = yes || { exit 77 } -tmpfiles="$tmpfiles mu-java-1" test -d mu-java-1 || mkdir mu-java-1 cat <<\EOF > mu-java-1/fr.po @@ -95,6 +91,4 @@ EOF : ${DIFF=diff} ${DIFF} mu-java-1/prog.ok mu-java-1/prog.sort || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1 index 0cc7973..41fd811 100755..100644 --- a/gettext-tools/tests/msgunfmt-properties-1 +++ b/gettext-tools/tests/msgunfmt-properties-1 @@ -3,10 +3,6 @@ # Test of general operation with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles mu-p-1.in" cat <<EOF > mu-p-1.in eight=eighth @@ -25,22 +21,15 @@ three=third two=second EOF -tmpfiles="$tmpfiles mu-p-1.mo" : ${MSGFMT=msgfmt} -${MSGFMT} --properties-input -o mu-p-1.mo mu-p-1.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGFMT} --properties-input -o mu-p-1.mo mu-p-1.in || exit 1 -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; } -LC_ALL=C tr -d '\r' < mu-p-1.tmp > mu-p-1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} --properties-output -o mu-p-1.tmp mu-p-1.mo || exit 1 +LC_ALL=C tr -d '\r' < mu-p-1.tmp > mu-p-1.out || exit 1 : ${DIFF=diff} ${DIFF} mu-p-1.in mu-p-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msgunfmt-tcl-1 b/gettext-tools/tests/msgunfmt-tcl-1 index 2dae62a..ab493d7 100755..100644 --- a/gettext-tools/tests/msgunfmt-tcl-1 +++ b/gettext-tools/tests/msgunfmt-tcl-1 @@ -10,22 +10,17 @@ # reads empty output, and refrains from creating a PO file because # --force-po was not specified. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether we can execute Tcl programs and Tcl's fconfigure command # understands the -encoding option (it does since approximately Tcl 8.1). -tmpfiles="$tmpfiles mu-tcl-1-version.tcl" cat <<\EOF > mu-tcl-1-version.tcl fconfigure stdout -encoding utf-8 puts $tcl_version EOF (tclsh mu-tcl-1-version.tcl) >/dev/null 2>/dev/null \ || { echo "Skipping test: tclsh not found or Tcl too old" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles mu-tcl-1-fr.po" cat <<\EOF > mu-tcl-1-fr.po msgid "" msgstr "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -41,18 +36,15 @@ msgid "%s is replaced by %s." msgstr "%2$s remplace %1$s." EOF -tmpfiles="$tmpfiles mu-tcl-1-msgs" test -d mu-tcl-1-msgs || mkdir mu-tcl-1-msgs : ${MSGFMT=msgfmt} ${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || exit 1 -tmpfiles="$tmpfiles mu-tcl-1-prog.out" : ${MSGUNFMT=msgunfmt} GETTEXTDATADIR="$abs_top_srcdir"/src \ ${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || exit 1 -tmpfiles="$tmpfiles mu-tcl-1-prog.ok" cat <<\EOF > mu-tcl-1-prog.ok msgid "" msgstr "Content-Type: text/plain; charset=UTF-8\n" @@ -66,6 +58,4 @@ EOF : ${DIFF=diff} ${DIFF} mu-tcl-1-prog.ok mu-tcl-1-prog.out || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1 index ef16fca..326e48e 100755..100644 --- a/gettext-tools/tests/msguniq-1 +++ b/gettext-tools/tests/msguniq-1 @@ -3,20 +3,12 @@ # Test general operation. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles msguniq-1.tmp msguniq-1.out" : ${MSGUNIQ-msguniq} -${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$abs_srcdir"/msguniq-a.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$abs_srcdir"/msguniq-a.in || exit 1 +LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out || exit 1 : ${DIFF=diff} ${DIFF} "$abs_srcdir"/msguniq-a.out msguniq-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2 index c9d52c6..f5e77f9 100755..100644 --- a/gettext-tools/tests/msguniq-2 +++ b/gettext-tools/tests/msguniq-2 @@ -3,17 +3,10 @@ # Test --unique option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles msguniq-2.tmp msguniq-2.out" : ${MSGUNIQ-msguniq} -${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$abs_srcdir"/msguniq-a.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$abs_srcdir"/msguniq-a.in || exit 1 +LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out || exit 1 -tmpfiles="$tmpfiles msguniq-2.ok" cat <<\EOF > msguniq-2.ok # Template messages for CLISP # Copyright (C) 1992-2001 Bruno Haible, Michael Stoll, Marcus Daniels @@ -5417,6 +5410,4 @@ EOF ${DIFF} msguniq-2.ok msguniq-2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msguniq-3 b/gettext-tools/tests/msguniq-3 index 64ff149..672e0c3 100755..100644 --- a/gettext-tools/tests/msguniq-3 +++ b/gettext-tools/tests/msguniq-3 @@ -3,17 +3,10 @@ # Test --repeated option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles msguniq-3.tmp msguniq-3.out" : ${MSGUNIQ-msguniq} -${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$abs_srcdir"/msguniq-a.in -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$abs_srcdir"/msguniq-a.in || exit 1 +LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out || exit 1 -tmpfiles="$tmpfiles msguniq-3.ok" cat <<\EOF > msguniq-3.ok # Template messages for CLISP # Copyright (C) 1992-2001 Bruno Haible, Michael Stoll, Marcus Daniels @@ -497,6 +490,4 @@ EOF ${DIFF} msguniq-3.ok msguniq-3.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msguniq-4 b/gettext-tools/tests/msguniq-4 index afa67fa..89e1279 100755..100644 --- a/gettext-tools/tests/msguniq-4 +++ b/gettext-tools/tests/msguniq-4 @@ -3,23 +3,14 @@ # Test general operation with Java .properties syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles msguniq-4.out" : ${MSGUNIQ-msguniq} -${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$abs_srcdir"/msguniq-a.inp -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$abs_srcdir"/msguniq-a.inp || exit 1 -tmpfiles="$tmpfiles msguniq-4.ok" : ${MSGCAT-msgcat} -${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$abs_srcdir"/msguniq-a.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$abs_srcdir"/msguniq-a.out || exit 1 : ${DIFF=diff} ${DIFF} msguniq-4.ok msguniq-4.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msguniq-5 b/gettext-tools/tests/msguniq-5 index 1f98acb..530efab 100755..100644 --- a/gettext-tools/tests/msguniq-5 +++ b/gettext-tools/tests/msguniq-5 @@ -3,10 +3,6 @@ # Test msguniq on a PO file with contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles msguniq-5.po" cat <<\EOF > msguniq-5.po msgid "" msgstr "" @@ -57,14 +53,10 @@ msgstr "photocopieur" #~ msgstr "Enregistrer sous" EOF -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; } -LC_ALL=C tr -d '\r' < msguniq-5.tmp > msguniq-5.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNIQ} -o msguniq-5.tmp msguniq-5.po || exit 1 +LC_ALL=C tr -d '\r' < msguniq-5.tmp > msguniq-5.out || exit 1 -tmpfiles="$tmpfiles msguniq-5.ok" cat <<\EOF > msguniq-5.ok msgid "" msgstr "" @@ -114,6 +106,4 @@ EOF ${DIFF} msguniq-5.ok msguniq-5.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/msguniq-6 b/gettext-tools/tests/msguniq-6 index 3fabbba..51a1220 100755..100644 --- a/gettext-tools/tests/msguniq-6 +++ b/gettext-tools/tests/msguniq-6 @@ -3,10 +3,6 @@ # Test msguniq on PO file with previous msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles msguniq-6.in" cat <<\EOF > msguniq-6.in msgid "" msgstr "" @@ -70,14 +66,10 @@ msgid "%s: option requires more than one argument\n" msgstr "%s: Option erwartet ein Argument -- %c\n" EOF -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; } -LC_ALL=C tr -d '\r' < msguniq-6.tmp > msguniq-6.out -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNIQ} -o msguniq-6.tmp msguniq-6.in || exit 1 +LC_ALL=C tr -d '\r' < msguniq-6.tmp > msguniq-6.out || exit 1 -tmpfiles="$tmpfiles msguniq-6.ok" cat <<\EOF > msguniq-6.ok msgid "" msgstr "" @@ -128,6 +120,4 @@ EOF ${DIFF} msguniq-6.ok msguniq-6.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1 index 49f7a36..198283a 100644 --- a/gettext-tools/tests/plural-1 +++ b/gettext-tools/tests/plural-1 @@ -1,17 +1,10 @@ #! /bin/sh . "${srcdir=.}/init.sh"; path_prepend_ . ../src -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles plural-1-cake.tmp plural-1-cake.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$abs_srcdir"/plural-1-prg.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$abs_srcdir"/plural-1-prg.c || exit 1 +LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot || exit 1 -tmpfiles="$tmpfiles plural-1-cake.ok" cat <<EOF > plural-1-cake.ok #, c-format msgid "a piece of cake" @@ -23,7 +16,6 @@ EOF : ${DIFF=diff} ${DIFF} plural-1-cake.ok plural-1-cake.pot || exit 1 -tmpfiles="$tmpfiles plural-1-fr.po" cat <<EOF > plural-1-fr.po # Les gateaux allemands sont les meilleurs du monde. #, c-format @@ -33,17 +25,13 @@ msgstr[0] "un morceau de gateau" msgstr[1] "%d morceaux de gateau" EOF -tmpfiles="$tmpfiles plural-1-fr.po.tmp plural-1-fr.po.new" : ${MSGMERGE=msgmerge} -${MSGMERGE} -q -o plural-1-fr.po.tmp plural-1-fr.po plural-1-cake.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.new -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGMERGE} -q -o plural-1-fr.po.tmp plural-1-fr.po plural-1-cake.pot || exit 1 +LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.new || exit 1 : ${DIFF=diff} ${DIFF} plural-1-fr.po plural-1-fr.po.new || exit 1 -tmpfiles="$tmpfiles plural-1-dir" test -d plural-1-dir || mkdir plural-1-dir test -d plural-1-dir/fr || mkdir plural-1-dir/fr test -d plural-1-dir/fr/LC_MESSAGES || mkdir plural-1-dir/fr/LC_MESSAGES @@ -51,20 +39,15 @@ test -d plural-1-dir/fr/LC_MESSAGES || mkdir plural-1-dir/fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o plural-1-dir/fr/LC_MESSAGES/cake.mo plural-1-fr.po -tmpfiles="$tmpfiles plural-1-fr.po.tmp plural-1-fr.po.un" : ${MSGUNFMT=msgunfmt} -${MSGUNFMT} -o plural-1-fr.po.tmp plural-1-dir/fr/LC_MESSAGES/cake.mo -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.un -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${MSGUNFMT} -o plural-1-fr.po.tmp plural-1-dir/fr/LC_MESSAGES/cake.mo || exit 1 +LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.un || exit 1 -tmpfiles="$tmpfiles plural-1-fr.po.strip" sed 1,2d < plural-1-fr.po > plural-1-fr.po.strip : ${DIFF=diff} ${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || exit 1 -tmpfiles="$tmpfiles plural-1-cake.ok plural-1-cake.tmp cake.out" : ${DIFF=diff} echo 'un morceau de gateau' > plural-1-cake.ok LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || exit 1 @@ -79,6 +62,4 @@ LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || exit 1 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1 ${DIFF} plural-1-cake.ok cake.out || exit 1 -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/plural-2 b/gettext-tools/tests/plural-2 index d5ffbb0..4116263 100755..100644 --- a/gettext-tools/tests/plural-2 +++ b/gettext-tools/tests/plural-2 @@ -1,16 +1,11 @@ #! /bin/sh . "${srcdir=.}/init.sh"; path_prepend_ . ../src -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles plural-2-dir plural-2-ll.po dataout" : ${MSGFMT=msgfmt} test -d plural-2-dir || mkdir plural-2-dir test -d plural-2-dir/ll || mkdir plural-2-dir/ll test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES -tmpfiles="$tmpfiles plural-2.data" cat <<EOF > plural-2.data ja 0 @@ -80,11 +75,8 @@ EOF echo "plural=${formula}" 1>&2 echo "Expected: $dataok" 1>&2 echo "Got: "`cat dataout` 1>&2 - rm -fr $tmpfiles exit 1 } done < plural-2.data -rm -fr $tmpfiles - exit 0 diff --git a/gettext-tools/tests/recode-sr-latin-1 b/gettext-tools/tests/recode-sr-latin-1 index eca50d0..af74893 100755..100644 --- a/gettext-tools/tests/recode-sr-latin-1 +++ b/gettext-tools/tests/recode-sr-latin-1 @@ -3,9 +3,6 @@ # Test recode-sr-latin on some input in UTF-8 encoding. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether a specific UTF-8 locale is installed. : ${LOCALE_FR_UTF8=fr_FR.UTF-8} if test $LOCALE_FR_UTF8 != none; then @@ -22,10 +19,9 @@ if test $LOCALE_FR_UTF8 = none; then else echo "Skipping test: no french UTF-8 locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles rec-srl-1.in" cat <<\EOF > rec-srl-1.in 仗舒于仆亳 舒亞仄亠仆亳 仆亠亠亟仆仂亰仆舒舒仆 舒亞仄亠仆 @@ -35,13 +31,11 @@ cat <<\EOF > rec-srl-1.in 咤哢 哂哺 哺 哺 EOF -tmpfiles="$tmpfiles rec-srl-1.out" : ${RECODE=recode} LC_ALL=$LOCALE_FR_UTF8 \ ${RECODE}-sr-latin < rec-srl-1.in > rec-srl-1.out \ - || { rm -fr $tmpfiles; exit 1; } + || { exit 1; } -tmpfiles="$tmpfiles rec-srl-1.ok" cat <<\EOF > rec-srl-1.ok Ispravni argumenti su nejednoznaan argument @@ -55,6 +49,4 @@ EOF ${DIFF} rec-srl-1.ok rec-srl-1.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/recode-sr-latin-2 b/gettext-tools/tests/recode-sr-latin-2 index 6fe9559..7f13bd5 100755..100644 --- a/gettext-tools/tests/recode-sr-latin-2 +++ b/gettext-tools/tests/recode-sr-latin-2 @@ -8,9 +8,6 @@ # Note: This test fails on AIX 4 with libiconv < 1.12, due to an interaction # between libiconv and the setlocale() function. It is fixed in libiconv-1.12. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - # Test whether a specific EUC-JP locale is installed. : ${LOCALE_JA=ja_JP} if test $LOCALE_JA = none; then @@ -19,22 +16,19 @@ if test $LOCALE_JA = none; then else echo "Skipping test: no japanese EUC-JP locale is supported" fi - rm -fr $tmpfiles; exit 77 + exit 77 fi -tmpfiles="$tmpfiles rec-srl-2.in" cat <<\EOF > rec-srl-2.in Исправни аргументи су неједнозначан аргумент EOF -tmpfiles="$tmpfiles rec-srl-2.out" : ${RECODE=recode} LC_ALL=$LOCALE_JA \ ${RECODE}-sr-latin < rec-srl-2.in > rec-srl-2.out \ - || { rm -fr $tmpfiles; exit 1; } + || { exit 1; } -tmpfiles="$tmpfiles rec-srl-2.ok" cat <<\EOF > rec-srl-2.ok Ispravni argumenti su nejednoznačan argument @@ -44,6 +38,4 @@ EOF ${DIFF} rec-srl-2.ok rec-srl-2.out result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-1 b/gettext-tools/tests/xgettext-1 index 64c190a..5165968 100755..100644 --- a/gettext-tools/tests/xgettext-1 +++ b/gettext-tools/tests/xgettext-1 @@ -5,10 +5,6 @@ # Test -x option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles zero-domain.po xg-test1.err" rm -f zero-domain.po : ${XGETTEXT=xgettext} LC_MESSAGES=C LC_ALL= \ @@ -16,11 +12,9 @@ ${XGETTEXT} -k_ -d zero-domain -x "$abs_top_srcdir"/po/gettext-tools.pot \ "$abs_top_srcdir"/src/xgettext.c >xg-test1.err 2>&1 result=$? cat xg-test1.err | grep -v 'warning: Charset' | grep -v '^ ' -test $result = 0 || { rm -fr $tmpfiles; exit 1; } +test $result = 0 || { exit 1; } test ! -f zero-domain.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-2 b/gettext-tools/tests/xgettext-2 index 98424c2..ffdd355 100755..100644 --- a/gettext-tools/tests/xgettext-2 +++ b/gettext-tools/tests/xgettext-2 @@ -4,10 +4,6 @@ # Even an empty string is extracted, if not overridden by xgettext's # default-constructed header entry. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-test2.in.c" cat <<EOF > xg-test2.in.c This is a test of the xgettext functionality. /* xgettext:no-c-format */ @@ -25,14 +21,10 @@ _ _("") EOF -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; } -LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -d xg-test2.tmp -k_ --omit-header --no-location xg-test2.in.c || exit 1 +LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po || exit 1 -tmpfiles="$tmpfiles xg-test2.ok" cat <<EOF > xg-test2.ok #, no-c-format msgid "extract me" @@ -52,6 +44,4 @@ EOF ${DIFF} xg-test2.ok xg-test2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-3 b/gettext-tools/tests/xgettext-3 index ad77cd2..b3fd04e 100755..100644 --- a/gettext-tools/tests/xgettext-3 +++ b/gettext-tools/tests/xgettext-3 @@ -4,10 +4,6 @@ # When a header entry is provided by xgettext, it overrides any msgid "" # present in the input. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-test3.in.c" cat <<EOF > xg-test3.in.c This is a test of the xgettext functionality. /* xgettext:no-c-format */ @@ -25,13 +21,11 @@ _ _("") EOF -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' | LC_ALL=C tr -d '\r' > xg-test3.po -tmpfiles="$tmpfiles xg-test3.ok" cat <<EOF > xg-test3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -66,6 +60,4 @@ EOF ${DIFF} xg-test3.ok xg-test3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-4 b/gettext-tools/tests/xgettext-4 index db01bba..e33c062 100755..100644 --- a/gettext-tools/tests/xgettext-4 +++ b/gettext-tools/tests/xgettext-4 @@ -3,21 +3,15 @@ # Test --foreign-user -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-test4.in.c" cat <<EOF > xg-test4.in.c _("extract me") EOF -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' | LC_ALL=C tr -d '\r' > xg-test4.po -tmpfiles="$tmpfiles xg-test4.ok" cat <<EOF > xg-test4.ok # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. @@ -44,6 +38,4 @@ EOF ${DIFF} xg-test4.ok xg-test4.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5 index 721cdb5..b3e7380 100755..100644 --- a/gettext-tools/tests/xgettext-5 +++ b/gettext-tools/tests/xgettext-5 @@ -3,10 +3,6 @@ # Test extraction of non-ASCII msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-test5.c" cat <<EOF > xg-test5.c void foo (int option) { @@ -15,19 +11,14 @@ void foo (int option) } EOF -tmpfiles="$tmpfiles xg-test5.tmp xg-test5.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $? = 1 || { exit 1; } +${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.tmp xg-test5.c || exit 1 +LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po || exit 1 -tmpfiles="$tmpfiles xg-test5.pot" sed -e '/POT-Creation-Date/d' < xg-test5.po > xg-test5.pot -tmpfiles="$tmpfiles xg-test5.ok" cat <<EOF > xg-test5.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -60,6 +51,4 @@ EOF ${DIFF} xg-test5.ok xg-test5.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-6 b/gettext-tools/tests/xgettext-6 index df57786..5a54aa3 100755..100644 --- a/gettext-tools/tests/xgettext-6 +++ b/gettext-tools/tests/xgettext-6 @@ -3,54 +3,43 @@ # Test of position dependent recognition of format strings. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-test6.c" cat <<\EOF > xg-test6.c fprintf (fp, gettext ("c-format positive1"), gettext ("c-format negative1")); printk (gettext ("c-format negative2")); EOF -tmpfiles="$tmpfiles xg-test6.sh" cat <<\EOF > xg-test6.sh eval_gettext "sh-format positive1" "`gettext \"sh-format negative1\"`" echo "`gettext \"sh-format negative2\"`" EOF -tmpfiles="$tmpfiles xg-test6.py" cat <<\EOF > xg-test6.py my_printf (gettext ("python-format positive1"), gettext ("python-format negative1")); printk (gettext ("python-format negative2")); EOF -tmpfiles="$tmpfiles xg-test6.lisp" cat <<\EOF > xg-test6.lisp (format t (gettext "lisp-format positive1") (gettext "lisp-format negative1")) (prin1 (gettext "lisp-format negative2")) EOF -tmpfiles="$tmpfiles xg-test6.el" cat <<\EOF > xg-test6.el (format (_ "elisp-format positive1") (_ "elisp-format negative1")) (printk (_ "elisp-format negative2")) EOF -tmpfiles="$tmpfiles xg-test6.jl" cat <<\EOF > xg-test6.jl (format stream (_ "librep-format positive1") (_ "librep-format negative1")) (printk (_ "librep-format negative2")) EOF -tmpfiles="$tmpfiles xg-test6.java" cat <<\EOF > xg-test6.java MessageFormat.format(gettext("java-format positive1"), gettext("java-format negative1")); System.err.println(gettext("java-format negative2")); EOF -tmpfiles="$tmpfiles xg-test6.awk" cat <<\EOF > xg-test6.awk printf dcgettext ("awk-format positive1"), dcgettext ("awk-format negative1"); printf (dcgettext ("awk-format positive2"), dcgettext ("awk-format negative2")); @@ -58,20 +47,17 @@ printf dcgettext ("awk-format positive3"); dcgettext ("awk-format negative3"); printk dcgettext ("awk-format negative4"); EOF -tmpfiles="$tmpfiles xg-test6.ycp" cat <<\EOF > xg-test6.ycp sformat (_("ycp-format positive1"), _("ycp-format negative1")); printk (_("ycp-format negative2")); EOF -tmpfiles="$tmpfiles xg-test6.tcl" cat <<\EOF > xg-test6.tcl [format [::msgcat::mc "tcl-format positive1"] [::msgcat::mc "tcl-format negative1"]] [print [::msgcat::mc "tcl-format negative2"]] EOF -tmpfiles="$tmpfiles xg-test6.pl" cat <<\EOF > xg-test6.pl printf gettext "perl-format positive1", gettext ("perl-format negative1"); gettext ("perl-format negative2"); @@ -81,25 +67,20 @@ print sprintf gettext "perl-format positive3"; print kprintf gettext "perl-format negative5"; EOF -tmpfiles="$tmpfiles xg-test6.php" cat <<\EOF > xg-test6.php <? php printf (_ ("php-format positive1"), _ ("php-format negative1")); printk (_ ("php-format negative2")); EOF -tmpfiles="$tmpfiles xg-test6.tmp.po xg-test6.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-test6.tmp \ --flag=my_printf:1:python-format \ xg-test6.c xg-test6.sh xg-test6.py xg-test6.lisp xg-test6.el \ 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; } -LC_ALL=C tr -d '\r' < xg-test6.tmp.po > xg-test6.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + xg-test6.pl xg-test6.php || exit 1 +LC_ALL=C tr -d '\r' < xg-test6.tmp.po > xg-test6.po || exit 1 -tmpfiles="$tmpfiles xg-test6.ok" cat <<\EOF > xg-test6.ok #, c-format msgid "c-format positive1" @@ -257,6 +238,4 @@ EOF ${DIFF} xg-test6.ok xg-test6.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-7 b/gettext-tools/tests/xgettext-7 index adac2c5..22e882b 100755..100644 --- a/gettext-tools/tests/xgettext-7 +++ b/gettext-tools/tests/xgettext-7 @@ -3,10 +3,6 @@ # Test of comment extraction in the case of duplicated msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-test7.c" cat <<\EOF > xg-test7.c /* first comment */ /* xgettext: c-format */ @@ -21,14 +17,10 @@ gettext ("abc"); gettext ("abc"); EOF -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; } -LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c || exit 1 +LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po || exit 1 -tmpfiles="$tmpfiles xg-test7.ok" cat <<\EOF > xg-test7.ok #. first comment #. second comment @@ -42,6 +34,4 @@ EOF ${DIFF} xg-test7.ok xg-test7.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-8 b/gettext-tools/tests/xgettext-8 index 910d76c..2194aed 100755..100644 --- a/gettext-tools/tests/xgettext-8 +++ b/gettext-tools/tests/xgettext-8 @@ -3,10 +3,6 @@ # Test -j option with charset conversion from ISO-8859-1 to UTF-8. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-test8.po" cat <<\EOF > xg-test8.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -31,19 +27,15 @@ msgid "@(#)fifo.c\t1.56 04/10/10 Copyright 1989, 1994-2003 Jrg Schilling" msgstr "" EOF -tmpfiles="$tmpfiles xg-test8.in.c" cat <<EOF > xg-test8.in.c _("extract me") EOF : ${XGETTEXT=xgettext} -${XGETTEXT} -a -j -o xg-test8.po xg-test8.in.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -a -j -o xg-test8.po xg-test8.in.c || exit 1 -tmpfiles="$tmpfiles 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 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -76,6 +68,4 @@ EOF ${DIFF} xg-test8.ok xg-test8.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-9 b/gettext-tools/tests/xgettext-9 index ea38b70..9489be0 100755..100644 --- a/gettext-tools/tests/xgettext-9 +++ b/gettext-tools/tests/xgettext-9 @@ -4,10 +4,6 @@ # Test of extracted comments specified per keyword, including the case of # duplicated msgids. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-test9.c" cat <<\EOF > xg-test9.c /* xgettext: max-width 25 */ label ("eagle"); @@ -23,17 +19,13 @@ label ("pigeon"); label ("pigeon"); EOF -tmpfiles="$tmpfiles xg-test9.tmp.po xg-test9.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header \ --keyword=label:1,\"xhtml-format\",\"xml-format\" \ --keyword=title:1,\"xhtml-format\",\"xml-format\" \ - -d xg-test9.tmp xg-test9.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-test9.tmp.po > xg-test9.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-test9.tmp xg-test9.c || exit 1 +LC_ALL=C tr -d '\r' < xg-test9.tmp.po > xg-test9.po || exit 1 -tmpfiles="$tmpfiles xg-test9.ok" cat <<\EOF > xg-test9.ok #. xhtml-format #. xml-format @@ -64,6 +56,4 @@ EOF ${DIFF} xg-test9.ok xg-test9.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-awk-1 b/gettext-tools/tests/xgettext-awk-1 index f16ff8d..bd82add 100755..100644 --- a/gettext-tools/tests/xgettext-awk-1 +++ b/gettext-tools/tests/xgettext-awk-1 @@ -3,10 +3,6 @@ # Test awk support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-a-1.awk" cat <<EOF > xg-a-1.awk # This comment will not be extracted. print _"help" @@ -19,15 +15,11 @@ print _"Hey Jude" print _"The Fabulous Four" EOF -tmpfiles="$tmpfiles xg-a-1.tmp.po xg-a-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-a-1.tmp xg-a-1.awk -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-a-1.tmp xg-a-1.awk || exit 1 +LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po || exit 1 -tmpfiles="$tmpfiles xg-a-1.ok" cat <<EOF > xg-a-1.ok msgid "help" msgstr "" @@ -49,6 +41,4 @@ EOF ${DIFF} xg-a-1.ok xg-a-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-awk-2 b/gettext-tools/tests/xgettext-awk-2 index c15dbd0..14908fe 100755..100644 --- a/gettext-tools/tests/xgettext-awk-2 +++ b/gettext-tools/tests/xgettext-awk-2 @@ -3,10 +3,6 @@ # Test awk support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-a-2.awk" cat <<\EOF > xg-a-2.awk # a string = # b @@ -16,15 +12,11 @@ _"hello world" # d ; EOF -tmpfiles="$tmpfiles xg-a-2.tmp.po xg-a-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-a-2.tmp xg-a-2.awk -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-a-2.tmp xg-a-2.awk || exit 1 +LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po || exit 1 -tmpfiles="$tmpfiles xg-a-2.ok" cat <<EOF > xg-a-2.ok #. a #. b @@ -37,6 +29,4 @@ EOF ${DIFF} xg-a-2.ok xg-a-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1 index c6d94cc..039e7ec 100755..100644 --- a/gettext-tools/tests/xgettext-c-1 +++ b/gettext-tools/tests/xgettext-c-1 @@ -5,21 +5,13 @@ # Test C support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-1.tmp.po xg-c-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} -d xg-c-1.tmp -k_ --omit-header --no-location \ - "$abs_top_srcdir"/src/xgettext.c "$abs_top_srcdir"/src/msgfmt.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + "$abs_top_srcdir"/src/xgettext.c "$abs_top_srcdir"/src/msgfmt.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po || exit 1 : ${DIFF=diff} ${DIFF} "$abs_srcdir"/xg-c-1.ok.po xg-c-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-10 b/gettext-tools/tests/xgettext-c-10 index 9a6d7be..5c876b0 100755..100644 --- a/gettext-tools/tests/xgettext-c-10 +++ b/gettext-tools/tests/xgettext-c-10 @@ -3,10 +3,6 @@ # Test C support: extraction of contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-10.c" cat <<\EOF > xg-c-10.c // (KDE) The 1-argument i18n macro is a simple gettext without context. print (i18n ("help")); @@ -17,16 +13,12 @@ print (tr ("file")); print (tr ("open", "File")); EOF -tmpfiles="$tmpfiles xg-c-10.tmp.po xg-c-10.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location \ --keyword=i18n:1 --keyword=i18n:1c,2 --keyword=tr:1 --keyword=tr:1,2c \ - -d xg-c-10.tmp xg-c-10.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-c-10.tmp xg-c-10.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po || exit 1 -tmpfiles="$tmpfiles xg-c-10.ok" cat <<EOF > xg-c-10.ok msgid "help" msgstr "" @@ -47,6 +39,4 @@ EOF ${DIFF} xg-c-10.ok xg-c-10.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-11 b/gettext-tools/tests/xgettext-c-11 index 69d58b4..2019eb8 100755..100644 --- a/gettext-tools/tests/xgettext-c-11 +++ b/gettext-tools/tests/xgettext-c-11 @@ -4,10 +4,6 @@ # Test C support: extraction of contexts, disambiguating according to the # argument count. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-11.c" cat <<\EOF > xg-c-11.c // (KDE) The 1-argument i18n macro is a simple gettext without context. print (i18n ("help")); @@ -17,16 +13,12 @@ print (i18n ("Help", "about")); print (i18n ("error", "errors", 7)); EOF -tmpfiles="$tmpfiles xg-c-11.tmp.po xg-c-11.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-c-11.tmp xg-c-11.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po || exit 1 -tmpfiles="$tmpfiles xg-c-11.ok" cat <<EOF > xg-c-11.ok msgid "help" msgstr "" @@ -45,6 +37,4 @@ EOF ${DIFF} xg-c-11.ok xg-c-11.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-12 b/gettext-tools/tests/xgettext-c-12 index 8579772..2e9d7fd 100755..100644 --- a/gettext-tools/tests/xgettext-c-12 +++ b/gettext-tools/tests/xgettext-c-12 @@ -4,22 +4,14 @@ # Test C support: valid but unlikely C format strings are _not_ marked as # c-format by default. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-12.c" cat <<\EOF > xg-c-12.c gettext ("%1% on, %2% off"); EOF -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; } -LC_ALL=C tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-c-12.tmp xg-c-12.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po || exit 1 -tmpfiles="$tmpfiles xg-c-12.ok" cat <<EOF > xg-c-12.ok msgid "%1% on, %2% off" msgstr "" @@ -29,6 +21,4 @@ EOF ${DIFF} xg-c-12.ok xg-c-12.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-13 b/gettext-tools/tests/xgettext-c-13 index c78c01b..01464b0 100755..100644 --- a/gettext-tools/tests/xgettext-c-13 +++ b/gettext-tools/tests/xgettext-c-13 @@ -3,10 +3,6 @@ # Test C++ support: test --flag that introduces qt-format. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-13.cc" cat <<\EOF > xg-c-13.cc foo (gettext ("on")); tr ("stopped"); @@ -14,18 +10,14 @@ tr ("action", ""); tr ("deleted %n files", "", numdel); EOF -tmpfiles="$tmpfiles xg-c-13.tmp.po xg-c-13.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-c-13.tmp \ --qt \ --flag=foo:1:qt-format --flag=gettext:1:pass-qt-format \ --keyword=tr:1,1t --keyword=tr:1,2c,2t --keyword=tr:1,1,2c,3t \ - xg-c-13.cc -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + xg-c-13.cc || exit 1 +LC_ALL=C tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po || exit 1 -tmpfiles="$tmpfiles xg-c-13.ok" cat <<EOF > xg-c-13.ok #, qt-format msgid "on" @@ -50,6 +42,4 @@ EOF ${DIFF} xg-c-13.ok xg-c-13.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-14 b/gettext-tools/tests/xgettext-c-14 index 7903313..2cb5a5c 100755..100644 --- a/gettext-tools/tests/xgettext-c-14 +++ b/gettext-tools/tests/xgettext-c-14 @@ -3,10 +3,6 @@ # Test C++ support: test boost-format. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-14.cc" cat <<\EOF > xg-c-14.cc // These are recognized as boost-format because of the keyword 'format'. format(gettext("%s on, %s off")); @@ -20,18 +16,14 @@ gettext("heuristic %|1$| on, %|2$| off"); gettext("heuristic %1% on, %2% off"); EOF -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; } -LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-c-14.tmp --boost xg-c-14.cc || exit 1 +LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po || exit 1 # The first 4 are not marked as c-format, because they are known as # boost-format. The last 4 are governed by the heuristic. The first two # among them are valid c-format strings. The last one is a valid but unlikely # c-format string, therefore the heuristic doesn't mark it. -tmpfiles="$tmpfiles xg-c-14.ok" cat <<\EOF > xg-c-14.ok #, boost-format msgid "%s on, %s off" @@ -70,6 +62,4 @@ EOF ${DIFF} xg-c-14.ok xg-c-14.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-15 b/gettext-tools/tests/xgettext-c-15 index 85d0706..5d86818 100755..100644 --- a/gettext-tools/tests/xgettext-c-15 +++ b/gettext-tools/tests/xgettext-c-15 @@ -3,10 +3,6 @@ # Test C support: extraction of contexts specified in GNOME glib syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-15.c" cat <<\EOF > xg-c-15.c /* (glib) The 1-argument Q_ macro is a gettext with context. */ print (Q_ ("Printer|Open")); @@ -14,16 +10,12 @@ print (Q_ ("Printer|Open")); print (Q_ ("Menu|Recent File", "Menu|Recent Files")); EOF -tmpfiles="$tmpfiles xg-c-15.tmp.po xg-c-15.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-c-15.tmp xg-c-15.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po || exit 1 -tmpfiles="$tmpfiles xg-c-15.ok" cat <<EOF > xg-c-15.ok msgctxt "Printer" msgid "Open" @@ -40,6 +32,4 @@ EOF ${DIFF} xg-c-15.ok xg-c-15.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-16 b/gettext-tools/tests/xgettext-c-16 index 15c19c8..a594492 100755..100644 --- a/gettext-tools/tests/xgettext-c-16 +++ b/gettext-tools/tests/xgettext-c-16 @@ -3,10 +3,6 @@ # Test C support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-16.c" cat <<\EOF > xg-c-16.c /* a */ /* b */ char *string = /* c */ @@ -14,15 +10,11 @@ cat <<\EOF > xg-c-16.c /* e */ _( /* f */ "hello " /* g */ "world" /* h */ ); EOF -tmpfiles="$tmpfiles xg-c-16.tmp.po xg-c-16.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-c-16.tmp xg-c-16.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-c-16.tmp xg-c-16.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po || exit 1 -tmpfiles="$tmpfiles xg-c-16.ok" cat <<EOF > xg-c-16.ok #. a #. b @@ -38,6 +30,4 @@ EOF ${DIFF} xg-c-16.ok xg-c-16.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-17 b/gettext-tools/tests/xgettext-c-17 index 169e020..0789c04 100755..100644 --- a/gettext-tools/tests/xgettext-c-17 +++ b/gettext-tools/tests/xgettext-c-17 @@ -3,10 +3,6 @@ # Test C++ support: test kde-format and format recognition heuristics. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-17.cc" cat <<\EOF > xg-c-17.cc /* When xgettext has no info, it flags both c-format and kde-format, based on the heuristics. */ @@ -18,15 +14,11 @@ gettext ("used time: %1m %2s"); gettext ("remaining time: %1m %2s"); EOF -tmpfiles="$tmpfiles xg-c-17.tmp.po xg-c-17.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location -d xg-c-17.tmp --language=C++ --kde \ - xg-c-17.cc -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + xg-c-17.cc || exit 1 +LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po || exit 1 -tmpfiles="$tmpfiles xg-c-17.ok" cat <<EOF > xg-c-17.ok #, c-format, kde-format msgid "used time: %1m %2s" @@ -41,6 +33,4 @@ EOF ${DIFF} xg-c-17.ok xg-c-17.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-18 b/gettext-tools/tests/xgettext-c-18 index 28577ee..deac1f0 100755..100644 --- a/gettext-tools/tests/xgettext-c-18 +++ b/gettext-tools/tests/xgettext-c-18 @@ -3,10 +3,6 @@ # Test C support: extraction of 'range:' flags. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-18.c" cat <<\EOF > xg-c-18.c if (days > 7 && days < 14) /* xgettext: range: 1..6 */ @@ -15,14 +11,10 @@ if (days > 7 && days < 14) days - 7); EOF -tmpfiles="$tmpfiles xg-c-18.tmp.po xg-c-18.po" : ${XGETTEXT=xgettext} -${XGETTEXT} --omit-header --no-location -d xg-c-18.tmp xg-c-18.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-c-18.tmp.po > xg-c-18.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-c-18.tmp xg-c-18.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-18.tmp.po > xg-c-18.po || exit 1 -tmpfiles="$tmpfiles xg-c-18.ok" cat <<EOF > xg-c-18.ok #, c-format, range: 1..6 msgid "one week and one day" @@ -35,6 +27,4 @@ EOF ${DIFF} xg-c-18.ok xg-c-18.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-2 b/gettext-tools/tests/xgettext-c-2 index c663ded..c4eb855 100755..100644 --- a/gettext-tools/tests/xgettext-c-2 +++ b/gettext-tools/tests/xgettext-c-2 @@ -3,10 +3,6 @@ # Test C support: comments meant for xgettext, and whitespace. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-2.in.c" cat <<EOF > xg-c-2.in.c This is a test of the xgettext functionality. /* xgettext:no-c-format */ @@ -21,14 +17,10 @@ _ ) EOF -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; } -LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -d xg-c-2.tmp -k_ --omit-header --no-location xg-c-2.in.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po || exit 1 -tmpfiles="$tmpfiles xg-c-2.ok" cat <<EOF > xg-c-2.ok #, no-c-format msgid "extract me" @@ -45,6 +37,4 @@ EOF ${DIFF} xg-c-2.ok xg-c-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3 index 41ef3e1..d522457 100755..100644 --- a/gettext-tools/tests/xgettext-c-3 +++ b/gettext-tools/tests/xgettext-c-3 @@ -3,10 +3,6 @@ # Test C support: recognition of #line. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-3.in.c" cat <<EOF > xg-c-3.in.c #line 42 "bozo" main(){printf(gettext("Hello, World!\n"));} @@ -14,14 +10,10 @@ main(){printf(gettext("Hello, World!\n"));} gettext("nothing"); EOF -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; } -LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --add-location -d xg-c-3.tmp xg-c-3.in.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po || exit 1 -tmpfiles="$tmpfiles xg-c-3.ok" cat <<EOF > xg-c-3.ok #: bozo:42 #, c-format @@ -37,6 +29,4 @@ EOF ${DIFF} xg-c-3.ok xg-c-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-4 b/gettext-tools/tests/xgettext-c-4 index 9df69a3..e8f161a 100755..100644 --- a/gettext-tools/tests/xgettext-c-4 +++ b/gettext-tools/tests/xgettext-c-4 @@ -3,22 +3,14 @@ # Test C support: --trigraphs option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-4.in.c" cat <<EOF > xg-c-4.in.c main()??<printf(gettext("Hello, " "World!" "??/n")); ??> EOF -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; } -LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4.tmp xg-c-4.in.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po || exit 1 -tmpfiles="$tmpfiles xg-c-4.ok" cat <<EOF > xg-c-4.ok #, c-format msgid "Hello, World!\n" @@ -29,6 +21,4 @@ EOF ${DIFF} xg-c-4.ok xg-c-4.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-5 b/gettext-tools/tests/xgettext-c-5 index eff4072..14c90fe 100755..100644 --- a/gettext-tools/tests/xgettext-c-5 +++ b/gettext-tools/tests/xgettext-c-5 @@ -3,22 +3,14 @@ # Test C support: comments. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-5.in.cc" cat <<EOF > xg-c-5.in.cc main(){printf(gettext/*puke*/(/*barf*/"Hello, " "World!" "\n")); } EOF -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; } -LC_ALL=C tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5.tmp xg-c-5.in.cc || exit 1 +LC_ALL=C tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po || exit 1 -tmpfiles="$tmpfiles xg-c-5.ok" cat <<EOF > xg-c-5.ok #. puke #. barf @@ -31,6 +23,4 @@ EOF ${DIFF} xg-c-5.ok xg-c-5.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-6 b/gettext-tools/tests/xgettext-c-6 index 86dfa93..3d839aa 100755..100644 --- a/gettext-tools/tests/xgettext-c-6 +++ b/gettext-tools/tests/xgettext-c-6 @@ -3,10 +3,6 @@ # Test C support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-6.in.C" cat <<EOF > xg-c-6.in.C /* This comment will not be extracted. */ gettext ("help"); @@ -21,15 +17,11 @@ dcgettext ("foo", "quick", LC_MESSAGES); dgettext ("bar", "!"); EOF -tmpfiles="$tmpfiles xg-c-6.tmp.po xg-c-6.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-c-6.tmp xg-c-6.in.C || exit 1 +LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po || exit 1 -tmpfiles="$tmpfiles xg-c-6.ok" cat <<EOF > xg-c-6.ok msgid "help" msgstr "" @@ -50,6 +42,4 @@ EOF ${DIFF} xg-c-6.ok xg-c-6.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-7 b/gettext-tools/tests/xgettext-c-7 index 2dcec60..248bfa9 100755..100644 --- a/gettext-tools/tests/xgettext-c-7 +++ b/gettext-tools/tests/xgettext-c-7 @@ -3,10 +3,6 @@ # Test C support: comments. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-7.c" cat <<EOF > xg-c-7.c int main() @@ -41,14 +37,10 @@ main() } EOF -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; } -LC_ALL=C tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7.tmp xg-c-7.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po || exit 1 -tmpfiles="$tmpfiles xg-c-7.ok" cat <<EOF > xg-c-7.ok #. This is a comment which immediately before a keyword. msgid "1" @@ -85,8 +77,6 @@ EOF ${DIFF} xg-c-7.ok xg-c-7.po result=$? -rm -fr $tmpfiles - exit $result Local Variables: diff --git a/gettext-tools/tests/xgettext-c-8 b/gettext-tools/tests/xgettext-c-8 index 43dfebe..48f160c 100755..100644 --- a/gettext-tools/tests/xgettext-c-8 +++ b/gettext-tools/tests/xgettext-c-8 @@ -3,10 +3,6 @@ # Test recognition of ISO C 99 <inttypes.h> format string directives. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-8.c" cat <<EOF > xg-c-8.c void foo () { @@ -17,14 +13,10 @@ void foo () } EOF -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; } -LC_ALL=C tr -d '\r' < xg-c-8.tmp > xg-c-8.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.tmp xg-c-8.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-8.tmp > xg-c-8.po || exit 1 -tmpfiles="$tmpfiles xg-c-8.ok" cat <<EOF > xg-c-8.ok #, c-format msgid "File size is: %<PRId64>" @@ -47,6 +39,4 @@ EOF ${DIFF} xg-c-8.ok xg-c-8.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-c-9 b/gettext-tools/tests/xgettext-c-9 index b75abb8..340e88a 100755..100644 --- a/gettext-tools/tests/xgettext-c-9 +++ b/gettext-tools/tests/xgettext-c-9 @@ -3,10 +3,6 @@ # Test C support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-c-9.c" cat <<EOF > xg-c-9.c // This comment will not be extracted. print (gettext ("help")); @@ -24,15 +20,11 @@ print (gettext ("there is not enough" "verbose string")); EOF -tmpfiles="$tmpfiles xg-c-9.tmp.po xg-c-9.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-c-9.tmp xg-c-9.c -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-c-9.tmp xg-c-9.c || exit 1 +LC_ALL=C tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po || exit 1 -tmpfiles="$tmpfiles xg-c-9.ok" cat <<EOF > xg-c-9.ok msgid "help" msgstr "" @@ -61,6 +53,4 @@ EOF ${DIFF} xg-c-9.ok xg-c-9.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-csharp-1 b/gettext-tools/tests/xgettext-csharp-1 index 0c5b88b..bdebc1b 100755..100644 --- a/gettext-tools/tests/xgettext-csharp-1 +++ b/gettext-tools/tests/xgettext-csharp-1 @@ -3,10 +3,6 @@ # Some tests for C# support -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-cs-1.cs" cat <<EOF > xg-cs-1.cs using GNU.Gettext; class TestCase { @@ -30,14 +26,10 @@ class TestCase { } EOF -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; } -LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -c -d xg-cs-1.tmp xg-cs-1.cs || exit 1 +LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po || exit 1 -tmpfiles="$tmpfiles xg-cs-1.ok" cat <<EOF > xg-cs-1.ok #. standard usage msgid "Test String 1" @@ -64,6 +56,4 @@ EOF ${DIFF} xg-cs-1.ok xg-cs-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-csharp-2 b/gettext-tools/tests/xgettext-csharp-2 index c3c72aa..8dff3a7 100755..100644 --- a/gettext-tools/tests/xgettext-csharp-2 +++ b/gettext-tools/tests/xgettext-csharp-2 @@ -3,10 +3,6 @@ # More tests for C# support: UTF-8 encoded source files -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-cs-2.cs" cat <<\EOF > xg-cs-2.cs class TestCase { public static void Main (String[] args) { @@ -26,14 +22,11 @@ class TestCase { } EOF -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' | LC_ALL=C tr -d '\r' > xg-cs-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-2.po || exit 1 -tmpfiles="$tmpfiles xg-cs-2.ok" cat <<\EOF > xg-cs-2.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -83,6 +76,4 @@ EOF ${DIFF} xg-cs-2.ok xg-cs-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-csharp-3 b/gettext-tools/tests/xgettext-csharp-3 index 432b218..30d9a9b 100755..100644 --- a/gettext-tools/tests/xgettext-csharp-3 +++ b/gettext-tools/tests/xgettext-csharp-3 @@ -3,10 +3,6 @@ # More tests for C# support: string syntax -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-cs-3.cs" LC_ALL=C tr '%' '\015' <<\EOF > xg-cs-3.cs class TestCase { public static void Main (String[] args) { @@ -52,14 +48,11 @@ comment! */ "this is a single " /* now comes the concatenation! */ + // after + } EOF -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' | LC_ALL=C tr -d '\r' > xg-cs-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-3.po || exit 1 -tmpfiles="$tmpfiles xg-cs-3.ok" cat <<\EOF > xg-cs-3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -175,6 +168,4 @@ EOF ${DIFF} xg-cs-3.ok xg-cs-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-csharp-4 b/gettext-tools/tests/xgettext-csharp-4 index a47f8ab..5cca144 100755..100644 --- a/gettext-tools/tests/xgettext-csharp-4 +++ b/gettext-tools/tests/xgettext-csharp-4 @@ -3,10 +3,6 @@ # Tests for C# plural keyword support -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-cs-4.cs" cat <<EOF > xg-cs-4.cs class TestCase { public static void Main (String[] args) { @@ -16,15 +12,11 @@ class TestCase { } EOF -tmpfiles="$tmpfiles xg-cs-4.tmp.po xg-cs-4.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-cs-4.tmp xg-cs-4.cs || exit 1 +LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po || exit 1 -tmpfiles="$tmpfiles xg-cs-4.ok" cat <<EOF > xg-cs-4.ok msgid "test 1" msgid_plural "plural test" @@ -41,6 +33,4 @@ EOF ${DIFF} xg-cs-4.ok xg-cs-4.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-csharp-5 b/gettext-tools/tests/xgettext-csharp-5 index 77acd94..7584a16 100755..100644 --- a/gettext-tools/tests/xgettext-csharp-5 +++ b/gettext-tools/tests/xgettext-csharp-5 @@ -3,10 +3,6 @@ # Test C# support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-cs-5.cs" cat <<EOF > xg-cs-5.cs // This comment will not be extracted. Console.WriteLine(GetString("help")); @@ -24,15 +20,11 @@ Console.WriteLine(GetString("there is not enough" + + "verbose string")); EOF -tmpfiles="$tmpfiles xg-cs-5.tmp.po xg-cs-5.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-cs-5.tmp xg-cs-5.cs -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-cs-5.tmp xg-cs-5.cs || exit 1 +LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po || exit 1 -tmpfiles="$tmpfiles xg-cs-5.ok" cat <<EOF > xg-cs-5.ok msgid "help" msgstr "" @@ -61,6 +53,4 @@ EOF ${DIFF} xg-cs-5.ok xg-cs-5.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-csharp-6 b/gettext-tools/tests/xgettext-csharp-6 index c3714d6..390c620 100755..100644 --- a/gettext-tools/tests/xgettext-csharp-6 +++ b/gettext-tools/tests/xgettext-csharp-6 @@ -3,10 +3,6 @@ # Test C# support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-cs-6.cs" cat <<\EOF > xg-cs-6.cs /* a */ /* b */ string s = /* c */ @@ -14,15 +10,11 @@ cat <<\EOF > xg-cs-6.cs /* e */ _( /* f */ "hello " /* g */ + /* h */ "world" /* i */ ); EOF -tmpfiles="$tmpfiles xg-cs-6.tmp.po xg-cs-6.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-cs-6.tmp xg-cs-6.cs -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-cs-6.tmp xg-cs-6.cs || exit 1 +LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po || exit 1 -tmpfiles="$tmpfiles xg-cs-6.ok" cat <<EOF > xg-cs-6.ok #. a #. b @@ -38,6 +30,4 @@ EOF ${DIFF} xg-cs-6.ok xg-cs-6.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-csharp-7 b/gettext-tools/tests/xgettext-csharp-7 index 38025fe..9f5643b 100755..100644 --- a/gettext-tools/tests/xgettext-csharp-7 +++ b/gettext-tools/tests/xgettext-csharp-7 @@ -3,23 +3,15 @@ # Test C# support: extraction of contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-cs-7.cs" cat <<\EOF > xg-cs-7.cs Console.WriteLine(rm.GetString("help")); Console.WriteLine(rm.GetParticularString("Help", "about")); EOF -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; } -LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-cs-7.tmp xg-cs-7.cs || exit 1 +LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po || exit 1 -tmpfiles="$tmpfiles xg-cs-7.ok" cat <<EOF > xg-cs-7.ok msgid "help" msgstr "" @@ -33,6 +25,4 @@ EOF ${DIFF} xg-cs-7.ok xg-cs-7.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-elisp-1 b/gettext-tools/tests/xgettext-elisp-1 index b9b660d..7d73dbb 100755..100644 --- a/gettext-tools/tests/xgettext-elisp-1 +++ b/gettext-tools/tests/xgettext-elisp-1 @@ -3,10 +3,6 @@ # Test EmacsLisp support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-el-1.el" cat <<EOF > xg-el-1.el ; This comment will not be extracted. (princ (_ "help")) @@ -19,15 +15,11 @@ cat <<EOF > xg-el-1.el (princ (_ "The Fabulous Four")) EOF -tmpfiles="$tmpfiles xg-el-1.tmp.po xg-el-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-el-1.tmp xg-el-1.el -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-el-1.tmp xg-el-1.el || exit 1 +LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po || exit 1 -tmpfiles="$tmpfiles xg-el-1.ok" cat <<EOF > xg-el-1.ok msgid "help" msgstr "" @@ -49,6 +41,4 @@ EOF ${DIFF} xg-el-1.ok xg-el-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-elisp-2 b/gettext-tools/tests/xgettext-elisp-2 index a457858..22c472e 100755..100644 --- a/gettext-tools/tests/xgettext-elisp-2 +++ b/gettext-tools/tests/xgettext-elisp-2 @@ -3,10 +3,6 @@ # Test EmacsLisp support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-el-2.el" cat <<\EOF > xg-el-2.el ; a (setq string ; b @@ -17,15 +13,11 @@ cat <<\EOF > xg-el-2.el )) EOF -tmpfiles="$tmpfiles xg-el-2.tmp.po xg-el-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-el-2.tmp xg-el-2.el -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-el-2.tmp xg-el-2.el || exit 1 +LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po || exit 1 -tmpfiles="$tmpfiles xg-el-2.ok" cat <<EOF > xg-el-2.ok #. a #. b @@ -39,6 +31,4 @@ EOF ${DIFF} xg-el-2.ok xg-el-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-glade-1 b/gettext-tools/tests/xgettext-glade-1 index 2fd7d35..3fd95f3 100755..100644 --- a/gettext-tools/tests/xgettext-glade-1 +++ b/gettext-tools/tests/xgettext-glade-1 @@ -3,24 +3,18 @@ # Test of Glade support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-gl-1-empty.glade" cat <<EOF > xg-gl-1-empty.glade <?xml version="1.0"?> <GTK-Interface/> EOF -tmpfiles="$tmpfiles xg-gl-1.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o xg-gl-1.pot xg-gl-1-empty.glade 2>/dev/null test $? = 0 || { echo "Skipping test: xgettext was built without Glade support" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles xg-gl-1-widgets.glade" cat <<EOF > xg-gl-1-widgets.glade <?xml version="1.0"?> <GTK-Interface> @@ -1335,12 +1329,9 @@ for said code in libglade.</text> </GTK-Interface> EOF -tmpfiles="$tmpfiles xg-gl-1.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} --add-comments -o - xg-gl-1-widgets.glade | grep -v 'POT-Creation-Date' > xg-gl-1.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --add-comments -o - xg-gl-1-widgets.glade | grep -v 'POT-Creation-Date' > xg-gl-1.pot || exit 1 -tmpfiles="$tmpfiles xg-gl-1.ok" cat <<EOF > xg-gl-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -1570,6 +1561,4 @@ EOF ${DIFF} xg-gl-1.ok xg-gl-1.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2 index 780d9ef..7b3fb0f 100755..100644 --- a/gettext-tools/tests/xgettext-glade-2 +++ b/gettext-tools/tests/xgettext-glade-2 @@ -4,24 +4,18 @@ # Test of Glade support, in particular ISO-8859-1 to UTF-8 conversion # and ASCII entities (< > "). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-gl-2-empty.glade" cat <<EOF > xg-gl-2-empty.glade <?xml version="1.0"?> <GTK-Interface/> EOF -tmpfiles="$tmpfiles xg-gl-2.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o xg-gl-2.pot xg-gl-2-empty.glade 2>/dev/null test $? = 0 || { echo "Skipping test: xgettext was built without Glade support" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles xg-gl-2-simple.glade" cat <<\EOF > xg-gl-2-simple.glade <?xml version="1.0" encoding="ISO-8859-1"?> <GTK-Interface> @@ -60,15 +54,12 @@ cat <<\EOF > xg-gl-2-simple.glade </GTK-Interface> EOF -tmpfiles="$tmpfiles xg-gl-2.tmp xg-gl-2.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade || exit 1 # Don't simplify this to "grep ... < xg-gl-2.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-gl-2.tmp | grep -v 'POT-Creation-Date' > xg-gl-2.pot -tmpfiles="$tmpfiles xg-gl-2.ok" cat <<\EOF > xg-gl-2.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -106,6 +97,4 @@ EOF ${DIFF} xg-gl-2.ok xg-gl-2.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-glade-3 b/gettext-tools/tests/xgettext-glade-3 index c4ecc84..38010fb 100755..100644 --- a/gettext-tools/tests/xgettext-glade-3 +++ b/gettext-tools/tests/xgettext-glade-3 @@ -3,24 +3,18 @@ # Test of Glade 2 support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-gl-3-empty.glade" cat <<EOF > xg-gl-3-empty.glade <?xml version="1.0"?> <GTK-Interface/> EOF -tmpfiles="$tmpfiles xg-gl-3.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o xg-gl-3.pot xg-gl-3-empty.glade 2>/dev/null test $? = 0 || { echo "Skipping test: xgettext was built without Glade support" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles xg-gl-3-asciitable.glade2" cat <<EOF > xg-gl-3-asciitable.glade2 <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd" > @@ -167,15 +161,12 @@ button or double click the character in the table.</property> </glade-interface> EOF -tmpfiles="$tmpfiles xg-gl-3.tmp xg-gl-3.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o xg-gl-3.tmp xg-gl-3-asciitable.glade2 -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o xg-gl-3.tmp xg-gl-3-asciitable.glade2 || exit 1 # Don't simplify this to "grep ... < xg-gl-3.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-gl-3.tmp | grep -v 'POT-Creation-Date' > xg-gl-3.pot -tmpfiles="$tmpfiles xg-gl-3.ok" cat <<\EOF > xg-gl-3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -215,6 +206,4 @@ EOF ${DIFF} xg-gl-3.ok xg-gl-3.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-glade-4 b/gettext-tools/tests/xgettext-glade-4 index 546a110..e753450 100755..100644 --- a/gettext-tools/tests/xgettext-glade-4 +++ b/gettext-tools/tests/xgettext-glade-4 @@ -3,24 +3,18 @@ # Test of Glade 2 support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-gl-4-empty.glade" cat <<EOF > xg-gl-4-empty.glade <?xml version="1.0"?> <GTK-Interface/> EOF -tmpfiles="$tmpfiles xg-gl-4.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o xg-gl-4.pot xg-gl-4-empty.glade 2>/dev/null test $? = 0 || { echo "Skipping test: xgettext was built without Glade support" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles xg-gl-4.glade" cat <<EOF > xg-gl-4.glade <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> @@ -40,15 +34,12 @@ cat <<EOF > xg-gl-4.glade </glade-interface> EOF -tmpfiles="$tmpfiles xg-gl-4.tmp xg-gl-4.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o xg-gl-4.tmp xg-gl-4.glade -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o xg-gl-4.tmp xg-gl-4.glade || exit 1 # Don't simplify this to "grep ... < xg-gl-4.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-gl-4.tmp | grep -v 'POT-Creation-Date' > xg-gl-4.pot -tmpfiles="$tmpfiles xg-gl-4.ok" cat <<\EOF > xg-gl-4.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -82,7 +73,6 @@ test $result = 0 || { rm -fr $tempfiles; exit $result } -tmpfiles="$tmpfiles xg-gl-4a.glade" cat <<EOF > xg-gl-4a.glade <?xml version="1.0"?> <glade-interface> @@ -99,14 +89,11 @@ cat <<EOF > xg-gl-4a.glade </glade-interface> EOF -tmpfiles="$tmpfiles xg-gl-4a.tmp xg-gl-4a.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o xg-gl-4a.tmp xg-gl-4a.glade -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o xg-gl-4a.tmp xg-gl-4a.glade || exit 1 # Look upwards cat xg-gl-4a.tmp | grep -v 'POT-Creation-Date' > xg-gl-4a.pot -tmpfiles="$tmpfiles xg-gl-4a.ok" cat <<\EOF > xg-gl-4a.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -136,6 +123,4 @@ EOF ${DIFF} xg-gl-4a.ok xg-gl-4a.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-glade-5 b/gettext-tools/tests/xgettext-glade-5 index 9df133a..3877808 100755..100644 --- a/gettext-tools/tests/xgettext-glade-5 +++ b/gettext-tools/tests/xgettext-glade-5 @@ -3,24 +3,18 @@ # Test of Glade 2 support for msgctxt. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-gl-5-empty.glade" cat <<EOF > xg-gl-5-empty.glade <?xml version="1.0"?> <GTK-Interface/> EOF -tmpfiles="$tmpfiles xg-gl-5.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o xg-gl-5.pot xg-gl-5-empty.glade 2>/dev/null test $? = 0 || { echo "Skipping test: xgettext was built without Glade support" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles xg-gl-5.glade" cat <<EOF > xg-gl-5.glade <?xml version="1.0"?> <glade-interface> @@ -59,15 +53,12 @@ cat <<EOF > xg-gl-5.glade </glade-interface> EOF -tmpfiles="$tmpfiles xg-gl-5.tmp xg-gl-5.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o xg-gl-5.tmp xg-gl-5.glade -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o xg-gl-5.tmp xg-gl-5.glade || exit 1 # Don't simplify this to "grep ... < xg-gl-5.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-gl-5.tmp | grep -v 'POT-Creation-Date' > xg-gl-5.pot -tmpfiles="$tmpfiles xg-gl-5.ok" cat <<\EOF > xg-gl-5.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -102,13 +93,12 @@ ${DIFF} xg-gl-5.ok xg-gl-5.pot result=$? test $result = 0 || { - rm -fr $tmpfiles; exit $result + exit $result } # Check with --extract-all option rm xg-gl-5.tmp -${XGETTEXT} -a -o xg-gl-5.tmp xg-gl-5.glade -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -a -o xg-gl-5.tmp xg-gl-5.glade || exit 1 # Don't simplify this to "grep ... < xg-gl-5.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-gl-5.tmp | grep -v 'POT-Creation-Date' > xg-gl-5.pot @@ -117,10 +107,9 @@ ${DIFF} xg-gl-5.ok xg-gl-5.pot result=$? test $result = 0 || { - rm -fr $tmpfiles; exit $result + exit $result } -tmpfiles="$tmpfiles xg-gl-5b.glade" cat <<EOF > xg-gl-5b.glade <?xml version="1.0"?> <glade-interface> @@ -159,15 +148,12 @@ cat <<EOF > xg-gl-5b.glade </glade-interface> EOF -tmpfiles="$tmpfiles xg-gl-5b.tmp xg-gl-5b.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o xg-gl-5b.tmp xg-gl-5b.glade 2>/dev/null -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o xg-gl-5b.tmp xg-gl-5b.glade 2>/dev/null || exit 1 # Don't simplify this to "grep ... < xg-gl-5b.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-gl-5b.tmp | grep -v 'POT-Creation-Date' > xg-gl-5b.pot -tmpfiles="$tmpfiles xg-gl-5b.ok" cat <<\EOF > xg-gl-5b.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -196,6 +182,4 @@ EOF ${DIFF} xg-gl-5b.ok xg-gl-5b.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-glade-6 b/gettext-tools/tests/xgettext-glade-6 index b541843..49fecf8 100755..100644 --- a/gettext-tools/tests/xgettext-glade-6 +++ b/gettext-tools/tests/xgettext-glade-6 @@ -5,24 +5,18 @@ # Checks that the extracted pot contains the right translatable # content, comments and context. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-gl-6-empty.glade" cat <<EOF > xg-gl-6-empty.glade <?xml version="1.0"?> <GTK-Interface/> EOF -tmpfiles="$tmpfiles xg-gl-6.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o xg-gl-6.pot xg-gl-6-empty.glade 2>/dev/null test $? = 0 || { echo "Skipping test: xgettext was built without Glade support" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles xg-gl-6.ui" cat <<EOF > xg-gl-6.ui <?xml version="1.0" encoding="UTF-8"?> <interface> @@ -37,12 +31,9 @@ cat <<EOF > xg-gl-6.ui </interface> EOF -tmpfiles="$tmpfiles xg-gl-6.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || exit 1 -tmpfiles="$tmpfiles xg-gl-6.ok" cat <<EOF > xg-gl-6.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -74,17 +65,14 @@ ${DIFF} xg-gl-6.ok xg-gl-6.pot result=$? test $result = 0 || { - rm -fr $tmpfiles; exit $result + exit $result } # Check with --extract-all option. -${XGETTEXT} -a -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -a -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || exit 1 # Must be ignored. ${DIFF} xg-gl-6.ok xg-gl-6.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-glade-7 b/gettext-tools/tests/xgettext-glade-7 index 11cbccf..d037415 100755..100644 --- a/gettext-tools/tests/xgettext-glade-7 +++ b/gettext-tools/tests/xgettext-glade-7 @@ -5,24 +5,18 @@ # Checks the extraction of a medium size GtkBuilder file, with # comments, context and translatable and not translatable content. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-gl-7-empty.glade" cat <<EOF > xg-gl-7-empty.glade <?xml version="1.0"?> <GTK-Interface/> EOF -tmpfiles="$tmpfiles xg-gl-7.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o xg-gl-7.pot xg-gl-7-empty.glade 2>/dev/null test $? = 0 || { echo "Skipping test: xgettext was built without Glade support" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles xg-gl-7.ui" cat <<EOF > xg-gl-7.ui <?xml version="1.0" encoding="UTF-8"?> <interface> @@ -189,12 +183,9 @@ cat <<EOF > xg-gl-7.ui </interface> EOF -tmpfiles="$tmpfiles xg-gl-7.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o - xg-gl-7.ui | grep -v 'POT-Creation-Date' > xg-gl-7.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o - xg-gl-7.ui | grep -v 'POT-Creation-Date' > xg-gl-7.pot || exit 1 -tmpfiles="$tmpfiles xg-gl-7.ok" cat <<\EOF > xg-gl-7.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -282,6 +273,4 @@ EOF ${DIFF} xg-gl-7.ok xg-gl-7.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-gsettings-1 b/gettext-tools/tests/xgettext-gsettings-1 index 1e0d3b7..fbc9b6e 100644 --- a/gettext-tools/tests/xgettext-gsettings-1 +++ b/gettext-tools/tests/xgettext-gsettings-1 @@ -3,24 +3,18 @@ # Test of GSettings support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-gs-1-empty.gschema.xml" cat <<EOF > xg-gs-1-empty.gschema.xml <?xml version="1.0"?> <schemalist/> EOF -tmpfiles="$tmpfiles xg-gs-1.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} -o xg-gs-1.pot xg-gs-1-empty.gschema.xml 2>/dev/null test $? = 0 || { echo "Skipping test: xgettext was built without GSettings support" - rm -fr $tmpfiles; exit 77 + exit 77 } -tmpfiles="$tmpfiles xg-gs-1.gschema.xml" cat <<EOF > xg-gs-1.gschema.xml <?xml version="1.0"?> <schemalist> @@ -45,12 +39,9 @@ cat <<EOF > xg-gs-1.gschema.xml </schemalist> EOF -tmpfiles="$tmpfiles xg-gs-1.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} --add-comments -o - xg-gs-1.gschema.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --add-comments -o - xg-gs-1.gschema.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || exit 1 -tmpfiles="$tmpfiles xg-gs-1.ok" cat <<EOF > xg-gs-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -88,6 +79,4 @@ EOF ${DIFF} xg-gs-1.ok xg-gs-1.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-java-1 b/gettext-tools/tests/xgettext-java-1 index d517e9c..2d73c22 100755..100644 --- a/gettext-tools/tests/xgettext-java-1 +++ b/gettext-tools/tests/xgettext-java-1 @@ -4,10 +4,6 @@ # Some tests for java support # -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-j-1.java" cat <<EOF > xg-j-1.java class TestCase { public TestCase() { @@ -32,14 +28,10 @@ class TestCase { } EOF -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; } -LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -c -d xg-j-1.tmp xg-j-1.java || exit 1 +LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po || exit 1 -tmpfiles="$tmpfiles xg-j-1.ok" cat <<EOF > xg-j-1.ok #. standard usage msgid "Test String 1" @@ -66,6 +58,4 @@ EOF ${DIFF} xg-j-1.ok xg-j-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-java-2 b/gettext-tools/tests/xgettext-java-2 index d7afb2e..6cdce99 100755..100644 --- a/gettext-tools/tests/xgettext-java-2 +++ b/gettext-tools/tests/xgettext-java-2 @@ -4,10 +4,6 @@ # More tests for java support # -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-j-2.java" cat <<\EOF > xg-j-2.java class TestCase { public static void main (String[] args) { @@ -59,15 +55,12 @@ comment! */ "this is a single " /* now comes the concatenation! */ + // after + } EOF -tmpfiles="$tmpfiles xg-j-2.tmp xg-j-2.pot" : ${XGETTEXT=xgettext} -${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; } +${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null || 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' | LC_ALL=C tr -d '\r' > xg-j-2.pot -tmpfiles="$tmpfiles xg-j-2.ok" cat <<\EOF > xg-j-2.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -176,6 +169,4 @@ EOF ${DIFF} xg-j-2.ok xg-j-2.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-java-3 b/gettext-tools/tests/xgettext-java-3 index 7adbd10..f288b15 100755..100644 --- a/gettext-tools/tests/xgettext-java-3 +++ b/gettext-tools/tests/xgettext-java-3 @@ -4,10 +4,6 @@ # Some tests for java plural keyword support # -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-j-3.java" cat <<EOF > xg-j-3.java class TestCase { public TestCase() { @@ -17,14 +13,10 @@ class TestCase { } EOF -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; } -LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-j-3.tmp xg-j-3.java || exit 1 +LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po || exit 1 -tmpfiles="$tmpfiles xg-j-3.ok" cat <<EOF > xg-j-3.ok msgid "test 1" msgid_plural "plural test" @@ -36,6 +28,4 @@ EOF ${DIFF} xg-j-3.ok xg-j-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4 index 9ed7b8e..f77f8ee 100755..100644 --- a/gettext-tools/tests/xgettext-java-4 +++ b/gettext-tools/tests/xgettext-java-4 @@ -4,10 +4,6 @@ # Some tests for java plural keyword support # -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-j-4.java" cat <<EOF > xg-j-4.java class TestCase { public TestCase() { @@ -17,15 +13,11 @@ class TestCase { } EOF -tmpfiles="$tmpfiles xg-j-4.tmp.po xg-j-4.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-j-4.tmp xg-j-4.java || exit 1 +LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po || exit 1 -tmpfiles="$tmpfiles xg-j-4.ok" cat <<EOF > xg-j-4.ok msgid "test 1" msgid_plural "plural test" @@ -37,6 +29,4 @@ EOF ${DIFF} xg-j-4.ok xg-j-4.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-java-5 b/gettext-tools/tests/xgettext-java-5 index 14447cd..882b0e1 100755..100644 --- a/gettext-tools/tests/xgettext-java-5 +++ b/gettext-tools/tests/xgettext-java-5 @@ -3,10 +3,6 @@ # Test Java support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-j-5.java" cat <<EOF > xg-j-5.java // This comment will not be extracted. System.out.println(gettext("help")); @@ -24,15 +20,11 @@ System.out.println(gettext("there is not enough" + + "verbose string")); EOF -tmpfiles="$tmpfiles xg-j-5.tmp.po xg-j-5.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-j-5.tmp xg-j-5.java -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-j-5.tmp xg-j-5.java || exit 1 +LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po || exit 1 -tmpfiles="$tmpfiles xg-j-5.ok" cat <<EOF > xg-j-5.ok msgid "help" msgstr "" @@ -61,6 +53,4 @@ EOF ${DIFF} xg-j-5.ok xg-j-5.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-java-6 b/gettext-tools/tests/xgettext-java-6 index 91593ed..e8f458d 100755..100644 --- a/gettext-tools/tests/xgettext-java-6 +++ b/gettext-tools/tests/xgettext-java-6 @@ -3,10 +3,6 @@ # Test Java support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-j-6.java" cat <<\EOF > xg-j-6.java /* a */ /* b */ String string = /* c */ @@ -14,15 +10,11 @@ cat <<\EOF > xg-j-6.java /* e */ _( /* f */ "hello " /* g */ + /* h */ "world" /* i */ ); EOF -tmpfiles="$tmpfiles xg-j-6.tmp.po xg-j-6.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-j-6.tmp xg-j-6.java -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-j-6.tmp xg-j-6.java || exit 1 +LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po || exit 1 -tmpfiles="$tmpfiles xg-j-6.ok" cat <<EOF > xg-j-6.ok #. a #. b @@ -38,6 +30,4 @@ EOF ${DIFF} xg-j-6.ok xg-j-6.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-java-7 b/gettext-tools/tests/xgettext-java-7 index b929b5b..bf3f933 100755..100644 --- a/gettext-tools/tests/xgettext-java-7 +++ b/gettext-tools/tests/xgettext-java-7 @@ -3,24 +3,16 @@ # Test Java support: extraction of contexts. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-j-7.java" cat <<\EOF > xg-j-7.java import gnu.gettext.GettextResourceBundle; System.out.println(GettextResourceBundle.gettext("help")); System.out.println(GettextResourceBundle.pgettext("Help", "about")); EOF -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; } -LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-j-7.tmp xg-j-7.java || exit 1 +LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po || exit 1 -tmpfiles="$tmpfiles xg-j-7.ok" cat <<EOF > xg-j-7.ok msgid "help" msgstr "" @@ -34,6 +26,4 @@ EOF ${DIFF} xg-j-7.ok xg-j-7.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-javascript-1 b/gettext-tools/tests/xgettext-javascript-1 index 83d8412..198c30e 100755..100644 --- a/gettext-tools/tests/xgettext-javascript-1 +++ b/gettext-tools/tests/xgettext-javascript-1 @@ -3,10 +3,6 @@ # Test of JavaScript support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-js-1.js" cat <<\EOF > xg-js-1.js var s1 = "Simple string, no gettext needed", s2 = _("Extract this first string"); @@ -22,15 +18,13 @@ gettext('Extract this fourth string'); gettext('Extract this fifth string'); EOF -tmpfiles="$tmpfiles xg-js-1.err xg-js-1.tmp xg-js-1.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments=TRANSLATORS: --no-location -o xg-js-1.tmp xg-js-1.js 2>xg-js-1.err -test $? = 0 || { cat xg-js-1.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-js-1.err; exit 1; } # Don't simplify this to "grep ... < xg-js-1.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-js-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-1.pot -tmpfiles="$tmpfiles xg-js-1.ok" cat <<\EOF > xg-js-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -72,6 +66,4 @@ EOF ${DIFF} xg-js-1.ok xg-js-1.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-javascript-2 b/gettext-tools/tests/xgettext-javascript-2 index 57c6a41..3f6e6d4 100755..100644 --- a/gettext-tools/tests/xgettext-javascript-2 +++ b/gettext-tools/tests/xgettext-javascript-2 @@ -4,10 +4,6 @@ # Test of JavaScript support. # Playing with regex and division operator -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-js-2.js" cat <<\EOF > xg-js-2.js // RegExp literals containing string quotes must not desync the parser var d = 1 / 2 / 4; @@ -34,15 +30,13 @@ var s8 = /(?=(a+))a*b\1/.exec(_("RegExp test string #15")); var s9 = /_("a+")/.exec(_("RegExp test string #16")); EOF -tmpfiles="$tmpfiles xg-js-2.err xg-js-2.tmp xg-js-2.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --no-location -o xg-js-2.tmp xg-js-2.js 2>xg-js-2.err -test $? = 0 || { cat xg-js-2.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-js-2.err; exit 1; } # Don't simplify this to "grep ... < xg-js-2.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-js-2.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-2.pot -tmpfiles="$tmpfiles xg-js-2.ok" cat <<\EOF > xg-js-2.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -115,6 +109,4 @@ EOF ${DIFF} xg-js-2.ok xg-js-2.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-javascript-3 b/gettext-tools/tests/xgettext-javascript-3 index 95ced52..b37b5a5 100755..100644 --- a/gettext-tools/tests/xgettext-javascript-3 +++ b/gettext-tools/tests/xgettext-javascript-3 @@ -4,10 +4,6 @@ # Test of JavaScript support. # Playing with concatenation of string literals within the gettext function -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-js-3.js" cat <<\EOF > xg-js-3.js // The usual way to concatenate strings is the plus '+' sign var s1 = _("Concatenation #1 " + "- String part added"); @@ -17,15 +13,13 @@ var s3 = _("This" + " whole " ' should' + " be " + 'extracted'); EOF -tmpfiles="$tmpfiles xg-js-3.err xg-js-3.tmp xg-js-3.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments=TRANSLATORS: --no-location -o xg-js-3.tmp xg-js-3.js 2>xg-js-3.err -test $? = 0 || { cat xg-js-3.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-js-3.err; exit 1; } # Don't simplify this to "grep ... < xg-js-3.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-js-3.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-3.pot -tmpfiles="$tmpfiles xg-js-3.ok" cat <<\EOF > xg-js-3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -59,6 +53,4 @@ EOF ${DIFF} xg-js-3.ok xg-js-3.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-javascript-4 b/gettext-tools/tests/xgettext-javascript-4 index 58151ee..399b97d 100755..100644 --- a/gettext-tools/tests/xgettext-javascript-4 +++ b/gettext-tools/tests/xgettext-javascript-4 @@ -3,25 +3,19 @@ # Test of JavaScript escape sequences in string literals. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-js-4.js" cat <<\EOF > xg-js-4.js var s1 = _("Unicode escape \u3042"); var s2 = _("Surrogate pair \uD835\uDC9C"); var s3 = _("Escape sequence \1411 \x622 \xxx \y"); EOF -tmpfiles="$tmpfiles xg-js-4.err xg-js-4.tmp xg-js-4.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --no-location -o xg-js-4.tmp xg-js-4.js 2>xg-js-4.err -test $? = 0 || { cat xg-js-4.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-js-4.err; exit 1; } # Don't simplify this to "grep ... < xg-js-4.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-js-4.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-4.pot -tmpfiles="$tmpfiles xg-js-4.ok" cat <<\EOF > xg-js-4.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -55,6 +49,4 @@ EOF ${DIFF} xg-js-4.ok xg-js-4.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-javascript-5 b/gettext-tools/tests/xgettext-javascript-5 index 08b1dc4..1fd08b5 100755..100644 --- a/gettext-tools/tests/xgettext-javascript-5 +++ b/gettext-tools/tests/xgettext-javascript-5 @@ -3,10 +3,6 @@ # Test of JavaScript Unicode support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-js-5.js" cat <<\EOF > xg-js-5.js // the following except is stolen from json2.js var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, @@ -29,15 +25,13 @@ var matched = curnodepath.match('^\\'+path+'\\/([\\w\\s]+)') \ + _("Expected translation string #4"); EOF -tmpfiles="$tmpfiles xg-js-5.err xg-js-5.tmp xg-js-5.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --no-location -o xg-js-5.tmp xg-js-5.js 2>xg-js-5.err -test $? = 0 || { cat xg-js-5.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-js-5.err; exit 1; } # Don't simplify this to "grep ... < xg-js-5.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-js-5.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-5.pot -tmpfiles="$tmpfiles xg-js-5.ok" cat <<\EOF > xg-js-5.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -74,6 +68,4 @@ EOF ${DIFF} xg-js-5.ok xg-js-5.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-javascript-6 b/gettext-tools/tests/xgettext-javascript-6 index 0ef5ffe..1057d33 100755..100644 --- a/gettext-tools/tests/xgettext-javascript-6 +++ b/gettext-tools/tests/xgettext-javascript-6 @@ -3,10 +3,6 @@ # Test of JavaScript E4X support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-js-6.js" cat <<\EOF > xg-js-6.js var x1 = <x1></x1>; var s1 = _("Expected translation string #1"); @@ -32,15 +28,13 @@ var s9 = _("Expected translation string #8"); </foo>; EOF -tmpfiles="$tmpfiles xg-js-6.err xg-js-6.tmp xg-js-6.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --no-location -o xg-js-6.tmp xg-js-6.js 2>xg-js-6.err -test $? = 0 || { cat xg-js-6.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-js-6.err; exit 1; } # Don't simplify this to "grep ... < xg-js-6.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-js-6.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-6.pot -tmpfiles="$tmpfiles xg-js-6.ok" cat <<\EOF > xg-js-6.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -89,6 +83,4 @@ EOF ${DIFF} xg-js-6.ok xg-js-6.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-librep-1 b/gettext-tools/tests/xgettext-librep-1 index 2f17e62..9463baa 100755..100644 --- a/gettext-tools/tests/xgettext-librep-1 +++ b/gettext-tools/tests/xgettext-librep-1 @@ -3,10 +3,6 @@ # Test librep support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-lr-1.jl" cat <<EOF > xg-lr-1.jl ; This comment will not be extracted. (princ (_ "help")) @@ -20,15 +16,11 @@ cat <<EOF > xg-lr-1.jl (princ (_ "The Fabulous Four")) EOF -tmpfiles="$tmpfiles xg-lr-1.tmp.po xg-lr-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-lr-1.tmp xg-lr-1.jl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-lr-1.tmp xg-lr-1.jl || exit 1 +LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po || exit 1 -tmpfiles="$tmpfiles xg-lr-1.ok" cat <<EOF > xg-lr-1.ok msgid "help" msgstr "" @@ -51,6 +43,4 @@ EOF ${DIFF} xg-lr-1.ok xg-lr-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-librep-2 b/gettext-tools/tests/xgettext-librep-2 index 518c468..f4dc918 100755..100644 --- a/gettext-tools/tests/xgettext-librep-2 +++ b/gettext-tools/tests/xgettext-librep-2 @@ -3,10 +3,6 @@ # Test librep support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-lr-2.jl" cat <<\EOF > xg-lr-2.jl #| a |# #| b |# (setq string #| c |# @@ -14,15 +10,11 @@ cat <<\EOF > xg-lr-2.jl #| e |# (_ #| f |# "hello world" #| g |# )) EOF -tmpfiles="$tmpfiles xg-lr-2.tmp.po xg-lr-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-lr-2.tmp xg-lr-2.jl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-lr-2.tmp xg-lr-2.jl || exit 1 +LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po || exit 1 -tmpfiles="$tmpfiles xg-lr-2.ok" cat <<EOF > xg-lr-2.ok #. a #. b @@ -38,6 +30,4 @@ EOF ${DIFF} xg-lr-2.ok xg-lr-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-lisp-1 b/gettext-tools/tests/xgettext-lisp-1 index 9f34dc8..eb83e72 100755..100644 --- a/gettext-tools/tests/xgettext-lisp-1 +++ b/gettext-tools/tests/xgettext-lisp-1 @@ -3,10 +3,6 @@ # Test Lisp support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-ls-1.lisp" cat <<EOF > xg-ls-1.lisp ; This comment will not be extracted. (write-line (gettext "help")) @@ -20,15 +16,11 @@ cat <<EOF > xg-ls-1.lisp (write-line (gettext "The Fabulous Four")) EOF -tmpfiles="$tmpfiles xg-ls-1.tmp.po xg-ls-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-ls-1.tmp xg-ls-1.lisp -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-ls-1.tmp xg-ls-1.lisp || exit 1 +LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po || exit 1 -tmpfiles="$tmpfiles xg-ls-1.ok" cat <<EOF > xg-ls-1.ok msgid "help" msgstr "" @@ -51,6 +43,4 @@ EOF ${DIFF} xg-ls-1.ok xg-ls-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-lisp-2 b/gettext-tools/tests/xgettext-lisp-2 index 6aaea22..94de068 100755..100644 --- a/gettext-tools/tests/xgettext-lisp-2 +++ b/gettext-tools/tests/xgettext-lisp-2 @@ -3,10 +3,6 @@ # Test Lisp support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-ls-2.lisp" cat <<\EOF > xg-ls-2.lisp #| a |# #| b |# (setq string #| c |# @@ -14,15 +10,11 @@ cat <<\EOF > xg-ls-2.lisp #| e |# (_ #| f |# "hello world" #| g |# )) EOF -tmpfiles="$tmpfiles xg-ls-2.tmp.po xg-ls-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-ls-2.tmp xg-ls-2.lisp -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-ls-2.tmp xg-ls-2.lisp || exit 1 +LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po || exit 1 -tmpfiles="$tmpfiles xg-ls-2.ok" cat <<EOF > xg-ls-2.ok #. a #. b @@ -38,6 +30,4 @@ EOF ${DIFF} xg-ls-2.ok xg-ls-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-lua-1 b/gettext-tools/tests/xgettext-lua-1 index d70dd2c..31ba47b 100755..100644 --- a/gettext-tools/tests/xgettext-lua-1 +++ b/gettext-tools/tests/xgettext-lua-1 @@ -3,10 +3,6 @@ # Test Lua support -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-lu-1.lua" cat <<\EOF > xg-lu-1.lua print(_("This is a test string.")) print(_('And another one.')) @@ -26,15 +22,11 @@ print(_("abc" .. "def")) print(speed / 1000 .. 'Mbps') EOF -tmpfiles="$tmpfiles xg-lu-1.tmp.po xg-lu-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-lu-1.tmp xg-lu-1.lua -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-lu-1.tmp.po > xg-lu-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-lu-1.tmp xg-lu-1.lua || exit 1 +LC_ALL=C tr -d '\r' < xg-lu-1.tmp.po > xg-lu-1.po || exit 1 -tmpfiles="$tmpfiles xg-lu-1.ok" cat <<EOF > xg-lu-1.ok msgid "This is a test string." msgstr "" @@ -77,6 +69,4 @@ EOF ${DIFF} xg-lu-1.ok xg-lu-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-lua-2 b/gettext-tools/tests/xgettext-lua-2 index 46773b7..797e513 100755..100644 --- a/gettext-tools/tests/xgettext-lua-2 +++ b/gettext-tools/tests/xgettext-lua-2 @@ -3,10 +3,6 @@ # Test Lua support -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-lu-2.lua" cat <<\EOF > xg-lu-2.lua -- This comment won't be extracted. print(_"Hmm.") @@ -27,15 +23,11 @@ print(--[=[ TRANSLATORS: This is a comment for you!]=] _(--[[TRANSLATORS: Nobody print(_"A string.") EOF -tmpfiles="$tmpfiles xg-lu-2.tmp.po xg-lu-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-lu-2.tmp xg-lu-2.lua -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-lu-2.tmp.po > xg-lu-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-lu-2.tmp xg-lu-2.lua || exit 1 +LC_ALL=C tr -d '\r' < xg-lu-2.tmp.po > xg-lu-2.po || exit 1 -tmpfiles="$tmpfiles xg-lu-2.ok" cat <<EOF > xg-lu-2.ok msgid "Hmm." msgstr "" @@ -64,6 +56,4 @@ EOF ${DIFF} xg-lu-2.ok xg-lu-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-objc-1 b/gettext-tools/tests/xgettext-objc-1 index 73cacda..9563d77 100755..100644 --- a/gettext-tools/tests/xgettext-objc-1 +++ b/gettext-tools/tests/xgettext-objc-1 @@ -3,10 +3,6 @@ # Test ObjectiveC extractor. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-ob-1.m" cat <<\EOF > xg-ob-1.m id str = _(@ "conca" /* comment */ @@ -29,14 +25,10 @@ _ // test NSLocalizedString(@"Information", @"") EOF -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; } -LC_ALL=C tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1.tmp xg-ob-1.m || exit 1 +LC_ALL=C tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po || exit 1 -tmpfiles="$tmpfiles xg-ob-1.ok" cat <<\EOF > xg-ob-1.ok #: xg-ob-1.m:2 msgid "concatenated" @@ -63,6 +55,4 @@ EOF ${DIFF} xg-ob-1.ok xg-ob-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-objc-2 b/gettext-tools/tests/xgettext-objc-2 index 8fdb057..a59a3d4 100755..100644 --- a/gettext-tools/tests/xgettext-objc-2 +++ b/gettext-tools/tests/xgettext-objc-2 @@ -3,10 +3,6 @@ # Test ObjectiveC support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-ob-2.m" cat <<EOF > xg-ob-2.m // This comment will not be extracted. print (NSLocalizedString (@ @@ -28,15 +24,11 @@ print (NSLocalizedString (@ "there is not enough" @ "verbose string")); EOF -tmpfiles="$tmpfiles xg-ob-2.tmp.po xg-ob-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-ob-2.tmp xg-ob-2.m -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-ob-2.tmp xg-ob-2.m || exit 1 +LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po || exit 1 -tmpfiles="$tmpfiles xg-ob-2.ok" cat <<EOF > xg-ob-2.ok msgid "help" msgstr "" @@ -65,6 +57,4 @@ EOF ${DIFF} xg-ob-2.ok xg-ob-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-perl-1 b/gettext-tools/tests/xgettext-perl-1 index 841e9c6..5f52c60 100755..100644 --- a/gettext-tools/tests/xgettext-perl-1 +++ b/gettext-tools/tests/xgettext-perl-1 @@ -3,10 +3,6 @@ # Test of Perl support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pl-1.pl" cat <<\EOF > xg-pl-1.pl use Locale::Messages qw (textdomain bindtextdomain gettext ngettext dngettext); @@ -153,18 +149,14 @@ __END__ gettext "Discarded!"; EOF -tmpfiles="$tmpfiles xg-pl-1.tmp.po xg-pl-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header -n \ -k_ --flag=_:1:pass-perl-format --flag=_:1:pass-perl-brace-format \ -k%__ --flag=%__:1:pass-perl-format --flag=%__:1:pass-perl-brace-format \ -k\$__ --flag=\$__:1:pass-perl-format --flag=\$__:1:pass-perl-brace-format \ - -d xg-pl-1.tmp xg-pl-1.pl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-pl-1.tmp xg-pl-1.pl || exit 1 +LC_ALL=C tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po || exit 1 -tmpfiles="$tmpfiles xg-pl-1.ok" cat <<\EOF > xg-pl-1.ok #: xg-pl-1.pl:9 msgid "'Your command, please?', asked the waiter." @@ -338,6 +330,4 @@ EOF ${DIFF} xg-pl-1.ok xg-pl-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-perl-2 b/gettext-tools/tests/xgettext-perl-2 index 413d332..85f0464 100755..100644 --- a/gettext-tools/tests/xgettext-perl-2 +++ b/gettext-tools/tests/xgettext-perl-2 @@ -3,10 +3,6 @@ # Test of Perl support with ISO-8859-1 encoded input. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pl-2.pl" cat <<\EOF > xg-pl-2.pl use charnames ':full'; printf "%s\n", gettext "Bse Bbchen - wo sind sie blo\N{LATIN SMALL LETTER SHARP S}?"; @@ -15,14 +11,11 @@ Die europische Whrung ist \N{EURO SIGN}. STR EOF -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' | LC_ALL=C tr -d '\r' > xg-pl-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-2.po || exit 1 -tmpfiles="$tmpfiles xg-pl-2.ok" cat <<\EOF > xg-pl-2.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -55,6 +48,4 @@ EOF ${DIFF} xg-pl-2.ok xg-pl-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-perl-3 b/gettext-tools/tests/xgettext-perl-3 index 70fe934..9852813 100755..100644 --- a/gettext-tools/tests/xgettext-perl-3 +++ b/gettext-tools/tests/xgettext-perl-3 @@ -3,10 +3,6 @@ # Test of Perl support with UTF-8 encoded input. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pl-3.pl" cat <<\EOF > xg-pl-3.pl use charnames ':full'; printf "%s\n", gettext "B旦se B端bchen - wo sind sie blo\N{LATIN SMALL LETTER SHARP S}?"; @@ -15,14 +11,11 @@ Die europ辰ische W辰hrung ist \N{EURO SIGN}. STR EOF -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' | LC_ALL=C tr -d '\r' > xg-pl-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-3.po || exit 1 -tmpfiles="$tmpfiles xg-pl-3.ok" cat <<\EOF > xg-pl-3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -55,6 +48,4 @@ EOF ${DIFF} xg-pl-3.ok xg-pl-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-perl-4 b/gettext-tools/tests/xgettext-perl-4 index 4ab943f..1d4701f 100755..100644 --- a/gettext-tools/tests/xgettext-perl-4 +++ b/gettext-tools/tests/xgettext-perl-4 @@ -4,10 +4,6 @@ # Tests for the general string extraction facilities of the Perl backend # (with option --extract-all). -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pl-4.pl" cat <<\EOPERL > xg-pl-4.pl use strict; @@ -58,15 +54,11 @@ print "\U\x70\LO\154\x{69}\x{004E}a \Q\lRu\LLeS\E\041\n"; # "\x{430}\x{447}\x{43a}\x{430}\n"; EOPERL -tmpfiles="$tmpfiles xg-pl-4.tmp.pot xg-pl-4.pot" : ${XGETTEXT=xgettext} 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; } -LC_ALL=C tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.tmp.pot xg-pl-4.pl || exit 1 +LC_ALL=C tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot || exit 1 -tmpfiles="$tmpfiles xg-pl-4.ok" cat <<\EOF > xg-pl-4.ok msgid "'Your command, please?', asked the waiter.\n" msgstr "" @@ -116,6 +108,4 @@ EOF ${DIFF} xg-pl-4.ok xg-pl-4.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-perl-5 b/gettext-tools/tests/xgettext-perl-5 index 31ee5a2..5020baf 100755..100644 --- a/gettext-tools/tests/xgettext-perl-5 +++ b/gettext-tools/tests/xgettext-perl-5 @@ -3,10 +3,6 @@ # Test Perl support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pl-5.pl" cat <<EOF > xg-pl-5.pl # This comment will not be extracted. print gettext "help"; @@ -19,15 +15,11 @@ print gettext "Hey Jude"; print gettext "The Fabulous Four"; EOF -tmpfiles="$tmpfiles xg-pl-5.tmp.po xg-pl-5.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-pl-5.tmp xg-pl-5.pl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-pl-5.tmp xg-pl-5.pl || exit 1 +LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po || exit 1 -tmpfiles="$tmpfiles xg-pl-5.ok" cat <<EOF > xg-pl-5.ok msgid "help" msgstr "" @@ -49,6 +41,4 @@ EOF ${DIFF} xg-pl-5.ok xg-pl-5.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-perl-6 b/gettext-tools/tests/xgettext-perl-6 index bda2f66..2347b11 100755..100644 --- a/gettext-tools/tests/xgettext-perl-6 +++ b/gettext-tools/tests/xgettext-perl-6 @@ -3,10 +3,6 @@ # Test whether the right number of arguments are extracted. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pl-6.pl" cat <<\EOPERL > xg-pl-6.pl use strict; @@ -67,15 +63,11 @@ print dgettext foo (17), "extracted15"; print dgettext foo 17, "extracted16"; EOPERL -tmpfiles="$tmpfiles xg-pl-6.tmp xg-pl-6.pot" : ${XGETTEXT=xgettext} 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; } -LC_ALL=C tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -o xg-pl-6.tmp xg-pl-6.pl || exit 1 +LC_ALL=C tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot || exit 1 -tmpfiles="$tmpfiles xg-pl-6.ok" cat <<\EOF > xg-pl-6.ok msgid "extracted1" msgstr "" @@ -130,6 +122,4 @@ EOF ${DIFF} xg-pl-6.ok xg-pl-6.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-perl-7 b/gettext-tools/tests/xgettext-perl-7 index 557b002..b170394 100755..100644 --- a/gettext-tools/tests/xgettext-perl-7 +++ b/gettext-tools/tests/xgettext-perl-7 @@ -3,10 +3,6 @@ # Test Perl support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pl-7.pl" cat <<\EOF > xg-pl-7.pl # a string = # b @@ -18,15 +14,11 @@ _( # d ); EOF -tmpfiles="$tmpfiles xg-pl-7.tmp.po xg-pl-7.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-pl-7.tmp xg-pl-7.pl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-pl-7.tmp xg-pl-7.pl || exit 1 +LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po || exit 1 -tmpfiles="$tmpfiles xg-pl-7.ok" cat <<EOF > xg-pl-7.ok #. a #. b @@ -40,6 +32,4 @@ EOF ${DIFF} xg-pl-7.ok xg-pl-7.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-perl-8 b/gettext-tools/tests/xgettext-perl-8 index 2de1b79..f45aff8 100755..100644 --- a/gettext-tools/tests/xgettext-perl-8 +++ b/gettext-tools/tests/xgettext-perl-8 @@ -6,10 +6,6 @@ # or ternary respectively) or they are regex delimiters for pattern # matches. This test case checks the proper recognition. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pl-8.pl" cat <<\EOF > xg-pl-8.pl info(__("using %s."), ($a->b() eq "auto" ? "" : "")); @@ -64,16 +60,12 @@ print __"Chained method calls without parentheses do not accept arguments!"; print __"Synching works."; EOF -tmpfiles="$tmpfiles xg-pl-8.tmp.po xg-pl-8.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header -n \ -k__ \ - -d xg-pl-8.tmp xg-pl-8.pl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-pl-8.tmp.po > xg-pl-8.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-pl-8.tmp xg-pl-8.pl || exit 1 +LC_ALL=C tr -d '\r' < xg-pl-8.tmp.po > xg-pl-8.po || exit 1 -tmpfiles="$tmpfiles xg-pl-8.ok" cat <<\EOF > xg-pl-8.ok #: xg-pl-8.pl:1 #, perl-format @@ -129,6 +121,4 @@ EOF ${DIFF} xg-pl-8.ok xg-pl-8.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-php-1 b/gettext-tools/tests/xgettext-php-1 index 36a85f0..deca6e0 100755..100644 --- a/gettext-tools/tests/xgettext-php-1 +++ b/gettext-tools/tests/xgettext-php-1 @@ -3,10 +3,6 @@ # Test PHP support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-ph-1.php" cat <<EOF > xg-ph-1.php <? // This comment will not be extracted. @@ -26,15 +22,11 @@ echo _(table["key"]); ?> EOF -tmpfiles="$tmpfiles xg-ph-1.tmp.po xg-ph-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-ph-1.tmp xg-ph-1.php -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-ph-1.tmp xg-ph-1.php || exit 1 +LC_ALL=C tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po || exit 1 -tmpfiles="$tmpfiles xg-ph-1.ok" cat <<EOF > xg-ph-1.ok msgid "help" msgstr "" @@ -61,6 +53,4 @@ EOF ${DIFF} xg-ph-1.ok xg-ph-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-php-2 b/gettext-tools/tests/xgettext-php-2 index 028e832..b19b3b5 100755..100644 --- a/gettext-tools/tests/xgettext-php-2 +++ b/gettext-tools/tests/xgettext-php-2 @@ -3,10 +3,6 @@ # Test PHP support: here documents. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-ph-2.php" cat <<EOF > xg-ph-2.php <? echo _("Egyptians"); @@ -43,14 +39,10 @@ echo _("Franks"); ?> EOF -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; } -LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || exit 1 +LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || exit 1 -tmpfiles="$tmpfiles xg-ph-2.ok" cat <<EOF > xg-ph-2.ok msgid "Egyptians" msgstr "" @@ -72,6 +64,4 @@ EOF ${DIFF} xg-ph-2.ok xg-ph-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-php-3 b/gettext-tools/tests/xgettext-php-3 index 6623d70..888a3aa 100755..100644 --- a/gettext-tools/tests/xgettext-php-3 +++ b/gettext-tools/tests/xgettext-php-3 @@ -3,10 +3,6 @@ # Test PHP support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-ph-3.php" cat <<\EOF > xg-ph-3.php <? /* a */ @@ -16,15 +12,11 @@ cat <<\EOF > xg-ph-3.php ?> EOF -tmpfiles="$tmpfiles xg-ph-3.tmp.po xg-ph-3.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-ph-3.tmp xg-ph-3.php -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-ph-3.tmp xg-ph-3.php || exit 1 +LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po || exit 1 -tmpfiles="$tmpfiles xg-ph-3.ok" cat <<EOF > xg-ph-3.ok #. a #. b @@ -40,6 +32,4 @@ EOF ${DIFF} xg-ph-3.ok xg-ph-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-php-4 b/gettext-tools/tests/xgettext-php-4 index 69ebd81..8edb553 100755..100644 --- a/gettext-tools/tests/xgettext-php-4 +++ b/gettext-tools/tests/xgettext-php-4 @@ -3,10 +3,6 @@ # Test PHP support: string concatenation. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-ph-4.php" cat <<EOF > xg-ph-4.php <? echo _("foo"."bar"); @@ -18,15 +14,11 @@ echo _("7" . "8" . "9"); ?> EOF -tmpfiles="$tmpfiles xg-ph-4.tmp.po xg-ph-4.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --extract-all \ - -d xg-ph-4.tmp xg-ph-4.php -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-ph-4.tmp xg-ph-4.php || exit 1 +LC_ALL=C tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po || exit 1 -tmpfiles="$tmpfiles xg-ph-4.ok" cat <<EOF > xg-ph-4.ok msgid "foobar" msgstr "" @@ -57,6 +49,4 @@ EOF ${DIFF} xg-ph-4.ok xg-ph-4.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-po-1 b/gettext-tools/tests/xgettext-po-1 index 60afc49..1074e02 100755..100644 --- a/gettext-tools/tests/xgettext-po-1 +++ b/gettext-tools/tests/xgettext-po-1 @@ -3,10 +3,6 @@ # Test C, C++, PO extractors. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-po-1.in.po xg-po-1.c xg-po-1.cc" cat <<EOF > xg-po-1.in.po #: file1.c:199 #, fuzzy @@ -46,15 +42,11 @@ main (int argc, char *argv[]) } EOF -tmpfiles="$tmpfiles xg-po-1.tmp.po xg-po-1.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-po-1.tmp xg-po-1.in.po xg-po-1.c xg-po-1.cc || exit 1 +LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po || exit 1 -tmpfiles="$tmpfiles xg-po-1.ok" cat <<EOF > xg-po-1.ok #: file1.c:199 #, fuzzy @@ -84,6 +76,4 @@ EOF ${DIFF} xg-po-1.ok xg-po-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-properties-1 b/gettext-tools/tests/xgettext-properties-1 index 5a11f8d..1e51edd 100755..100644 --- a/gettext-tools/tests/xgettext-properties-1 +++ b/gettext-tools/tests/xgettext-properties-1 @@ -3,10 +3,6 @@ # Test C, C++, JavaProperties extractors. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc" cat <<EOF > xg-pr-1.in.properties #: file1.c:199 #, fuzzy @@ -43,15 +39,11 @@ main (int argc, char *argv[]) } EOF -tmpfiles="$tmpfiles xg-pr-1.tmp.po xg-pr-1.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-pr-1.tmp xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc || exit 1 +LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po || exit 1 -tmpfiles="$tmpfiles xg-pr-1.ok" cat <<EOF > xg-pr-1.ok #: file1.c:199 #, fuzzy @@ -81,6 +73,4 @@ EOF ${DIFF} xg-pr-1.ok xg-pr-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1 index afa13da..ab87463 100755..100644 --- a/gettext-tools/tests/xgettext-python-1 +++ b/gettext-tools/tests/xgettext-python-1 @@ -3,10 +3,6 @@ # Test of Python support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-py-1.py" cat <<\EOF > xg-py-1.py # interpret_ansic = true, interpret_unicode = false _("abc\ @@ -32,15 +28,13 @@ _("abc" "def" + "ghi" "jkl" + mno) EOF -tmpfiles="$tmpfiles xg-py-1.err xg-py-1.tmp xg-py-1.pot" : ${XGETTEXT=xgettext} ${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; } +test $? = 0 || { cat xg-py-1.err; 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' | LC_ALL=C tr -d '\r' > xg-py-1.pot -tmpfiles="$tmpfiles xg-py-1.ok" cat <<\EOF > xg-py-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -95,6 +89,4 @@ EOF ${DIFF} xg-py-1.ok xg-py-1.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-python-2 b/gettext-tools/tests/xgettext-python-2 index 340c168..5f071d4 100755..100644 --- a/gettext-tools/tests/xgettext-python-2 +++ b/gettext-tools/tests/xgettext-python-2 @@ -3,10 +3,6 @@ # Test Python support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-py-2.py" cat <<EOF > xg-py-2.py # This comment will not be extracted. print gettext.gettext("help") @@ -23,15 +19,11 @@ print gettext.gettext("there is not enough" "verbose string") EOF -tmpfiles="$tmpfiles xg-py-2.tmp.po xg-py-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-py-2.tmp xg-py-2.py -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-py-2.tmp xg-py-2.py || exit 1 +LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po || exit 1 -tmpfiles="$tmpfiles xg-py-2.ok" cat <<EOF > xg-py-2.ok msgid "help" msgstr "" @@ -59,6 +51,4 @@ EOF ${DIFF} xg-py-2.ok xg-py-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3 index 34cc4ad..3ac44d1 100755..100644 --- a/gettext-tools/tests/xgettext-python-3 +++ b/gettext-tools/tests/xgettext-python-3 @@ -3,17 +3,12 @@ # Test Python support: --from-code option and encoding recognition. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-py-3a.py" cat <<\EOF > xg-py-3a.py #!/usr/bin/env python # TRANSLATORS: François Pinard is a hero. print gettext.gettext("日本語"); EOF -tmpfiles="$tmpfiles xg-py-3b.py" cat <<\EOF > xg-py-3b.py #!/usr/bin/env python # Hey Emacs! -*- coding: euc-jp -*- @@ -21,7 +16,6 @@ cat <<\EOF > xg-py-3b.py print gettext.gettext("日本語"); EOF -tmpfiles="$tmpfiles xg-py-3.ok" cat <<\EOF > xg-py-3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -48,53 +42,43 @@ EOF # Verify that if the source file has no magic coding comment, xgettext fails # if no --from-code option is given but succeeds if it is given. -tmpfiles="$tmpfiles xg-py-3a.tmp xg-py-3a.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \ -d xg-py-3a xg-py-3a.py > /dev/null 2>&1 -test $? = 1 || { rm -fr $tmpfiles; exit 1; } +test $? = 1 || { exit 1; } ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=euc-jp \ - -o xg-py-3a.tmp xg-py-3a.py -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -o xg-py-3a.tmp xg-py-3a.py || 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' | LC_ALL=C tr -d '\r' > xg-py-3a.pot : ${DIFF=diff} -${DIFF} xg-py-3.ok xg-py-3a.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${DIFF} xg-py-3.ok xg-py-3a.pot || exit 1 # Verify that if the source file has a magic coding comment, xgettext succeeds. -tmpfiles="$tmpfiles xg-py-3b.tmp xg-py-3b.pot" ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \ - -o xg-py-3b.tmp xg-py-3b.py -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -o xg-py-3b.tmp xg-py-3b.py || 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' | 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; } +${DIFF} xg-py-3.ok xg-py-3b.pot || exit 1 # Verify that if the source file has a magic coding comment and a --from-code # option is given, the magic coding comment takes precedence over it. -tmpfiles="$tmpfiles xg-py-3c.tmp xg-py-3c.pot" ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=iso-8859-1 \ - -o xg-py-3c.tmp xg-py-3b.py -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -o xg-py-3c.tmp xg-py-3b.py || 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' | 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; } +${DIFF} xg-py-3.ok xg-py-3c.pot || exit 1 # Verify that backslashes in and second bytes with value 0x5C are correctly # distinguished in weird encodings like BIG5. -tmpfiles="$tmpfiles xg-py-3d.py" cat <<\EOF > xg-py-3d.py #!/usr/bin/env python # Hey Emacs! -*- coding: big5 -*- @@ -102,15 +86,12 @@ print gettext.gettext(u"\u0021"); print gettext.gettext(u"\\u0021"); EOF -tmpfiles="$tmpfiles xg-py-3d.tmp xg-py-3d.pot" ${XGETTEXT} --add-comments=TRANSLATORS: \ - -o xg-py-3d.tmp xg-py-3d.py -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -o xg-py-3d.tmp xg-py-3d.py || 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' | LC_ALL=C tr -d '\r' > xg-py-3d.pot -tmpfiles="$tmpfiles xg-py-3d.ok" cat <<\EOF > xg-py-3d.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -139,9 +120,6 @@ msgid "!" msgstr "" EOF -${DIFF} xg-py-3d.ok xg-py-3d.pot -test $? = 0 || { rm -fr $tmpfiles; exit 1; } - -rm -fr $tmpfiles +${DIFF} xg-py-3d.ok xg-py-3d.pot || exit 1 exit 0 diff --git a/gettext-tools/tests/xgettext-python-4 b/gettext-tools/tests/xgettext-python-4 index 3b62fd9..49d1c12 100755..100644 --- a/gettext-tools/tests/xgettext-python-4 +++ b/gettext-tools/tests/xgettext-python-4 @@ -3,10 +3,6 @@ # Test Python support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-py-4.py" cat <<\EOF > xg-py-4.py # a string = # b @@ -16,15 +12,11 @@ _( # d ); EOF -tmpfiles="$tmpfiles xg-py-4.tmp.po xg-py-4.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-py-4.tmp xg-py-4.py -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-py-4.tmp.po > xg-py-4.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-py-4.tmp xg-py-4.py || exit 1 +LC_ALL=C tr -d '\r' < xg-py-4.tmp.po > xg-py-4.po || exit 1 -tmpfiles="$tmpfiles xg-py-4.ok" cat <<EOF > xg-py-4.ok #. a #. b @@ -38,6 +30,4 @@ EOF ${DIFF} xg-py-4.ok xg-py-4.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-scheme-1 b/gettext-tools/tests/xgettext-scheme-1 index 37bc58f..4ecccae 100755..100644 --- a/gettext-tools/tests/xgettext-scheme-1 +++ b/gettext-tools/tests/xgettext-scheme-1 @@ -3,10 +3,6 @@ # Test Scheme support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sc-1.scm" cat <<EOF > xg-sc-1.scm ; This comment will not be extracted. (display (_ "help")) @@ -17,15 +13,11 @@ cat <<EOF > xg-sc-1.scm (display (_ "The Fabulous Four")) EOF -tmpfiles="$tmpfiles xg-sc-1.tmp.po xg-sc-1.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-sc-1.tmp xg-sc-1.scm || exit 1 +LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po || exit 1 -tmpfiles="$tmpfiles xg-sc-1.ok" cat <<EOF > xg-sc-1.ok msgid "help" msgstr "" @@ -42,6 +34,4 @@ EOF ${DIFF} xg-sc-1.ok xg-sc-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-scheme-2 b/gettext-tools/tests/xgettext-scheme-2 index fcc3665..cc7b5bf 100755..100644 --- a/gettext-tools/tests/xgettext-scheme-2 +++ b/gettext-tools/tests/xgettext-scheme-2 @@ -3,20 +3,13 @@ # Test Scheme support: strings outside any function call. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sc-2.scm" cat <<EOF > xg-sc-2.scm (define foo '("bar" "quux")) EOF -tmpfiles="$tmpfiles xg-sc-2.po" : ${XGETTEXT=xgettext} -${XGETTEXT} -k_ --omit-header --no-location --force-po -d xg-sc-2 xg-sc-2.scm -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -k_ --omit-header --no-location --force-po -d xg-sc-2 xg-sc-2.scm || exit 1 -tmpfiles="$tmpfiles xg-sc-2.ok" cat <<EOF > xg-sc-2.ok EOF @@ -24,6 +17,4 @@ EOF ${DIFF} xg-sc-2.ok xg-sc-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-scheme-3 b/gettext-tools/tests/xgettext-scheme-3 index d653d23..96e821f 100755..100644 --- a/gettext-tools/tests/xgettext-scheme-3 +++ b/gettext-tools/tests/xgettext-scheme-3 @@ -3,10 +3,6 @@ # Test Scheme support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sc-3.scm" cat <<\EOF > xg-sc-3.scm ; a (setq string ; b @@ -17,15 +13,11 @@ cat <<\EOF > xg-sc-3.scm )) EOF -tmpfiles="$tmpfiles xg-sc-3.tmp.po xg-sc-3.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-sc-3.tmp xg-sc-3.scm -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-sc-3.tmp xg-sc-3.scm || exit 1 +LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po || exit 1 -tmpfiles="$tmpfiles xg-sc-3.ok" cat <<EOF > xg-sc-3.ok #. a #. b @@ -39,6 +31,4 @@ EOF ${DIFF} xg-sc-3.ok xg-sc-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-sh-1 b/gettext-tools/tests/xgettext-sh-1 index b4e88be..28e2051 100755..100644 --- a/gettext-tools/tests/xgettext-sh-1 +++ b/gettext-tools/tests/xgettext-sh-1 @@ -3,10 +3,6 @@ # Test of Shell support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sh-1.sh" cat <<\EOF > xg-sh-1.sh # Test backslash before normal alphabetic character. @@ -465,16 +461,12 @@ echo "`echo "\`ngettext 'depth_2_11_squote_7_semi \\\\\\\;'\`"`" echo "`echo "\`ngettext 'depth_2_11_squote_8_semi \\\\\\\\;'\`"`" EOF -tmpfiles="$tmpfiles xg-sh-1.tmp.po xg-sh-1.po" : ${XGETTEXT=xgettext} # Here we use ngettext with two signatures: ngettext:1 and ngettext:1,2. ${XGETTEXT} --omit-header --no-location --keyword=ngettext:1 \ - -d xg-sh-1.tmp xg-sh-1.sh -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-sh-1.tmp xg-sh-1.sh || exit 1 +LC_ALL=C tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po || exit 1 -tmpfiles="$tmpfiles xg-sh-1.ok" cat <<\EOF > xg-sh-1.ok msgid "depth_0_none_0_x" msgstr "" @@ -1811,6 +1803,4 @@ EOF ${DIFF} xg-sh-1.ok xg-sh-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-sh-2 b/gettext-tools/tests/xgettext-sh-2 index 1965d7e..daf1c02 100755..100644 --- a/gettext-tools/tests/xgettext-sh-2 +++ b/gettext-tools/tests/xgettext-sh-2 @@ -3,10 +3,6 @@ # Test Shell support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sh-2.sh" cat <<EOF > xg-sh-2.sh # This comment will not be extracted. gettext "help" @@ -19,15 +15,11 @@ gettext "Hey Jude" gettext "The Fabulous Four" EOF -tmpfiles="$tmpfiles xg-sh-2.tmp.po xg-sh-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-sh-2.tmp xg-sh-2.sh -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-sh-2.tmp xg-sh-2.sh || exit 1 +LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po || exit 1 -tmpfiles="$tmpfiles xg-sh-2.ok" cat <<EOF > xg-sh-2.ok msgid "help" msgstr "" @@ -49,6 +41,4 @@ EOF ${DIFF} xg-sh-2.ok xg-sh-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-sh-3 b/gettext-tools/tests/xgettext-sh-3 index b06589c..a0e9085 100755..100644 --- a/gettext-tools/tests/xgettext-sh-3 +++ b/gettext-tools/tests/xgettext-sh-3 @@ -3,22 +3,14 @@ # Test Shell support: backslashed double-quotes inside single-quotes. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sh-3.sh" cat <<\EOF > xg-sh-3.sh echo `gettext 'abc\"def'` EOF -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; } -LC_ALL=C tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-sh-3.tmp xg-sh-3.sh || exit 1 +LC_ALL=C tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po || exit 1 -tmpfiles="$tmpfiles xg-sh-3.ok" cat <<\EOF > xg-sh-3.ok msgid "abc\\\"def" msgstr "" @@ -28,6 +20,4 @@ EOF ${DIFF} xg-sh-3.ok xg-sh-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-sh-4 b/gettext-tools/tests/xgettext-sh-4 index cc0a9a1..7096d8c 100755..100644 --- a/gettext-tools/tests/xgettext-sh-4 +++ b/gettext-tools/tests/xgettext-sh-4 @@ -3,10 +3,6 @@ # Test of Shell support: obsolete bash $"..." syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sh-4.sh" cat <<\EOF > xg-sh-4.sh # Test backslash before normal alphabetic character. @@ -117,14 +113,11 @@ echo "`echo "\`echo $"depth_2_11_bashquote_7_\\\\\\\$var"\`"`" echo "`echo "\`echo $"depth_2_11_bashquote_8_\\\\\\\\$var"\`"`" EOF -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; } -LC_ALL=C tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-sh-4.err; exit 1; } +LC_ALL=C tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po || exit 1 -tmpfiles="$tmpfiles xg-sh-4.ok" cat <<\EOF > xg-sh-4.ok msgid "depth_0_bashquote_0_x" msgstr "" @@ -474,6 +467,4 @@ EOF ${DIFF} xg-sh-4.ok xg-sh-4.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-sh-5 b/gettext-tools/tests/xgettext-sh-5 index 710ebab..9daf65f 100755..100644 --- a/gettext-tools/tests/xgettext-sh-5 +++ b/gettext-tools/tests/xgettext-sh-5 @@ -3,10 +3,6 @@ # Test of Shell support: bash $(...) syntax. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sh-5.sh" cat <<\EOF > xg-sh-5.sh echo $(gettext 'Simple string') echo "$(gettext 'Simple string inside double-quotes')" @@ -18,14 +14,10 @@ echo $(gettext "Simple decorated dstring: \"x\" \\\"y\\\"") echo "$(gettext "Simple decorated dstring: \"x\" \\\"y\\\" inside double-quotes")" EOF -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; } -LC_ALL=C tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-sh-5.tmp xg-sh-5.sh || exit 1 +LC_ALL=C tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po || exit 1 -tmpfiles="$tmpfiles xg-sh-5.ok" cat <<\EOF > xg-sh-5.ok msgid "Simple string" msgstr "" @@ -56,6 +48,4 @@ EOF ${DIFF} xg-sh-5.ok xg-sh-5.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-sh-6 b/gettext-tools/tests/xgettext-sh-6 index eac4ba1..0bc2eec 100755..100644 --- a/gettext-tools/tests/xgettext-sh-6 +++ b/gettext-tools/tests/xgettext-sh-6 @@ -3,24 +3,16 @@ # Test Shell support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-sh-6.sh" cat <<\EOF > xg-sh-6.sh # a _ "hello world" # b EOF -tmpfiles="$tmpfiles xg-sh-6.tmp.po xg-sh-6.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-sh-6.tmp xg-sh-6.sh -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-sh-6.tmp xg-sh-6.sh || exit 1 +LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po || exit 1 -tmpfiles="$tmpfiles xg-sh-6.ok" cat <<EOF > xg-sh-6.ok #. a msgid "hello world" @@ -31,6 +23,4 @@ EOF ${DIFF} xg-sh-6.ok xg-sh-6.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-smalltalk-1 b/gettext-tools/tests/xgettext-smalltalk-1 index 2fd04a1..7c50834 100755..100644 --- a/gettext-tools/tests/xgettext-smalltalk-1 +++ b/gettext-tools/tests/xgettext-smalltalk-1 @@ -3,10 +3,6 @@ # Test Smalltalk support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-st-1.st" cat <<EOF > xg-st-1.st "This comment will not be extracted." Transcript showCr: (NLS ? 'help'). @@ -20,15 +16,11 @@ Transcript showCr: (NLS ? 'Hey Jude'). Transcript showCr: (NLS ? 'The Fabulous Four'). EOF -tmpfiles="$tmpfiles xg-st-1.tmp.po xg-st-1.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-st-1.tmp xg-st-1.st -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-st-1.tmp xg-st-1.st || exit 1 +LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po || exit 1 -tmpfiles="$tmpfiles xg-st-1.ok" cat <<EOF > xg-st-1.ok msgid "help" msgstr "" @@ -51,6 +43,4 @@ EOF ${DIFF} xg-st-1.ok xg-st-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-smalltalk-2 b/gettext-tools/tests/xgettext-smalltalk-2 index 149bd17..9814efa 100755..100644 --- a/gettext-tools/tests/xgettext-smalltalk-2 +++ b/gettext-tools/tests/xgettext-smalltalk-2 @@ -3,10 +3,6 @@ # Test Smalltalk support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-st-2.st" cat <<\EOF > xg-st-2.st "a" "b" Transcript showCr: @@ -16,15 +12,11 @@ cat <<\EOF > xg-st-2.st "f" 'hello world' "h" ). EOF -tmpfiles="$tmpfiles xg-st-2.tmp.po xg-st-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location \ - -d xg-st-2.tmp xg-st-2.st -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-st-2.tmp xg-st-2.st || exit 1 +LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po || exit 1 -tmpfiles="$tmpfiles xg-st-2.ok" cat <<EOF > xg-st-2.ok #. a #. b @@ -40,6 +32,4 @@ EOF ${DIFF} xg-st-2.ok xg-st-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1 index b352533..4fd08fa 100755..100644 --- a/gettext-tools/tests/xgettext-stringtable-1 +++ b/gettext-tools/tests/xgettext-stringtable-1 @@ -3,10 +3,6 @@ # Test extractor of NeXTstep/GNUstep .strings files. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-stbl-1.strings" cat <<\EOF > xg-stbl-1.strings /*** German.lproj/Localizable.strings @@ -24,15 +20,12 @@ add comments above this one = "Dieses Programm luft mit der Prozess-Nummer %d."; EOF -tmpfiles="$tmpfiles xg-stbl-1.tmp xg-stbl-1.po" : ${XGETTEXT=xgettext} -${XGETTEXT} -o xg-stbl-1.tmp xg-stbl-1.strings -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} -o xg-stbl-1.tmp xg-stbl-1.strings || exit 1 # Don't simplify this to "grep ... < xg-stbl-1.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-stbl-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-stbl-1.po -tmpfiles="$tmpfiles xg-stbl-1.ok" cat <<\EOF > xg-stbl-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -71,6 +64,4 @@ EOF ${DIFF} xg-stbl-1.ok xg-stbl-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-tcl-1 b/gettext-tools/tests/xgettext-tcl-1 index a8331b2..645e19a 100755..100644 --- a/gettext-tools/tests/xgettext-tcl-1 +++ b/gettext-tools/tests/xgettext-tcl-1 @@ -3,10 +3,6 @@ # Test of Tcl support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-t-1.tcl" cat <<\EOF > xg-t-1.tcl #!/usr/bin/tclsh @@ -25,15 +21,13 @@ proc isValid {target} { } EOF -tmpfiles="$tmpfiles xg-t-1.err xg-t-1.tmp xg-t-1.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --no-location -k_ -o xg-t-1.tmp xg-t-1.tcl 2>xg-t-1.err -test $? = 0 || { cat xg-t-1.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-t-1.err; 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' | LC_ALL=C tr -d '\r' > xg-t-1.pot -tmpfiles="$tmpfiles xg-t-1.ok" cat <<\EOF > xg-t-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -68,6 +62,4 @@ EOF ${DIFF} xg-t-1.ok xg-t-1.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-tcl-2 b/gettext-tools/tests/xgettext-tcl-2 index 962cd98..c087686 100755..100644 --- a/gettext-tools/tests/xgettext-tcl-2 +++ b/gettext-tools/tests/xgettext-tcl-2 @@ -3,10 +3,6 @@ # Test Tcl support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-t-2.tcl" cat <<EOF > xg-t-2.tcl # This comment will not be extracted. puts [_ "help"] @@ -19,15 +15,11 @@ puts [_ "Hey Jude"] puts [_ "The Fabulous Four"] EOF -tmpfiles="$tmpfiles xg-t-2.tmp.po xg-t-2.po" : ${XGETTEXT=xgettext} ${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; } -LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-t-2.tmp xg-t-2.tcl || exit 1 +LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po || exit 1 -tmpfiles="$tmpfiles xg-t-2.ok" cat <<EOF > xg-t-2.ok msgid "help" msgstr "" @@ -49,6 +41,4 @@ EOF ${DIFF} xg-t-2.ok xg-t-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-tcl-3 b/gettext-tools/tests/xgettext-tcl-3 index 0f6ac08..2593e6a 100755..100644 --- a/gettext-tools/tests/xgettext-tcl-3 +++ b/gettext-tools/tests/xgettext-tcl-3 @@ -3,25 +3,17 @@ # Test Tcl support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-t-3.tcl" cat <<\EOF > xg-t-3.tcl # a set string [_ "hello world" # b ] # c EOF -tmpfiles="$tmpfiles xg-t-3.tmp.po xg-t-3.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-t-3.tmp xg-t-3.tcl -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-t-3.tmp xg-t-3.tcl || exit 1 +LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po || exit 1 -tmpfiles="$tmpfiles xg-t-3.ok" cat <<EOF > xg-t-3.ok #. a msgid "hello world" @@ -32,6 +24,4 @@ EOF ${DIFF} xg-t-3.ok xg-t-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-tcl-4 b/gettext-tools/tests/xgettext-tcl-4 index 31dd8e1..336f477 100644 --- a/gettext-tools/tests/xgettext-tcl-4 +++ b/gettext-tools/tests/xgettext-tcl-4 @@ -3,25 +3,19 @@ # Test of Tcl support: escape sequences. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-t-4.tcl" cat <<\EOF > xg-t-4.tcl puts [_ "Hello\u200e\u201cWorld\u201d"] puts [_ "x\u20y\x20z"] puts [_ "\xFF20"] EOF -tmpfiles="$tmpfiles xg-t-4.err xg-t-4.tmp xg-t-4.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --no-location -k_ -o xg-t-4.tmp xg-t-4.tcl 2>xg-t-4.err -test $? = 0 || { cat xg-t-4.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-t-4.err; exit 1; } # Don't simplify this to "grep ... < xg-t-4.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-t-4.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-t-4.pot -tmpfiles="$tmpfiles xg-t-4.ok" cat <<\EOF > xg-t-4.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -55,6 +49,4 @@ EOF ${DIFF} xg-t-4.ok xg-t-4.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-vala-1 b/gettext-tools/tests/xgettext-vala-1 index 287d59a..ebc769a 100644 --- a/gettext-tools/tests/xgettext-vala-1 +++ b/gettext-tools/tests/xgettext-vala-1 @@ -3,10 +3,6 @@ # Test of Vala support. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-vala-1.vala" cat <<\EOF > xg-vala-1.vala int main (string[] args) { var s1 = "Simple string, no gettext needed"; @@ -24,15 +20,13 @@ int main (string[] args) { } EOF -tmpfiles="$tmpfiles xg-vala-1.err xg-vala-1.tmp xg-vala-1.pot" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --no-location -o xg-vala-1.tmp xg-vala-1.vala 2>xg-vala-1.err -test $? = 0 || { cat xg-vala-1.err; rm -fr $tmpfiles; exit 1; } +test $? = 0 || { cat xg-vala-1.err; exit 1; } # Don't simplify this to "grep ... < xg-vala-1.tmp", otherwise OpenBSD 4.0 grep # only outputs "Binary file (standard input) matches". cat xg-vala-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot -tmpfiles="$tmpfiles xg-vala-1.ok" cat <<\EOF > xg-vala-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -72,6 +66,4 @@ EOF ${DIFF} xg-vala-1.ok xg-vala-1.pot result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-ycp-1 b/gettext-tools/tests/xgettext-ycp-1 index bb00e2e..b6d4348 100755..100644 --- a/gettext-tools/tests/xgettext-ycp-1 +++ b/gettext-tools/tests/xgettext-ycp-1 @@ -4,22 +4,14 @@ # Plural test for YCP # -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-y-1.ycp" cat <<EOF > xg-y-1.ycp title = sformat (_("%1 package", "%1 packages", num), num); EOF -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; } -LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1.tmp xg-y-1.ycp || exit 1 +LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po || exit 1 -tmpfiles="$tmpfiles xg-y-1.ok" cat <<EOF > xg-y-1.ok #, ycp-format msgid "%1 package" @@ -32,6 +24,4 @@ EOF ${DIFF} xg-y-1.ok xg-y-1.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-ycp-2 b/gettext-tools/tests/xgettext-ycp-2 index 3c85556..b5ea282 100755..100644 --- a/gettext-tools/tests/xgettext-ycp-2 +++ b/gettext-tools/tests/xgettext-ycp-2 @@ -3,10 +3,6 @@ # Test YCP support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-y-2.ycp" cat <<EOF > xg-y-2.ycp // This comment will not be extracted. print (_("help")); @@ -22,15 +18,11 @@ print (_("Hey Jude")); print (_("The Fabulous Four")); EOF -tmpfiles="$tmpfiles xg-y-2.tmp.po xg-y-2.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ - -d xg-y-2.tmp xg-y-2.ycp -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-y-2.tmp xg-y-2.ycp || exit 1 +LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po || exit 1 -tmpfiles="$tmpfiles xg-y-2.ok" cat <<EOF > xg-y-2.ok msgid "help" msgstr "" @@ -57,6 +49,4 @@ EOF ${DIFF} xg-y-2.ok xg-y-2.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-ycp-3 b/gettext-tools/tests/xgettext-ycp-3 index 7c3716c..6325db6 100755..100644 --- a/gettext-tools/tests/xgettext-ycp-3 +++ b/gettext-tools/tests/xgettext-ycp-3 @@ -3,10 +3,6 @@ # Test YCP support: string literal concatenation. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-y-3.ycp" cat <<\EOF > xg-y-3.ycp print (_("John\n" "Paul\n" @@ -14,14 +10,10 @@ print (_("John\n" "Ringo")); EOF -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; } -LC_ALL=C tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } +${XGETTEXT} --omit-header --no-location -d xg-y-3.tmp xg-y-3.ycp || exit 1 +LC_ALL=C tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po || exit 1 -tmpfiles="$tmpfiles xg-y-3.ok" cat <<\EOF > xg-y-3.ok msgid "" "John\n" @@ -34,6 +26,4 @@ EOF ${DIFF} xg-y-3.ok xg-y-3.po result=$? -rm -fr $tmpfiles - exit $result diff --git a/gettext-tools/tests/xgettext-ycp-4 b/gettext-tools/tests/xgettext-ycp-4 index 75728e9..6a958ee 100755..100644 --- a/gettext-tools/tests/xgettext-ycp-4 +++ b/gettext-tools/tests/xgettext-ycp-4 @@ -3,10 +3,6 @@ # Test YCP support: --add-comments option. -tmpfiles="" -trap 'rm -fr $tmpfiles' 1 2 3 15 - -tmpfiles="$tmpfiles xg-y-4.ycp" cat <<\EOF > xg-y-4.ycp /* a */ /* b */ string = /* c */ @@ -14,15 +10,11 @@ cat <<\EOF > xg-y-4.ycp /* e */ _( /* f */ "hello " /* g */ "world" /* h */ ); EOF -tmpfiles="$tmpfiles xg-y-4.tmp.po xg-y-4.po" : ${XGETTEXT=xgettext} ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ - -d xg-y-4.tmp xg-y-4.ycp -test $? = 0 || { rm -fr $tmpfiles; exit 1; } -LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po -test $? = 0 || { rm -fr $tmpfiles; exit 1; } + -d xg-y-4.tmp xg-y-4.ycp || exit 1 +LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po || exit 1 -tmpfiles="$tmpfiles xg-y-4.ok" cat <<EOF > xg-y-4.ok #. a #. b @@ -38,6 +30,4 @@ EOF ${DIFF} xg-y-4.ok xg-y-4.po result=$? -rm -fr $tmpfiles - exit $result |