Imported Upstream version 0.19.7

[platform/upstream/gettext.git] / gettext-tools / tests / msgmerge-compendium-1

diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1
index c8f3dbb..449a1b8 100755 (executable)
--- a/gettext-tools/tests/msgmerge-compendium-1
+++ b/gettext-tools/tests/msgmerge-compendium-1
@@ -1,11 +1,8 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # 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"
@@ -28,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"
@@ -50,6 +43,4 @@ EOF
 ${DIFF} mm-c-1.ok mm-c-1.out
 result=$?
 
-rm -fr $tmpfiles
-
 exit $result