Imported Upstream version 0.19.7

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

diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2
index 36c0c3b..7b3fb0f 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-2
+++ b/gettext-tools/tests/xgettext-glade-2
@@ -1,26 +1,21 @@
 #!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of Glade support, in particular ISO-8859-1 to UTF-8 conversion
 # and ASCII entities (< > ").
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="$tmpfiles xg-gl-2-empty.glade"
 cat <<EOF > xg-gl-2-empty.glade
 <?xml version="1.0"?>
 <GTK-Interface/>
 EOF
 
-tmpfiles="$tmpfiles xg-gl-2.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o xg-gl-2.pot xg-gl-2-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  rm -fr $tmpfiles; exit 77
+  exit 77
 }
 
-tmpfiles="$tmpfiles xg-gl-2-simple.glade"
 cat <<\EOF > xg-gl-2-simple.glade
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <GTK-Interface>
@@ -59,15 +54,12 @@ cat <<\EOF > xg-gl-2-simple.glade
 </GTK-Interface>
 EOF
 
-tmpfiles="$tmpfiles xg-gl-2.tmp xg-gl-2.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade 
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade  || exit 1
 # Don't simplify this to "grep ... < xg-gl-2.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-2.tmp | grep -v 'POT-Creation-Date' > xg-gl-2.pot
 
-tmpfiles="$tmpfiles xg-gl-2.ok"
 cat <<\EOF > xg-gl-2.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -105,6 +97,4 @@ EOF
 ${DIFF} xg-gl-2.ok xg-gl-2.pot
 result=$?
 
-rm -fr $tmpfiles
-
 exit $result