Unify tmpfiles handling.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index d0025240e05844cb17b53446482eb6abe9623c9c..c103ce1df668d53e8e7909fc03101ea19b9599d6 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-18  Bruno Haible  <bruno@clisp.org>
+
+       * gettext-[12], msgcat-[1-7], msgcmp-[12], msgcomm-[1-9],
+       msgcomm-1[0-9], msgcomm-2[0-2], msgfmt-[1-9], msgfmt-10,
+       msgmerge-[1-9], msgmerge-1[0-3], msgunfmt-1, xgettext-[1-4]:
+       Unify tmpfiles handling.
+
 2001-12-17  Bruno Haible  <bruno@clisp.org>
 
        * lang-objc: If the locale couldn't be set, skip the test.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 33a64ca23b242f4a9a614c214b20962e6f868921..eb182139a7682f7feb22a8d62c721907fcbd66a0 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -103,6 +103,7 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 LEX = @LEX@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 LIBTOOL = @LIBTOOL@
@@ -133,18 +134,26 @@ lispdir = @lispdir@
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
 TESTS = gettext-1 gettext-2 \
+       msgattrib-1 msgattrib-2 msgattrib-3 msgattrib-4 msgattrib-5 \
+       msgattrib-6 msgattrib-7 msgattrib-8 msgattrib-9 msgattrib-10 \
+       msgattrib-11 msgattrib-12 msgattrib-13 msgattrib-14 \
        msgcat-1 msgcat-2 msgcat-3 msgcat-4 msgcat-5 msgcat-6 msgcat-7 \
        msgcmp-1 msgcmp-2 \
        msgcomm-1 msgcomm-2 msgcomm-3 msgcomm-4 msgcomm-5 msgcomm-6 msgcomm-7 \
        msgcomm-8 msgcomm-9 msgcomm-10 msgcomm-11 msgcomm-12 msgcomm-13 \
        msgcomm-14 msgcomm-15 msgcomm-16 msgcomm-17 msgcomm-18 msgcomm-19 \
        msgcomm-20 msgcomm-21 msgcomm-22 msgcomm-23 \
+       msgconv-1 msgconv-2 \
+       msgen-1 \
+       msgexec-1 msgexec-2 \
+       msgfilter-1 msgfilter-2 \
        msgfmt-1 msgfmt-2 msgfmt-3 msgfmt-4 msgfmt-5 msgfmt-6 msgfmt-7 \
-       msgfmt-8 msgfmt-9 \
+       msgfmt-8 msgfmt-9 msgfmt-10 \
+       msggrep-1 msggrep-2 msggrep-3 msggrep-4 \
        msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \
        msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \
        msgmerge-13 msgmerge-14 msgmerge-15 msgmerge-16 msgmerge-17 \
-       msgmerge-18 msgmerge-19 \
+       msgmerge-18 msgmerge-19 msgmerge-20 \
        msgunfmt-1 \
        msguniq-1 msguniq-2 msguniq-3 \
        xgettext-1 xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 \
@@ -152,29 +161,36 @@ TESTS = gettext-1 gettext-2 \
        xgettext-13 xgettext-14 xgettext-15 xgettext-16 xgettext-17 \
        format-c-1 format-c-2 \
        format-java-1 format-java-2 \
+       format-librep-1 format-librep-2 \
        format-lisp-1 format-lisp-2 \
        format-python-1 format-python-2 \
        format-pascal-1 format-pascal-2 \
        format-ycp-1 format-ycp-2 \
        plural-1 plural-2 \
-       lang-c lang-c++ lang-objc lang-java lang-pascal lang-ycp lang-po lang-rst
+       lang-c lang-c++ lang-objc lang-clisp lang-librep lang-java lang-pascal lang-ycp lang-po lang-rst
 
 
-EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po msguniq-a.in msguniq-a.out
+EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po mex-test2.ok msguniq-a.in msguniq-a.out
 
 XGETTEXT = ../src/xgettext
 
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH \
                    GETTEXT=tstgettext \
                    NGETTEXT=tstngettext \
-                   XGETTEXT=`echo xgettext|sed '$(transform)'` \
-                   MSGCAT=`echo msgcat|sed '$(transform)'` \
-                   MSGCMP=`echo msgcmp|sed '$(transform)'` \
-                   MSGFMT=`echo msgfmt|sed '$(transform)'` \
-                   MSGMERGE=`echo msgmerge|sed '$(transform)'` \
-                   MSGUNFMT=`echo msgunfmt|sed '$(transform)'` \
-                   MSGCAT=`echo msgcat|sed '$(transform)'` \
-                   MSGUNIQ=`echo msguniq|sed '$(transform)'` \
+                   XGETTEXT=xgettext \
+                   MSGATTRIB=msgattrib \
+                   MSGCAT=msgcat \
+                   MSGCMP=msgcmp \
+                   MSGCOMM=msgcomm \
+                   MSGCONV=msgconv \
+                   MSGEN=msgen \
+                   MSGEXEC=msgexec \
+                   MSGFILTER=msgfilter \
+                   MSGFMT=msgfmt \
+                   MSGGREP=msggrep \
+                   MSGMERGE=msgmerge \
+                   MSGUNFMT=msgunfmt \
+                   MSGUNIQ=msguniq \
                    OBJEXT='@OBJEXT@' EXEEXT='@EXEEXT@' \
                    LIBTOOL='@LIBTOOL@' \
                    CC='@CC@' CFLAGS='@CFLAGS@' \

diff --git a/tests/gettext-1 b/tests/gettext-1
index 2e46823b8310d9972f45294ad7a5156aad13d789..604ab64bc81ec6c20bf73021655a8675232fa592 100755 (executable)
--- a/tests/gettext-1
+++ b/tests/gettext-1
@@ -13,7 +13,7 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Create binary test file in correct position.
-tmpfiles="LC_MESSAGES"
+tmpfiles="$tmpfiles LC_MESSAGES"
 test -d LC_MESSAGES || mkdir LC_MESSAGES
 cp $top_srcdir/tests/test.mo LC_MESSAGES
 

diff --git a/tests/gettext-2 b/tests/gettext-2
index 121d27d208280c0e11f2740316480ab128895e25..548237a61d9cdfb597f8a965d751373efede92f5 100755 (executable)
--- a/tests/gettext-2
+++ b/tests/gettext-2
@@ -25,7 +25,7 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Create binary test file in correct position.
-tmpfiles="LC_MESSAGES"
+tmpfiles="$tmpfiles LC_MESSAGES"
 test -d LC_MESSAGES || mkdir LC_MESSAGES
 cp $top_srcdir/tests/test.mo LC_MESSAGES
 

diff --git a/tests/msgcat-1 b/tests/msgcat-1
index eaa85ca5c5fc853b848b3830e1ac660618480223..dc5d82b0449463256a7cc9951d3b185733825468 100755 (executable)
--- a/tests/msgcat-1
+++ b/tests/msgcat-1
@@ -6,7 +6,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcat-test1.in1 mcat-test1.in2"
+tmpfiles="$tmpfiles mcat-test1.in1 mcat-test1.in2"
 cat <<EOF > mcat-test1.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcat-2 b/tests/msgcat-2
index 7b215748dc25b57ccf0d34726a29acf1b95ba80d..0706d326ecaf1eba2271a2f27412f95bb22ab997 100755 (executable)
--- a/tests/msgcat-2
+++ b/tests/msgcat-2
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # input files with different charsets.
 
-tmpfiles="mcat-test2.in1 mcat-test2.in2"
+tmpfiles="$tmpfiles mcat-test2.in1 mcat-test2.in2"
 cat <<EOF > mcat-test2.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.

diff --git a/tests/msgcat-3 b/tests/msgcat-3
index 33dbd8bc08e7b4acc379fbc3f1f0936d85ae5cb5..be826d38b1644b0106377323aac936a5436cfff1 100755 (executable)
--- a/tests/msgcat-3
+++ b/tests/msgcat-3
@@ -6,7 +6,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # input files with different charsets.
 # 1. ISO-8859-1, 2. UTF-8; plus --use-first
 
-tmpfiles="mcat-test3.in1 mcat-test3.in2"
+tmpfiles="$tmpfiles mcat-test3.in1 mcat-test3.in2"
 cat <<EOF > mcat-test3.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.

diff --git a/tests/msgcat-4 b/tests/msgcat-4
index 18713d473b49d9c3fd842831b9d518ddfd828e6d..bac351f793abea81567edb820310b59afda3b4a5 100755 (executable)
--- a/tests/msgcat-4
+++ b/tests/msgcat-4
@@ -6,7 +6,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # input files with different charsets:
 # 1. UTF-8, 2. ISO-8859-1; plus --use-first
 
-tmpfiles="mcat-test4.in1 mcat-test4.in2"
+tmpfiles="$tmpfiles mcat-test4.in1 mcat-test4.in2"
 cat <<EOF > mcat-test4.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.

diff --git a/tests/msgcat-5 b/tests/msgcat-5
index 1b935615cab1eab91c2894d5889572217e636c18..d602bcb8af2baa9f6e7b7eae05b779ebce742bca 100755 (executable)
--- a/tests/msgcat-5
+++ b/tests/msgcat-5
@@ -6,7 +6,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # input files with different translations:
 # try --use-first
 
-tmpfiles="mcat-test5.in1 mcat-test5.in2"
+tmpfiles="$tmpfiles mcat-test5.in1 mcat-test5.in2"
 cat <<EOF > mcat-test5.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.

diff --git a/tests/msgcat-6 b/tests/msgcat-6
index f51aad6b9265a706993e57f192bbc7d6c4462a95..ac45456f4c7fbde371c1a90c14482bfb01f22c48 100755 (executable)
--- a/tests/msgcat-6
+++ b/tests/msgcat-6
@@ -6,7 +6,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # input files with different translations:
 # preserve all variants, add markers
 
-tmpfiles="mcat-test6.in1 mcat-test6.in2"
+tmpfiles="$tmpfiles mcat-test6.in1 mcat-test6.in2"
 cat <<EOF > mcat-test6.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.

diff --git a/tests/msgcat-7 b/tests/msgcat-7
index 0d57634005fb3faae8e175926a7218927a7960a6..0365aab5b28531d43177974a31444b9dc8eed0fd 100755 (executable)
--- a/tests/msgcat-7
+++ b/tests/msgcat-7
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcat-test7.in1"
+tmpfiles="$tmpfiles mcat-test7.in1"
 cat <<EOF > mcat-test7.in1
 #: clients/inst_language.ycp:119
 msgid "two"

diff --git a/tests/msgcmp-1 b/tests/msgcmp-1
index e81bb7b270d726325a2a28ce89f8ed2a7ce8bb99..08168b1bb4ebc79dcf7b18682c7d8b329306dd04 100755 (executable)
--- a/tests/msgcmp-1
+++ b/tests/msgcmp-1
@@ -2,7 +2,10 @@
 # One argument is required which is the path to the toplevel directory
 # of the distribution.
 
-tmpfiles="mc-test1.in1 mc-test1.in2"
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles mc-test1.in1 mc-test1.in2"
 cat <<EOF > mc-test1.in1
 msgid "one" msgstr "first"
 msgid "two" msgstr "second"

diff --git a/tests/msgcmp-2 b/tests/msgcmp-2
index fe934e7828c910e080e87e990bd6645e13479863..096f75a111c7b7dff0f4ea02a15f1ff9023891cd 100755 (executable)
--- a/tests/msgcmp-2
+++ b/tests/msgcmp-2
@@ -2,13 +2,16 @@
 # One argument is required which is the path to the toplevel directory
 # of the distribution.
 
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
 LANGUAGE=
 LC_ALL=
 LC_MESSAGES=
 LANG=
 export LANGUAGE LC_ALL LC_MESSAGES LANG
 
-tmpfiles="mc-test2.in1 mc-test2.in2"
+tmpfiles="$tmpfiles mc-test2.in1 mc-test2.in2"
 cat <<EOF > mc-test2.in1
 msgid "one" msgstr "first"
 msgid "two" msgstr "second"

diff --git a/tests/msgcomm-1 b/tests/msgcomm-1
index 542ebb4117688a3f1cc0c2b1a10874ed77ef8113..6c6b8d535444dcafd68246ca7842ce43b63e6fef 100755 (executable)
--- a/tests/msgcomm-1
+++ b/tests/msgcomm-1
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test1.in1 mcomm-test1.in2"
+tmpfiles="$tmpfiles mcomm-test1.in1 mcomm-test1.in2"
 cat <<EOF > mcomm-test1.in1
 #: first.c:123
 msgid "1"

diff --git a/tests/msgcomm-10 b/tests/msgcomm-10
index 5ba4358106d5a777914acef019df5d6aeab23c8f..f492d604937451a8e6ecdbaf14ef12de4464e6bc 100755 (executable)
--- a/tests/msgcomm-10
+++ b/tests/msgcomm-10
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test10.in1 mcomm-test10.in2"
+tmpfiles="$tmpfiles mcomm-test10.in1 mcomm-test10.in2"
 cat <<EOF > mcomm-test10.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-11 b/tests/msgcomm-11
index cd9c047c7f3f2613645a8281bdaeb660b9f96401..1184f41274309d07ffe0634878926c1f1ceac578 100755 (executable)
--- a/tests/msgcomm-11
+++ b/tests/msgcomm-11
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test11.in1 mcomm-test11.in2"
+tmpfiles="$tmpfiles mcomm-test11.in1 mcomm-test11.in2"
 cat <<EOF > mcomm-test11.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-12 b/tests/msgcomm-12
index 7bf3ba319eaceb1109e6aaad8ffae1ba80f45284..326baaab01ab67a2c385da5a6cecc1b9734939ce 100755 (executable)
--- a/tests/msgcomm-12
+++ b/tests/msgcomm-12
@@ -8,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # unique msg in in3
 
-tmpfiles="mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3"
+tmpfiles="$tmpfiles mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3"
 cat <<EOF > mcomm-test12.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-13 b/tests/msgcomm-13
index 40a9ed4f3035d66ba646f8fdd61656f543cec8c6..311345167687b3c12ba8f0aac2967926ad614cb3 100755 (executable)
--- a/tests/msgcomm-13
+++ b/tests/msgcomm-13
@@ -8,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # one msg occurs 3 times (has to go away).
 # An unique msg in in3 has to stay.
 
-tmpfiles="mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3"
+tmpfiles="$tmpfiles mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3"
 cat <<EOF > mcomm-test13.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-14 b/tests/msgcomm-14
index 1e461312f320d9e7612d27a2430d82c62ea7b3a2..6a487a110438a3ee1dc52fb2ab0903272f0573a8 100755 (executable)
--- a/tests/msgcomm-14
+++ b/tests/msgcomm-14
@@ -8,7 +8,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # no unique msg in input files.
 # without --force-po don't create any PO file; cf. msgcomm-15
 
-tmpfiles="mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3"
+tmpfiles="$tmpfiles mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3"
 cat <<EOF > mcomm-test14.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-15 b/tests/msgcomm-15
index 9ef1cc56aafe524209e3d435be0b28d0907fd2d8..1e4e1380aa5830e252320c9e3ea708d1866983c5 100755 (executable)
--- a/tests/msgcomm-15
+++ b/tests/msgcomm-15
@@ -9,7 +9,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 # no unique msg in input files.
 # with --force-po create an empty PO file; cf. msgcomm-14
 
-tmpfiles="mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3"
+tmpfiles="$tmpfiles mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3"
 cat <<EOF > mcomm-test15.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-16 b/tests/msgcomm-16
index 50e124daa68ea38d2dcd38549fdec2efb1b46831..1b4fcc304a8e06a55d957d39ea1e4c77d46dbf44 100755 (executable)
--- a/tests/msgcomm-16
+++ b/tests/msgcomm-16
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # input files with different charsets.
 
-tmpfiles="mcomm-test16.in1 mcomm-test16.in2"
+tmpfiles="$tmpfiles mcomm-test16.in1 mcomm-test16.in2"
 cat <<EOF > mcomm-test16.in1
 # German message file for xyz.
 # Copyright (C) 1999, 2000, 2001 xyz.

diff --git a/tests/msgcomm-17 b/tests/msgcomm-17
index 2643be63ed9fbc593ffa25f380016a30f735cb60..45d19410f4919bda64de0147f2afa1493312fc59 100755 (executable)
--- a/tests/msgcomm-17
+++ b/tests/msgcomm-17
@@ -7,7 +7,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3"
+tmpfiles="$tmpfiles mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3"
 cat <<EOF > mcomm-test17.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-18 b/tests/msgcomm-18
index aa5382cab6fa7cee704dde23765672961a18ae84..393b2bdc4fe4ba637c7c1ec666c4ee31dc9fe6e5 100755 (executable)
--- a/tests/msgcomm-18
+++ b/tests/msgcomm-18
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test18.in1 mcomm-test18.in2"
+tmpfiles="$tmpfiles mcomm-test18.in1 mcomm-test18.in2"
 cat <<EOF > mcomm-test18.in1
 # Sure.
 #: first.c:123

diff --git a/tests/msgcomm-19 b/tests/msgcomm-19
index 65b7c62cc529d7b13fac9a407645f705f258f437..f3d828aa90b6fdcfa9a00c72adc1e8cf7551b698 100755 (executable)
--- a/tests/msgcomm-19
+++ b/tests/msgcomm-19
@@ -6,7 +6,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test19.in1 mcomm-test19.in2"
+tmpfiles="$tmpfiles mcomm-test19.in1 mcomm-test19.in2"
 cat <<EOF > mcomm-test19.in1
 # Not sure.
 #: first.c:123

diff --git a/tests/msgcomm-2 b/tests/msgcomm-2
index 736480647dd8a21a76bcd4139e7c4dc8f15d2dc7..f1a6b609a84bcaf3b3a591af6f5879cd541fa626 100755 (executable)
--- a/tests/msgcomm-2
+++ b/tests/msgcomm-2
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test2.in1 mcomm-test2.in2"
+tmpfiles="$tmpfiles mcomm-test2.in1 mcomm-test2.in2"
 cat <<EOF > mcomm-test2.in1
 #: first.c:123
 msgid "1"

diff --git a/tests/msgcomm-20 b/tests/msgcomm-20
index 0274190a405bac774223f428806e9cdfc7e07250..0a07e30e1323565359c30436b0ea59d6f344366d 100755 (executable)
--- a/tests/msgcomm-20
+++ b/tests/msgcomm-20
@@ -6,7 +6,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test20.in1 mcomm-test20.in2"
+tmpfiles="$tmpfiles mcomm-test20.in1 mcomm-test20.in2"
 cat <<EOF > mcomm-test20.in1
 # Sure.
 #: first.c:123

diff --git a/tests/msgcomm-21 b/tests/msgcomm-21
index ad855442a1573d01e8d8c14fd7407ee6a1a6b68f..9571e111e25e17be93e8b862e351ce0f1d1eb29e 100755 (executable)
--- a/tests/msgcomm-21
+++ b/tests/msgcomm-21
@@ -6,7 +6,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test21.in1 mcomm-test21.in2"
+tmpfiles="$tmpfiles mcomm-test21.in1 mcomm-test21.in2"
 cat <<EOF > mcomm-test21.in1
 # Not sure.
 #: first.c:123

diff --git a/tests/msgcomm-22 b/tests/msgcomm-22
index f96dcc2c137a85aca79f52ed4db2954c46db9437..17c2aae0c69ec108a0a00efda45bac22b097740d 100755 (executable)
--- a/tests/msgcomm-22
+++ b/tests/msgcomm-22
@@ -5,7 +5,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # keep header file entry, otherwise the encoding is unknown
 
-tmpfiles="mcomm-test22.in1 mcomm-test22.in2"
+tmpfiles="$tmpfiles mcomm-test22.in1 mcomm-test22.in2"
 cat <<EOF > mcomm-test22.in1
 # German translations for GNU gettext package.
 # Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.

diff --git a/tests/msgcomm-3 b/tests/msgcomm-3
index aec22d02121bf4a09bbfe72a36d53f8ae5b87249..e06b48364a7a20854f1a3753d01380744705f30a 100755 (executable)
--- a/tests/msgcomm-3
+++ b/tests/msgcomm-3
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test3.in1 mcomm-test3.in2"
+tmpfiles="$tmpfiles mcomm-test3.in1 mcomm-test3.in2"
 cat <<EOF > mcomm-test3.in1
 #: first.c:123
 msgid "1"

diff --git a/tests/msgcomm-4 b/tests/msgcomm-4
index 47f5f092243ca1be6c7d552f3588d17d531f48bb..49df3244f284e9f162452ef5b110d3d05106b473 100755 (executable)
--- a/tests/msgcomm-4
+++ b/tests/msgcomm-4
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test4.in1 mcomm-test4.in2"
+tmpfiles="$tmpfiles mcomm-test4.in1 mcomm-test4.in2"
 cat <<EOF > mcomm-test4.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-5 b/tests/msgcomm-5
index cdf42d5571c6e39d494bd3b2e09fd14e122ffe69..14f331c7f4f0e2e9bfd98c70f518cb23414c9f64 100755 (executable)
--- a/tests/msgcomm-5
+++ b/tests/msgcomm-5
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test5.in1 mcomm-test5.in2"
+tmpfiles="$tmpfiles mcomm-test5.in1 mcomm-test5.in2"
 cat <<EOF > mcomm-test5.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-6 b/tests/msgcomm-6
index f0208be7f08dc20b482b91750de2eeba934906c9..845128a068cc03f704b0df4e65848d9612a1dfff 100755 (executable)
--- a/tests/msgcomm-6
+++ b/tests/msgcomm-6
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test6.in1 mcomm-test6.in2"
+tmpfiles="$tmpfiles mcomm-test6.in1 mcomm-test6.in2"
 cat <<EOF > mcomm-test6.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-7 b/tests/msgcomm-7
index d4b8bfef0ad103447f9031917ce93e29e785cb7c..9a08f91ed1cc9ac4a0cc41f41ddf43fea54147df 100755 (executable)
--- a/tests/msgcomm-7
+++ b/tests/msgcomm-7
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test7.in1 mcomm-test7.in2"
+tmpfiles="$tmpfiles mcomm-test7.in1 mcomm-test7.in2"
 cat <<EOF > mcomm-test7.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-8 b/tests/msgcomm-8
index cc61e4bf3298f30b4272461659578fde08a9620f..3b71c50f09ca37ba633cb4decda5ee52a9ee3065 100755 (executable)
--- a/tests/msgcomm-8
+++ b/tests/msgcomm-8
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test8.in1 mcomm-test8.in2"
+tmpfiles="$tmpfiles mcomm-test8.in1 mcomm-test8.in2"
 cat <<EOF > mcomm-test8.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgcomm-9 b/tests/msgcomm-9
index f85efb50402e71d46923b2bc2a3406041bd7f931..aa3861b8b428d463cfa594862f7e6a07c0b34722 100755 (executable)
--- a/tests/msgcomm-9
+++ b/tests/msgcomm-9
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mcomm-test9.in1 mcomm-test9.in2"
+tmpfiles="$tmpfiles mcomm-test9.in1 mcomm-test9.in2"
 cat <<EOF > mcomm-test9.in1
 msgid ""
 msgstr ""

diff --git a/tests/msgfmt-1 b/tests/msgfmt-1
index 23242d0aad63fca46db6f256dbcf9c3af15eb478..ef30ccbce73cde9410cbb3f6b0859028bf3d9959 100755 (executable)
--- a/tests/msgfmt-1
+++ b/tests/msgfmt-1
@@ -7,7 +7,10 @@ LC_MESSAGES=
 LANG=
 export TEXTDOMAINDIR LANGUAGE LC_ALL LC_MESSAGES LANG
 
-tmpfiles="LC_MESSAGES"
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles LC_MESSAGES"
 test -d LC_MESSAGES || mkdir LC_MESSAGES
 
 tmpfiles="$tmpfiles module1.po module2.po"

diff --git a/tests/msgfmt-10 b/tests/msgfmt-10
index 2945273f30f211fe5b8c1992d0d2e8655702ae16..5c9c562cedebe0f23f345634cd3df19d8dc7cccd 100755 (executable)
--- a/tests/msgfmt-10
+++ b/tests/msgfmt-10
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mf-test10.po1"
+tmpfiles="$tmpfiles mf-test10.po1"
 cat <<EOF > mf-test10.po1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -41,7 +41,7 @@ EOF
 ${MSGFMT} --check mf-test10.po1 -o /dev/null || \
   { rm -fr $tmpfiles; exit 1; }
 
-tmpfiles="mf-test10.po2"
+tmpfiles="$tmpfiles mf-test10.po2"
 cat <<EOF > mf-test10.po2
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.

diff --git a/tests/msgfmt-2 b/tests/msgfmt-2
index c2d09185fd95fdcf77455cc25c64a2712b36ce6d..e03e034027f1e758c5d22df54300c57c879901e7 100755 (executable)
--- a/tests/msgfmt-2
+++ b/tests/msgfmt-2
@@ -22,7 +22,7 @@ fi
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="LC_MESSAGES"
+tmpfiles="$tmpfiles LC_MESSAGES"
 test -d LC_MESSAGES || mkdir LC_MESSAGES
 
 tmpfiles="$tmpfiles module1.po module2.po"

diff --git a/tests/msgfmt-3 b/tests/msgfmt-3
index 053f9a45e8c0824153c5e834f26ade5615de2bb1..04713de30be1a42d1c04ffac726001237f37e13d 100755 (executable)
--- a/tests/msgfmt-3
+++ b/tests/msgfmt-3
@@ -3,7 +3,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mf-test3.po"
+tmpfiles="$tmpfiles mf-test3.po"
 cat <<EOF >mf-test3.po
 #
 #       xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

diff --git a/tests/msgfmt-4 b/tests/msgfmt-4
index 16987feb0b68a1600ab079eb940e04226e5b65e8..d649b5c84ae6c93a7e594fdd70394d85a9465d3b 100755 (executable)
--- a/tests/msgfmt-4
+++ b/tests/msgfmt-4
@@ -3,7 +3,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mf-test4.po"
+tmpfiles="$tmpfiles mf-test4.po"
 cat <<EOF >mf-test4.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.

diff --git a/tests/msgfmt-5 b/tests/msgfmt-5
index f19dbefa5f41d70aa8d42fc722ed98477879b3d4..646c4e6b24402aee91767a80bc07674cc17cb28f 100755 (executable)
--- a/tests/msgfmt-5
+++ b/tests/msgfmt-5
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="foo.po"
+tmpfiles="$tmpfiles foo.po"
 cat <<EOF > foo.po
 domain "foo-de"
 msgid ""

diff --git a/tests/msgfmt-7 b/tests/msgfmt-7
index 5b281bc027b842e2e1aa8717d6d8119c2d22939e..2bf5190adafae8136d8b5b430f41bbb2db9dd4e4 100755 (executable)
--- a/tests/msgfmt-7
+++ b/tests/msgfmt-7
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mf-test7.in1"
+tmpfiles="$tmpfiles mf-test7.in1"
 cat <<EOF > mf-test7.in1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.

diff --git a/tests/msgfmt-8 b/tests/msgfmt-8
index 23e04ab5a85759dcda16bd1d887635f8cab1481a..7f42023549be7ddb266582bf7d46deab6cdf2fcb 100755 (executable)
--- a/tests/msgfmt-8
+++ b/tests/msgfmt-8
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mf-test8.in1"
+tmpfiles="$tmpfiles mf-test8.in1"
 cat <<EOF > mf-test8.in1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.

diff --git a/tests/msgfmt-9 b/tests/msgfmt-9
index e25ee2bd4233a399b2f3a3225b9b16c43512b899..08419294bccd7a30607b5f93b80c4fde0b17aa15 100755 (executable)
--- a/tests/msgfmt-9
+++ b/tests/msgfmt-9
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mf-test9.in1"
+tmpfiles="$tmpfiles mf-test9.in1"
 cat <<EOF > mf-test9.in1
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.

diff --git a/tests/msgmerge-1 b/tests/msgmerge-1
index c0f2e70ffb25dff13164abe2f25098cdcabc9ada..d88c407002883fb614a543a4b637373f24aafffc 100755 (executable)
--- a/tests/msgmerge-1
+++ b/tests/msgmerge-1
@@ -3,7 +3,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test1.in1 mm-test1.in2"
+tmpfiles="$tmpfiles mm-test1.in1 mm-test1.in2"
 cat <<EOF > mm-test1.in1
 # first
 #. this should be discarded

diff --git a/tests/msgmerge-10 b/tests/msgmerge-10
index 0441cc35a00bc4b71451c50b517b4c6fcd4a61c8..fe7bf6b7b2ea8ca94d54e4abb063ac462bff86d3 100755 (executable)
--- a/tests/msgmerge-10
+++ b/tests/msgmerge-10
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="foo.po"
+tmpfiles="$tmpfiles foo.po"
 cat <<EOF > foo.po
 domain "foo-de"
 msgid ""

diff --git a/tests/msgmerge-11 b/tests/msgmerge-11
index 8c4d2c8f88ef17dce0042541b5e05101a93fe045..20d3f5326997b74061077544cfe22a5511341b21 100755 (executable)
--- a/tests/msgmerge-11
+++ b/tests/msgmerge-11
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="foo.po"
+tmpfiles="$tmpfiles foo.po"
 cat <<EOF > foo.po
 domain "foo-de"
 msgid ""

diff --git a/tests/msgmerge-12 b/tests/msgmerge-12
index 6a981c2e22c968da1f6c9a6411553e8d2b082aea..3ffca40db7eab6b0479f65937b83e2b88227c2aa 100755 (executable)
--- a/tests/msgmerge-12
+++ b/tests/msgmerge-12
@@ -6,7 +6,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test12.com mm-test12.pot"
+tmpfiles="$tmpfiles mm-test12.com mm-test12.pot"
 
 cat <<EOF > mm-test12.com
 msgid ""

diff --git a/tests/msgmerge-13 b/tests/msgmerge-13
index c98e8b49805539f06f3d56ae5505f44ba2a1d5cb..8ec5ba2c31c1b2434ce64e1c23fe043058b59df0 100755 (executable)
--- a/tests/msgmerge-13
+++ b/tests/msgmerge-13
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test13.in1 mm-test13.in2"
+tmpfiles="$tmpfiles mm-test13.in1 mm-test13.in2"
 cat <<EOF > mm-test13.in1
 msgid "2" msgstr "2"
 msgid "3" msgstr "3"

diff --git a/tests/msgmerge-2 b/tests/msgmerge-2
index c1adbf5681451a6b45ed47025e00bfd08e400dd0..a47a95dc0103eb691270ff2b14b2198906360b1f 100755 (executable)
--- a/tests/msgmerge-2
+++ b/tests/msgmerge-2
@@ -9,7 +9,7 @@ LC_MESSAGES=
 LANG=
 export LANGUAGE LC_ALL LC_MESSAGES LANG
 
-tmpfiles="mm-test2.in1 mm-test2.in2"
+tmpfiles="$tmpfiles mm-test2.in1 mm-test2.in2"
 cat <<EOF > mm-test2.in1
 msgid "2" msgstr "2"
 msgid "3" msgstr "3"

diff --git a/tests/msgmerge-3 b/tests/msgmerge-3
index 3d3e46cc03ba10b04fa22b572287c08e4617531b..883fc643b97e368a24fa402f96a1f4b9e5cede6f 100755 (executable)
--- a/tests/msgmerge-3
+++ b/tests/msgmerge-3
@@ -3,7 +3,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test3.in1 mm-test3.in2"
+tmpfiles="$tmpfiles mm-test3.in1 mm-test3.in2"
 cat <<EOF > mm-test3.in1
 #
 # def.po

diff --git a/tests/msgmerge-4 b/tests/msgmerge-4
index 9be30303f7e838299aba52ca846df36aadce15fa..35e3a2e531ebe66629f012394b3bb1aa6ba7becf 100755 (executable)
--- a/tests/msgmerge-4
+++ b/tests/msgmerge-4
@@ -3,7 +3,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test4.in1.po mm-test4.in2.po"
+tmpfiles="$tmpfiles mm-test4.in1.po mm-test4.in2.po"
 cat <<EOF > mm-test4.in1.po
 msgid "one"
 msgstr "eins"

diff --git a/tests/msgmerge-5 b/tests/msgmerge-5
index 2bccc35f582b2a5580f20820ec4efff137720567..9900a54cd85d6b00b7d29bafdc387bd7f08fe4f6 100755 (executable)
--- a/tests/msgmerge-5
+++ b/tests/msgmerge-5
@@ -3,7 +3,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test5.in1.po mm-test5.in2.po"
+tmpfiles="$tmpfiles mm-test5.in1.po mm-test5.in2.po"
 cat <<EOF > mm-test5.in1.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.

diff --git a/tests/msgmerge-6 b/tests/msgmerge-6
index 41d3286853ddc46ded7866e71385a4538c8a6611..d9b7346e4beba59e5015ba430c6bc4c8d87ba004 100755 (executable)
--- a/tests/msgmerge-6
+++ b/tests/msgmerge-6
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test6.in1 mm-test6.com mm-test6.pot"
+tmpfiles="$tmpfiles mm-test6.in1 mm-test6.com mm-test6.pot"
 cat <<EOF > mm-test6.in1
 #: file.c:123
 msgid "1"

diff --git a/tests/msgmerge-7 b/tests/msgmerge-7
index 78b2f1e24b7fbda8c4bafb10b5c9a982cff822e7..142b27e32e8def7734875df4a76d383e15b213ae 100755 (executable)
--- a/tests/msgmerge-7
+++ b/tests/msgmerge-7
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test7.in1 mm-test7.com mm-test7.pot"
+tmpfiles="$tmpfiles mm-test7.in1 mm-test7.com mm-test7.pot"
 cat <<EOF > mm-test7.in1
 #: file.c:123
 msgid "1"

diff --git a/tests/msgmerge-8 b/tests/msgmerge-8
index 897d6c192200bfb2617d9ab9d3b23b379bb1b62b..611a665cfbdc589a8b5db84b64ec31ae17b7a443 100755 (executable)
--- a/tests/msgmerge-8
+++ b/tests/msgmerge-8
@@ -9,7 +9,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test8.in1 mm-test8.com mm-test8.pot"
+tmpfiles="$tmpfiles mm-test8.in1 mm-test8.com mm-test8.pot"
 cat <<EOF > mm-test8.in1
 #: file.c:123
 msgid "1"

diff --git a/tests/msgmerge-9 b/tests/msgmerge-9
index 1f96e0ed579eef2dd8ca12d54e435eb61dddac5a..5e8f13ab030c24ea899bc80f31dfe472eaa2b321 100755 (executable)
--- a/tests/msgmerge-9
+++ b/tests/msgmerge-9
@@ -5,7 +5,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mm-test9.in1.po mm-test9.in2.po"
+tmpfiles="$tmpfiles mm-test9.in1.po mm-test9.in2.po"
 cat <<EOF > mm-test9.in1.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.

diff --git a/tests/msgunfmt-1 b/tests/msgunfmt-1
index 686b21825e9e95006cd921486712e4ceb130ec09..840463a2f53f7b3a2ca007c5ee16fef87f3b99bb 100755 (executable)
--- a/tests/msgunfmt-1
+++ b/tests/msgunfmt-1
@@ -3,7 +3,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="mu-test1.in"
+tmpfiles="$tmpfiles mu-test1.in"
 cat <<EOF > mu-test1.in
 msgid "eight"
 msgstr "eighth"

diff --git a/tests/xg-test1.ok.po b/tests/xg-test1.ok.po
index 40dea85107c6122f5f31a8546aa50129c2a5cd49..5605888c0e892b6ca51fb9075102f773e3821161 100644 (file)
--- a/tests/xg-test1.ok.po
+++ b/tests/xg-test1.ok.po
@@ -284,12 +284,16 @@ msgid "nplurals = %lu..."
 msgstr ""
 
 #, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] ""
+msgstr[1] ""
 
 #, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] ""
+msgstr[1] ""
 
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
@@ -320,7 +324,7 @@ msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
 #, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 msgstr ""
 
 #, c-format

diff --git a/tests/xgettext-1 b/tests/xgettext-1
index a442e5014fe0b20ca2903567d4a3a9225957727e..b0d08e456c64ee27d597ee409204fc31c79a30eb 100755 (executable)
--- a/tests/xgettext-1
+++ b/tests/xgettext-1
@@ -8,7 +8,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="xg-test1.po"
+tmpfiles="$tmpfiles xg-test1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-test1 -k_ --omit-header --no-location \
  $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c $top_srcdir/src/gettext.c

diff --git a/tests/xgettext-2 b/tests/xgettext-2
index 4038b7bdff610a8a062302939ea23a6aee760be3..98e7a4ab7c867587257fd591d0ae8b45719ed070 100755 (executable)
--- a/tests/xgettext-2
+++ b/tests/xgettext-2
@@ -1,6 +1,9 @@
 #! /bin/sh
 
-tmpfiles="xg-test2.in.c"
+tmpfiles=""
+trap 'rm -fr $tmpfiles' 1 2 3 15
+
+tmpfiles="$tmpfiles xg-test2.in.c"
 cat <<EOF > xg-test2.in.c
 This is a test of the xgettext functionality.
 /* xgettext:no-c-format */

diff --git a/tests/xgettext-3 b/tests/xgettext-3
index d2e925a58eb83b65fba39c8efaf6adaf292d2179..8a8e47761182112630ea5a9205043cbe3693f5f0 100755 (executable)
--- a/tests/xgettext-3
+++ b/tests/xgettext-3
@@ -8,7 +8,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="zero-domain.po"
+tmpfiles="$tmpfiles zero-domain.po"
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \

diff --git a/tests/xgettext-4 b/tests/xgettext-4
index e460d43368b44facf5abaf0ce068dbbe0546a0a7..4d5f63bbacf0cae528f3abc464725694411e35a6 100755 (executable)
--- a/tests/xgettext-4
+++ b/tests/xgettext-4
@@ -3,7 +3,7 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="xg-test4.in.c"
+tmpfiles="$tmpfiles xg-test4.in.c"
 cat <<EOF > xg-test4.in.c
 #line 42 "bozo"
 main(){printf(gettext("Hello, World!\n"));}