Imported Upstream version 0.19.7

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

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