Imported Upstream version 0.19.7

[platform/upstream/gettext.git] / gettext-tools / tests / xgettext-7

diff --git a/gettext-tools/tests/xgettext-7 b/gettext-tools/tests/xgettext-7
index 3eddc1b..22e882b 100755 (executable)
--- a/gettext-tools/tests/xgettext-7
+++ b/gettext-tools/tests/xgettext-7
@@ -1,11 +1,8 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of comment extraction in the case of duplicated msgids.
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="$tmpfiles xg-test7.c"
 cat <<\EOF > xg-test7.c
 /* first comment */
 /* xgettext: c-format */
@@ -20,14 +17,10 @@ gettext ("abc");
 gettext ("abc");
 EOF
 
-tmpfiles="$tmpfiles xg-test7.tmp.po xg-test7.po"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c || exit 1
+LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po || exit 1
 
-tmpfiles="$tmpfiles xg-test7.ok"
 cat <<\EOF > xg-test7.ok
 #. first comment
 #. second comment
@@ -41,6 +34,4 @@ EOF
 ${DIFF} xg-test7.ok xg-test7.po
 result=$?
 
-rm -fr $tmpfiles
-
 exit $result