Imported Upstream version 0.19.7

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

diff --git a/gettext-tools/tests/msgen-2 b/gettext-tools/tests/msgen-2
index 12525d2..170ebd7 100755 (executable)
--- a/gettext-tools/tests/msgen-2
+++ b/gettext-tools/tests/msgen-2
@@ -1,11 +1,8 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test general operation with Java .properties syntax.
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="$tmpfiles men-test2.properties"
 cat <<\EOF > men-test2.properties
 !height\ must\ be\ positive=
 
@@ -14,14 +11,10 @@ color\ cannot\ be\ transparent=colour cannot be transparent
 width\ must\ be\ positive=
 EOF
 
-tmpfiles="$tmpfiles men-test2.tmp men-test2.out"
 : ${MSGEN=msgen}
-${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties || exit 1
+LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out || exit 1
 
-tmpfiles="$tmpfiles men-test2.ok"
 cat <<\EOF > men-test2.ok
 height\ must\ be\ positive=height must be positive
 
@@ -34,6 +27,4 @@ EOF
 ${DIFF} men-test2.ok men-test2.out
 result=$?
 
-rm -fr $tmpfiles
-
 exit $result