Imported Upstream version 0.19.7

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

diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4
index b336766..f77f8ee 100755 (executable)
--- a/gettext-tools/tests/xgettext-java-4
+++ b/gettext-tools/tests/xgettext-java-4
@@ -1,12 +1,9 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 #
 # Some tests for java plural keyword support
 #
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="$tmpfiles xg-j-4.java"
 cat <<EOF > xg-j-4.java
 class TestCase {
     public TestCase() {
@@ -16,15 +13,11 @@ class TestCase {
 }
 EOF
 
-tmpfiles="$tmpfiles xg-j-4.tmp.po xg-j-4.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 \
-  -d xg-j-4.tmp xg-j-4.java
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+  -d xg-j-4.tmp xg-j-4.java || exit 1
+LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po || exit 1
 
-tmpfiles="$tmpfiles xg-j-4.ok"
 cat <<EOF > xg-j-4.ok
 msgid "test 1"
 msgid_plural "plural test"
@@ -36,6 +29,4 @@ EOF
 ${DIFF} xg-j-4.ok xg-j-4.po
 result=$?
 
-rm -fr $tmpfiles
-
 exit $result