Imported Upstream version 0.19.7

[platform/upstream/gettext.git] / gettext-tools / tests / msgcomm-21

diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21
index 2be54e3..9d3adc2 100755 (executable)
--- a/gettext-tools/tests/msgcomm-21
+++ b/gettext-tools/tests/msgcomm-21
@@ -1,12 +1,9 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test --more-than=0; identical message are wanted once only.
 # If both occurrences are fuzzy, keep the fuzzy mark.
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="$tmpfiles mcomm-test21.in1 mcomm-test21.in2"
 cat <<EOF > mcomm-test21.in1
 # Not sure.
 #: first.c:123
@@ -23,14 +20,10 @@ msgid "1"
 msgstr "1x"
 EOF
 
-tmpfiles="$tmpfiles mcomm-test21.tmp mcomm-test21.out"
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2 || exit 1
+LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out || exit 1
 
-tmpfiles="$tmpfiles mcomm-test21.ok"
 cat << EOF > mcomm-test21.ok
 # Not sure.
 #: first.c:123 hunt.c:759
@@ -43,6 +36,4 @@ EOF
 ${DIFF} mcomm-test21.ok mcomm-test21.out
 result=$?
 
-rm -fr $tmpfiles
-
 exit $result