Imported Upstream version 0.19.7

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

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