Imported Upstream version 0.19.7

[platform/upstream/gettext.git] / gettext-tools / tests / msgmerge-update-2

diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2
index 6f4d4a0..4f651ca 100755 (executable)
--- a/gettext-tools/tests/msgmerge-update-2
+++ b/gettext-tools/tests/msgmerge-update-2
@@ -1,12 +1,9 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # 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.
@@ -29,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.
@@ -52,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.
@@ -88,6 +80,4 @@ EOF
 ${DIFF} mm-u-2.ok mm-u-2.po
 result=$?
 
-rm -fr $tmpfiles
-
 exit $result