Imported Upstream version 0.19.7

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

diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2
index 94d61e9..fcdb078 100755 (executable)
--- a/gettext-tools/tests/msgexec-2
+++ b/gettext-tools/tests/msgexec-2
@@ -1,10 +1,8 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the builtin command "0".
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
 # Find a 'tr' program that supports NUL bytes in the input.
 # Solaris /usr/bin/tr does not.
 if test -f /usr/xpg6/bin/tr; then
@@ -17,7 +15,6 @@ else
   fi
 fi
 
-tmpfiles="$tmpfiles mex-test2.po"
 cat <<\EOF > mex-test2.po
 # HEADER.
 #
@@ -69,20 +66,16 @@ msgstr ""
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
-tmpfiles="$tmpfiles mex-test2.tmp mex-test2.out mex-test2.err"
 : ${MSGEXEC=msgexec}
 LC_ALL=C \
 ${MSGEXEC} -i mex-test2.po 0 > mex-test2.tmp 2> mex-test2.err
 result=$?
 cat mex-test2.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+test $result = 0 || { exit 1; }
+LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out || exit 1
 
 : ${CMP=cmp}
-${CMP} ${top_srcdir}/tests/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
+${CMP} "$abs_srcdir"/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
 result=$?
 
-rm -fr $tmpfiles
-
 exit $result