diff options
Diffstat (limited to 'gettext-tools/tests/msgmerge-17')
| -rw-r--r--[-rwxr-xr-x] | gettext-tools/tests/msgmerge-17 | 15 |
1 files changed, 2 insertions, 13 deletions
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 |