From: Bruno Haible Date: Tue, 18 Dec 2001 13:38:03 +0000 (+0000) Subject: Unify tmpfiles handling. X-Git-Tag: v0.11~166 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=112855d45976bc24fd2a5930d5b93c1daff6956f;p=thirdparty%2Fgettext.git Unify tmpfiles handling. --- diff --git a/tests/ChangeLog b/tests/ChangeLog index d0025240e..c103ce1df 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,10 @@ +2001-12-18 Bruno Haible + + * 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 * lang-objc: If the locale couldn't be set, skip the test. diff --git a/tests/Makefile.in b/tests/Makefile.in index 33a64ca23..eb182139a 100644 --- 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 2e46823b8..604ab64bc 100755 --- 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 121d27d20..548237a61 100755 --- 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 eaa85ca5c..dc5d82b04 100755 --- 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 < mcat-test1.in1 msgid "" msgstr "" diff --git a/tests/msgcat-2 b/tests/msgcat-2 index 7b215748d..0706d326e 100755 --- 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 < 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 33dbd8bc0..be826d38b 100755 --- 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 < 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 18713d473..bac351f79 100755 --- 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 < 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 1b935615c..d602bcb8a 100755 --- 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 < 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 f51aad6b9..ac45456f4 100755 --- 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 < 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 0d5763400..0365aab5b 100755 --- 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 < mcat-test7.in1 #: clients/inst_language.ycp:119 msgid "two" diff --git a/tests/msgcmp-1 b/tests/msgcmp-1 index e81bb7b27..08168b1bb 100755 --- 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 < mc-test1.in1 msgid "one" msgstr "first" msgid "two" msgstr "second" diff --git a/tests/msgcmp-2 b/tests/msgcmp-2 index fe934e782..096f75a11 100755 --- 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 < mc-test2.in1 msgid "one" msgstr "first" msgid "two" msgstr "second" diff --git a/tests/msgcomm-1 b/tests/msgcomm-1 index 542ebb411..6c6b8d535 100755 --- 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 < mcomm-test1.in1 #: first.c:123 msgid "1" diff --git a/tests/msgcomm-10 b/tests/msgcomm-10 index 5ba435810..f492d6049 100755 --- 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 < mcomm-test10.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-11 b/tests/msgcomm-11 index cd9c047c7..1184f4127 100755 --- 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 < mcomm-test11.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-12 b/tests/msgcomm-12 index 7bf3ba319..326baaab0 100755 --- 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 < mcomm-test12.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-13 b/tests/msgcomm-13 index 40a9ed4f3..311345167 100755 --- 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 < mcomm-test13.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-14 b/tests/msgcomm-14 index 1e461312f..6a487a110 100755 --- 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 < mcomm-test14.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-15 b/tests/msgcomm-15 index 9ef1cc56a..1e4e1380a 100755 --- 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 < mcomm-test15.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-16 b/tests/msgcomm-16 index 50e124daa..1b4fcc304 100755 --- 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 < 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 2643be63e..45d19410f 100755 --- 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 < mcomm-test17.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-18 b/tests/msgcomm-18 index aa5382cab..393b2bdc4 100755 --- 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 < mcomm-test18.in1 # Sure. #: first.c:123 diff --git a/tests/msgcomm-19 b/tests/msgcomm-19 index 65b7c62cc..f3d828aa9 100755 --- 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 < mcomm-test19.in1 # Not sure. #: first.c:123 diff --git a/tests/msgcomm-2 b/tests/msgcomm-2 index 736480647..f1a6b609a 100755 --- 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 < mcomm-test2.in1 #: first.c:123 msgid "1" diff --git a/tests/msgcomm-20 b/tests/msgcomm-20 index 0274190a4..0a07e30e1 100755 --- 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 < mcomm-test20.in1 # Sure. #: first.c:123 diff --git a/tests/msgcomm-21 b/tests/msgcomm-21 index ad855442a..9571e111e 100755 --- 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 < mcomm-test21.in1 # Not sure. #: first.c:123 diff --git a/tests/msgcomm-22 b/tests/msgcomm-22 index f96dcc2c1..17c2aae0c 100755 --- 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 < 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 aec22d021..e06b48364 100755 --- 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 < mcomm-test3.in1 #: first.c:123 msgid "1" diff --git a/tests/msgcomm-4 b/tests/msgcomm-4 index 47f5f0922..49df3244f 100755 --- 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 < mcomm-test4.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-5 b/tests/msgcomm-5 index cdf42d557..14f331c7f 100755 --- 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 < mcomm-test5.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-6 b/tests/msgcomm-6 index f0208be7f..845128a06 100755 --- 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 < mcomm-test6.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-7 b/tests/msgcomm-7 index d4b8bfef0..9a08f91ed 100755 --- 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 < mcomm-test7.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-8 b/tests/msgcomm-8 index cc61e4bf3..3b71c50f0 100755 --- 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 < mcomm-test8.in1 msgid "" msgstr "" diff --git a/tests/msgcomm-9 b/tests/msgcomm-9 index f85efb504..aa3861b8b 100755 --- 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 < mcomm-test9.in1 msgid "" msgstr "" diff --git a/tests/msgfmt-1 b/tests/msgfmt-1 index 23242d0aa..ef30ccbce 100755 --- 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 2945273f3..5c9c562ce 100755 --- 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 < 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 < mf-test10.po2 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. diff --git a/tests/msgfmt-2 b/tests/msgfmt-2 index c2d09185f..e03e03402 100755 --- 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 053f9a45e..04713de30 100755 --- 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 <mf-test3.po # # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/tests/msgfmt-4 b/tests/msgfmt-4 index 16987feb0..d649b5c84 100755 --- 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 <mf-test4.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. diff --git a/tests/msgfmt-5 b/tests/msgfmt-5 index f19dbefa5..646c4e6b2 100755 --- 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 < foo.po domain "foo-de" msgid "" diff --git a/tests/msgfmt-7 b/tests/msgfmt-7 index 5b281bc02..2bf5190ad 100755 --- 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 < mf-test7.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. diff --git a/tests/msgfmt-8 b/tests/msgfmt-8 index 23e04ab5a..7f4202354 100755 --- 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 < mf-test8.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. diff --git a/tests/msgfmt-9 b/tests/msgfmt-9 index e25ee2bd4..08419294b 100755 --- 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 < mf-test9.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. diff --git a/tests/msgmerge-1 b/tests/msgmerge-1 index c0f2e70ff..d88c40700 100755 --- 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 < mm-test1.in1 # first #. this should be discarded diff --git a/tests/msgmerge-10 b/tests/msgmerge-10 index 0441cc35a..fe7bf6b7b 100755 --- 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 < foo.po domain "foo-de" msgid "" diff --git a/tests/msgmerge-11 b/tests/msgmerge-11 index 8c4d2c8f8..20d3f5326 100755 --- 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 < foo.po domain "foo-de" msgid "" diff --git a/tests/msgmerge-12 b/tests/msgmerge-12 index 6a981c2e2..3ffca40db 100755 --- 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 < mm-test12.com msgid "" diff --git a/tests/msgmerge-13 b/tests/msgmerge-13 index c98e8b498..8ec5ba2c3 100755 --- 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 < mm-test13.in1 msgid "2" msgstr "2" msgid "3" msgstr "3" diff --git a/tests/msgmerge-2 b/tests/msgmerge-2 index c1adbf568..a47a95dc0 100755 --- 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 < mm-test2.in1 msgid "2" msgstr "2" msgid "3" msgstr "3" diff --git a/tests/msgmerge-3 b/tests/msgmerge-3 index 3d3e46cc0..883fc643b 100755 --- 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 < mm-test3.in1 # # def.po diff --git a/tests/msgmerge-4 b/tests/msgmerge-4 index 9be30303f..35e3a2e53 100755 --- 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 < mm-test4.in1.po msgid "one" msgstr "eins" diff --git a/tests/msgmerge-5 b/tests/msgmerge-5 index 2bccc35f5..9900a54cd 100755 --- 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 < 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 41d328685..d9b7346e4 100755 --- 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 < mm-test6.in1 #: file.c:123 msgid "1" diff --git a/tests/msgmerge-7 b/tests/msgmerge-7 index 78b2f1e24..142b27e32 100755 --- 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 < mm-test7.in1 #: file.c:123 msgid "1" diff --git a/tests/msgmerge-8 b/tests/msgmerge-8 index 897d6c192..611a665cf 100755 --- 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 < mm-test8.in1 #: file.c:123 msgid "1" diff --git a/tests/msgmerge-9 b/tests/msgmerge-9 index 1f96e0ed5..5e8f13ab0 100755 --- 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 < 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 686b21825..840463a2f 100755 --- 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 < mu-test1.in msgid "eight" msgstr "eighth" diff --git a/tests/xg-test1.ok.po b/tests/xg-test1.ok.po index 40dea8510..5605888c0 100644 --- 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 a442e5014..b0d08e456 100755 --- 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 4038b7bdf..98e7a4ab7 100755 --- 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 < 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 d2e925a58..8a8e47761 100755 --- 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 e460d4336..4d5f63bba 100755 --- 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 < xg-test4.in.c #line 42 "bozo" main(){printf(gettext("Hello, World!\n"));}