From: Bruno Haible Date: Fri, 16 Aug 2024 08:36:06 +0000 (+0200) Subject: tests: Prefer 'cat <<\EOF' to 'cat <configure.ac +cat <<\EOF >configure.ac AC_INIT AC_CONFIG_SRCDIR(hello.c) @@ -187,7 +187,7 @@ test -f po/Makefile.in.in || Exit 1 rm -fr m4 po ABOUT-NLS config.rpath # Check for AM_GNU_GETTEXT_REQUIRE_VERSION. -cat <configure.ac +cat <<\EOF >configure.ac AC_INIT AC_CONFIG_SRCDIR(hello.c) @@ -212,7 +212,7 @@ test -f po/Makefile.in.in || Exit 1 # Check for the case where both AM_GNU_GETTEXT_REQUIRE_VERSION and # AM_GNU_GETTEXT_VERSION are used. Once with libintl source. -cat <configure.ac +cat <<\EOF >configure.ac AC_INIT AC_CONFIG_SRCDIR(hello.c) @@ -234,7 +234,7 @@ test $? = 1 || { cat autopoint.err; Exit 1; } # Check for the case where both AM_GNU_GETTEXT_REQUIRE_VERSION and # AM_GNU_GETTEXT_VERSION are used. Once without libintl source. -cat <configure.ac +cat <<\EOF >configure.ac AC_INIT AC_CONFIG_SRCDIR(hello.c) diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3 index 415e3bf22..3089d36f1 100755 --- a/gettext-tools/tests/format-c-3 +++ b/gettext-tools/tests/format-c-3 @@ -7,7 +7,7 @@ ${XGETTEXT} -o fc3.tmp --omit-header --no-location "$wabs_srcdir"/format-c-3-prg.c || Exit 1 LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot || Exit 1 -cat < fc3.ok +cat <<\EOF > fc3.ok msgid "the president" msgstr "" @@ -19,7 +19,7 @@ EOF : ${DIFF=diff} ${DIFF} fc3.ok fc3.pot || Exit 1 -cat < fc3-de.po +cat <<\EOF > fc3-de.po msgid "the president" msgstr "der Vorsitzende" @@ -39,7 +39,7 @@ ${MSGFMT} -o fc3-dir/fr/LC_MESSAGES/fc3.mo fc3-de.po ${MSGUNFMT} -o fc3-de.po.tmp fc3-dir/fr/LC_MESSAGES/fc3.mo || Exit 1 LC_ALL=C tr -d '\r' < fc3-de.po.tmp > fc3-de.po.un || Exit 1 -cat < fc3-de.po.red +cat <<\EOF > fc3-de.po.red msgid "father of %d children" msgstr "Vater von %d Kindern" diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4 index 7092ee0c9..8f2d75c0e 100755 --- a/gettext-tools/tests/format-c-4 +++ b/gettext-tools/tests/format-c-4 @@ -7,7 +7,7 @@ ${XGETTEXT} -o fc4.tmp --omit-header --no-location "$wabs_srcdir"/format-c-4-prg.c || Exit 1 LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot || Exit 1 -cat < fc4.ok +cat <<\EOF > fc4.ok msgid "the president" msgstr "" @@ -21,7 +21,7 @@ EOF : ${DIFF=diff} ${DIFF} fc4.ok fc4.pot || Exit 1 -cat < fc4-de.po +cat <<\EOF > fc4-de.po msgid "the president" msgstr "der Vorsitzende" @@ -43,7 +43,7 @@ ${MSGFMT} -o fc4-dir/fr/LC_MESSAGES/fc4.mo fc4-de.po ${MSGUNFMT} -o fc4-de.po.tmp fc4-dir/fr/LC_MESSAGES/fc4.mo || Exit 1 LC_ALL=C tr -d '\r' < fc4-de.po.tmp > fc4-de.po.un || Exit 1 -cat < fc4-de.po.red +cat <<\EOF > fc4-de.po.red msgid "father of %d child" msgid_plural "father of % children" msgstr[0] "Vater eines Kindes" diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5 index 3c64c8794..1a70c7577 100755 --- a/gettext-tools/tests/format-c-5 +++ b/gettext-tools/tests/format-c-5 @@ -12,7 +12,7 @@ ${XGETTEXT} -o fc5.tmp --omit-header --no-location "$wabs_srcdir"/format-c-5-prg.c || Exit 1 LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot || Exit 1 -cat < fc5.ok +cat <<\EOF > fc5.ok msgid "the president" msgstr "" @@ -25,7 +25,7 @@ EOF ${DIFF} fc5.ok fc5.pot || Exit 1 # This should better be Farsi, not German. Can some translator help me? -cat < fa.po +cat <<\EOF > fa.po msgid "the president" msgstr "der Vorsitzende" diff --git a/gettext-tools/tests/gettext-1 b/gettext-tools/tests/gettext-1 index 87b609bd9..90553a63b 100755 --- a/gettext-tools/tests/gettext-1 +++ b/gettext-tools/tests/gettext-1 @@ -13,7 +13,7 @@ TEXTDOMAINDIR=. LANGUAGE=gt-1 \ ${GETTEXT} --env LC_ALL=en -e test 'SYS_(C)\n' | LC_ALL=C tr -d '\r' > gt-test1.out # Create correct file. -cat < gtmf-test1.ok +cat <<\EOF > gtmf-test1.ok MSGFMT(1) portable message object file compiler Copyright (C) 1995 Free Software Foundation Report bugs to diff --git a/gettext-tools/tests/intl-0 b/gettext-tools/tests/intl-0 index 9977cfe2e..e19b86cc0 100755 --- a/gettext-tools/tests/intl-0 +++ b/gettext-tools/tests/intl-0 @@ -11,7 +11,7 @@ test -d in-0/C/LC_MESSAGES || mkdir in-0/C/LC_MESSAGES ${MSGFMT} -o in-0/C/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-1.po : ${DIFF=diff} -cat < in-0.ok +cat <<\EOF > in-0.ok cheese EOF diff --git a/gettext-tools/tests/intl-1 b/gettext-tools/tests/intl-1 index cf0f8df80..b572d0d6f 100755 --- a/gettext-tools/tests/intl-1 +++ b/gettext-tools/tests/intl-1 @@ -11,7 +11,7 @@ test -d in-1/fr/LC_MESSAGES || mkdir in-1/fr/LC_MESSAGES ${MSGFMT} -o in-1/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-1.po : ${DIFF=diff} -cat < in-1.ok +cat <<\EOF > in-1.ok fromage EOF diff --git a/gettext-tools/tests/intl-2 b/gettext-tools/tests/intl-2 index a2a2d8dbd..f7cbbd43b 100755 --- a/gettext-tools/tests/intl-2 +++ b/gettext-tools/tests/intl-2 @@ -18,10 +18,10 @@ test -d in-2-2/fr/LC_MESSAGES || mkdir in-2-2/fr/LC_MESSAGES ${MSGFMT} -o in-2-2/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-2-2.po : ${DIFF=diff} -cat < in-2-1.ok +cat <<\EOF > in-2-1.ok Käse EOF -cat < in-2-2.ok +cat <<\EOF > in-2-2.ok Käse EOF diff --git a/gettext-tools/tests/intl-3 b/gettext-tools/tests/intl-3 index 208898258..c283bb9ee 100755 --- a/gettext-tools/tests/intl-3 +++ b/gettext-tools/tests/intl-3 @@ -18,10 +18,10 @@ test -d in-3-2/fr/LC_MESSAGES || mkdir in-3-2/fr/LC_MESSAGES ${MSGFMT} -o in-3-2/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-2-2.po : ${DIFF=diff} -cat < in-3-1.ok +cat <<\EOF > in-3-1.ok Käse EOF -cat < in-3-2.ok +cat <<\EOF > in-3-2.ok Käse EOF diff --git a/gettext-tools/tests/intl-6 b/gettext-tools/tests/intl-6 index c1b3637ed..b5c26f189 100755 --- a/gettext-tools/tests/intl-6 +++ b/gettext-tools/tests/intl-6 @@ -13,7 +13,7 @@ test -d in-6/fr/LC_MESSAGES || mkdir in-6/fr/LC_MESSAGES ${MSGFMT} -o in-6/fr/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-1.po : ${DIFF=diff} -cat < in-6.ok +cat <<\EOF > in-6.ok fromage EOF diff --git a/gettext-tools/tests/intl-7 b/gettext-tools/tests/intl-7 index 1876c7efa..a74df0d7d 100755 --- a/gettext-tools/tests/intl-7 +++ b/gettext-tools/tests/intl-7 @@ -38,7 +38,7 @@ test -d in-7/fr/LC_MESSAGES || mkdir in-7/fr/LC_MESSAGES test -d in-7/fr_FR || mkdir in-7/fr_FR test -d in-7/fr_FR/LC_MESSAGES || mkdir in-7/fr_FR/LC_MESSAGES -cat < in-7l.po +cat <<\EOF > in-7l.po msgid "" msgstr "" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgid "dog" msgstr "chien" EOF -cat < in-7-1.po +cat <<\EOF > in-7-1.po msgid "" msgstr "" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgid "cheese" msgstr "fromage" EOF -cat < in-7-2.po +cat <<\EOF > in-7-2.po msgid "" msgstr "" "MIME-Version: 1.0\n" @@ -71,7 +71,7 @@ msgid "cheese" msgstr "camembert" EOF -cat < in-7-3.po +cat <<\EOF > in-7-3.po msgid "" msgstr "" "MIME-Version: 1.0\n" @@ -89,7 +89,7 @@ ${MSGFMT} -o in-7/fr_FR/LC_MESSAGES/tstfoo.mo in-7-2.po ${MSGFMT} -o in-7/fr/LC_MESSAGES/tstbar.mo in-7-3.po : ${DIFF=diff} -cat < in-7.ok +cat <<\EOF > in-7.ok chien confiture camembert diff --git a/gettext-tools/tests/intl-setlocale-1 b/gettext-tools/tests/intl-setlocale-1 index 4848763da..fef6ed863 100755 --- a/gettext-tools/tests/intl-setlocale-1 +++ b/gettext-tools/tests/intl-setlocale-1 @@ -40,7 +40,7 @@ test -d in-sl-1/fr_FR/LC_MESSAGES || mkdir in-sl-1/fr_FR/LC_MESSAGES ${MSGFMT} -o in-sl-1/de_DE/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-setlocale-1-1.po ${MSGFMT} -o in-sl-1/fr_FR/LC_MESSAGES/tstprog.mo "$wabs_srcdir"/intl-setlocale-1-2.po -cat < in-sl-1.ok +cat <<\EOF > in-sl-1.ok String1 - Lang1: 1st string String2 - Lang1: 2nd string String1 - Lang2: 1st string diff --git a/gettext-tools/tests/intl-thread-2 b/gettext-tools/tests/intl-thread-2 index 9be950aeb..9779c9bbf 100755 --- a/gettext-tools/tests/intl-thread-2 +++ b/gettext-tools/tests/intl-thread-2 @@ -18,7 +18,7 @@ ${MSGFMT} -o in-th-2/fr/LC_MESSAGES/tstthread.mo "$wabs_srcdir"/intl-thread-2-1. ${MSGFMT} -o in-th-2/de/LC_MESSAGES/tstthread.mo "$wabs_srcdir"/intl-thread-2-2.po : ${DIFF=diff} -cat < in-th-2.ok +cat <<\EOF > in-th-2.ok beauté Schönheit beauté diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c index 28464689c..93293d310 100755 --- a/gettext-tools/tests/lang-c +++ b/gettext-tools/tests/lang-c @@ -58,7 +58,7 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CC --mode=link \ ${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.c || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok #, c-format msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++ index 3e0158869..52cc1c9cb 100755 --- a/gettext-tools/tests/lang-c++ +++ b/gettext-tools/tests/lang-c++ @@ -80,7 +80,7 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \ ${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.cc || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-c++20 b/gettext-tools/tests/lang-c++20 index 521ca6f97..3163d71a8 100755 --- a/gettext-tools/tests/lang-c++20 +++ b/gettext-tools/tests/lang-c++20 @@ -91,7 +91,7 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \ ${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.cc || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp index 0c3a49274..7cd2a6b71 100755 --- a/gettext-tools/tests/lang-clisp +++ b/gettext-tools/tests/lang-clisp @@ -22,7 +22,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lisp || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp index 3ccdd5257..a365bb6a5 100755 --- a/gettext-tools/tests/lang-csharp +++ b/gettext-tools/tests/lang-csharp @@ -61,7 +61,7 @@ ${CSHARPCOMP} -o program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gett ${XGETTEXT} -o prog.tmp --omit-header --no-location program.cs || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-elisp b/gettext-tools/tests/lang-elisp index 3081ddc5d..d589f3654 100755 --- a/gettext-tools/tests/lang-elisp +++ b/gettext-tools/tests/lang-elisp @@ -17,7 +17,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.el || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk index 3f0b2edda..498de3e91 100755 --- a/gettext-tools/tests/lang-gawk +++ b/gettext-tools/tests/lang-gawk @@ -26,7 +26,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.awk || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile index 302eaf3aa..714d05eec 100755 --- a/gettext-tools/tests/lang-guile +++ b/gettext-tools/tests/lang-guile @@ -25,7 +25,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.scm || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java index 0b5c70ee7..65e3e246d 100755 --- a/gettext-tools/tests/lang-java +++ b/gettext-tools/tests/lang-java @@ -66,7 +66,7 @@ CLASSPATH=../../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d . Progra ${XGETTEXT} -o prog.tmp --omit-header --no-location Program.java || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-javascript b/gettext-tools/tests/lang-javascript index 5ef33bbf3..09869e576 100755 --- a/gettext-tools/tests/lang-javascript +++ b/gettext-tools/tests/lang-javascript @@ -22,7 +22,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.js || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep index 31bf926fb..d7c88a27b 100755 --- a/gettext-tools/tests/lang-librep +++ b/gettext-tools/tests/lang-librep @@ -21,7 +21,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.jl || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc index 938a0a6c9..9edef4a30 100755 --- a/gettext-tools/tests/lang-objc +++ b/gettext-tools/tests/lang-objc @@ -73,7 +73,7 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CC --mode=link \ ${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.m || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok #, c-format msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal index 8f6df6326..d1c934c7e 100755 --- a/gettext-tools/tests/lang-pascal +++ b/gettext-tools/tests/lang-pascal @@ -44,7 +44,7 @@ fi ${XGETTEXT} -o pascalprog.tmp --omit-header --add-location pascalprog.${suffix} || Exit 1 LC_ALL=C tr -d '\r' < pascalprog.tmp > pascalprog.pot || Exit 1 -cat < pascalprog.ok +cat <<\EOF > pascalprog.ok #: pascalprog.question msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1 index 22bcbd4b4..426038cfb 100755 --- a/gettext-tools/tests/lang-perl-1 +++ b/gettext-tools/tests/lang-perl-1 @@ -27,7 +27,7 @@ ${XGETTEXT} \ -o prog.tmp --omit-header --no-location program1.pl || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2 index 45d40ef48..5d57552d3 100755 --- a/gettext-tools/tests/lang-perl-2 +++ b/gettext-tools/tests/lang-perl-2 @@ -26,7 +26,7 @@ ${XGETTEXT} \ -o prog.tmp --omit-header --no-location program2.pl || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php index b8238d5b9..4ba8f6f51 100755 --- a/gettext-tools/tests/lang-php +++ b/gettext-tools/tests/lang-php @@ -21,7 +21,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.php || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1 index 1351b01f8..9267a219d 100755 --- a/gettext-tools/tests/lang-python-1 +++ b/gettext-tools/tests/lang-python-1 @@ -23,7 +23,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog1.py || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2 index 2b2444624..44145da37 100755 --- a/gettext-tools/tests/lang-python-2 +++ b/gettext-tools/tests/lang-python-2 @@ -29,7 +29,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog2.py || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-rst b/gettext-tools/tests/lang-rst index 348aa726f..9054caf7f 100755 --- a/gettext-tools/tests/lang-rst +++ b/gettext-tools/tests/lang-rst @@ -23,7 +23,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok #: rstconv.help msgid "" "rstconv [-h|--help] Displays this help\n" @@ -64,7 +64,7 @@ ${DIFF} prog.ok prog.pot || Exit 1 : ${RSTCONV=rstconv} if (${RSTCONV} -o prog.pot -i prog.rst) >/dev/null 2>&1; then -cat < prog.ok1 +cat <<\EOF > prog.ok1 #: rstconv:help msgid "rstconv [-h|--help] Displays this help\nrstconv options Convert rst file\n\nOptions are:\n -i file Use specified file instead of stdin as input .rst (OPTIONAL)\n -o file Write output to specified file (REQUIRED)\n -f format Specifies the output format:\n po GNU gettext .po (portable) format (DEFAULT)\n" msgstr "" @@ -87,7 +87,7 @@ msgstr "" EOF -cat < prog.ok2 +cat <<\EOF > prog.ok2 #: rstconv:help msgid "" "rstconv [-h|--help] Displays this help\n" diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk index 6b3584d54..8c566aacc 100755 --- a/gettext-tools/tests/lang-smalltalk +++ b/gettext-tools/tests/lang-smalltalk @@ -34,7 +34,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.st || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl index 0cc8c3ee4..1de8d5c12 100755 --- a/gettext-tools/tests/lang-tcl +++ b/gettext-tools/tests/lang-tcl @@ -25,7 +25,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header -k_ program.tcl || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok #: program.tcl:5 msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala index ba1d25e98..db0e7dcb8 100755 --- a/gettext-tools/tests/lang-vala +++ b/gettext-tools/tests/lang-vala @@ -47,7 +47,7 @@ ${VALAC} --Xcc=-DGETTEXT_PACKAGE=\"prog\" prog.vala 2>prog.err \ ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.vala || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/lang-ycp b/gettext-tools/tests/lang-ycp index 20ac13342..a7ad4118f 100755 --- a/gettext-tools/tests/lang-ycp +++ b/gettext-tools/tests/lang-ycp @@ -17,7 +17,7 @@ EOF ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.ycp || Exit 1 LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1 -cat < prog.ok +cat <<\EOF > prog.ok msgid "'Your command, please?', asked the waiter." msgstr "" diff --git a/gettext-tools/tests/msgcat-1 b/gettext-tools/tests/msgcat-1 index a554e8a1d..9843a2b6f 100755 --- a/gettext-tools/tests/msgcat-1 +++ b/gettext-tools/tests/msgcat-1 @@ -4,7 +4,7 @@ # Verify that msgcat doesn't introduce alternative syntax if all translations # have the same msgstr. -cat < mcat-test1.in1 +cat <<\EOF > mcat-test1.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -21,7 +21,7 @@ msgid "1" msgstr "eins" EOF -cat < mcat-test1.in2 +cat <<\EOF > mcat-test1.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcat-19 b/gettext-tools/tests/msgcat-19 index 7068a8332..76cd4baae 100755 --- a/gettext-tools/tests/msgcat-19 +++ b/gettext-tools/tests/msgcat-19 @@ -3,7 +3,7 @@ # Test --add-location=file option. -cat < mcat-test19.in1 +cat <<\EOF > mcat-test19.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -20,7 +20,7 @@ msgid "1" msgstr "eins" EOF -cat < mcat-test19.in2 +cat <<\EOF > mcat-test19.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcat-20 b/gettext-tools/tests/msgcat-20 index 8685f6580..7f6d9e1d5 100755 --- a/gettext-tools/tests/msgcat-20 +++ b/gettext-tools/tests/msgcat-20 @@ -3,7 +3,7 @@ # Verify --sort-by-file. -cat < mcat-test20.in +cat <<\EOF > mcat-test20.in #: clients/inst_language.ycp:119 msgid "one" msgstr "1" diff --git a/gettext-tools/tests/msgcat-7 b/gettext-tools/tests/msgcat-7 index 93890e3fd..8e119ad2f 100755 --- a/gettext-tools/tests/msgcat-7 +++ b/gettext-tools/tests/msgcat-7 @@ -3,7 +3,7 @@ # Verify 'msgcat --sort-output' -cat < mcat-test7.in1 +cat <<\EOF > mcat-test7.in1 #: clients/inst_language.ycp:119 msgid "two" msgstr "2" diff --git a/gettext-tools/tests/msgcmp-1 b/gettext-tools/tests/msgcmp-1 index 17f70aa90..0124ef4dc 100755 --- a/gettext-tools/tests/msgcmp-1 +++ b/gettext-tools/tests/msgcmp-1 @@ -3,13 +3,13 @@ # Test a succeeding comparison. -cat < mc-test1.in1 +cat <<\EOF > mc-test1.in1 msgid "one" msgstr "first" msgid "two" msgstr "second" msgid "three" msgstr "third" EOF -cat < mc-test1.in2 +cat <<\EOF > mc-test1.in2 msgid "three" msgstr "" msgid "one" msgstr "" msgid "two" msgstr "" diff --git a/gettext-tools/tests/msgcmp-2 b/gettext-tools/tests/msgcmp-2 index a63cc6a2b..8ee0d44db 100755 --- a/gettext-tools/tests/msgcmp-2 +++ b/gettext-tools/tests/msgcmp-2 @@ -3,14 +3,14 @@ # Test a failing comparison. -cat < mc-test2.in1 +cat <<\EOF > mc-test2.in1 msgid "one" msgstr "first" msgid "two" msgstr "second" msgid "three" msgstr "third" msgid "four" msgstr "fourth" EOF -cat < mc-test2.in2 +cat <<\EOF > mc-test2.in2 msgid "thre" msgstr "" #i.e. pretend a typo in the program msgid "one" msgstr "" msgid "two" msgstr "" @@ -20,7 +20,7 @@ EOF LC_MESSAGES=C LC_ALL= \ ${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' -e 's|^msgcmp\.exe|msgcmp|' -e 's|^/cygdrive/[^ ]*/msgcmp|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test2.out -cat < mc-test2.ok +cat <<\EOF > mc-test2.ok mc-test2.in2:1: this message is used but not defined... mc-test2.in1:3: ...but this definition is similar mc-test2.in1:4: warning: this message is not used diff --git a/gettext-tools/tests/msgcmp-3 b/gettext-tools/tests/msgcmp-3 index f79fd23f1..1b61c22e9 100755 --- a/gettext-tools/tests/msgcmp-3 +++ b/gettext-tools/tests/msgcmp-3 @@ -3,14 +3,14 @@ # Test a failing comparison with Java .properties syntax. -cat < mc-test3.in1 +cat <<\EOF > mc-test3.in1 one=first two=second three=third four=fourth EOF -cat < mc-test3.in2 +cat <<\EOF > mc-test3.in2 !thre= !one= !two= @@ -20,7 +20,7 @@ EOF LC_MESSAGES=C LC_ALL= \ ${MSGCMP} --properties-input mc-test3.in1 mc-test3.in2 2>&1 | grep -v '^==' | sed -e 's|[^ ]*\\msgcmp\.exe|msgcmp|' -e 's|^msgcmp\.exe|msgcmp|' -e 's|^/cygdrive/[^ ]*/msgcmp|msgcmp|' | LC_ALL=C tr -d '\r' > mc-test3.out -cat < mc-test3.ok +cat <<\EOF > mc-test3.ok mc-test3.in2:1: this message is used but not defined... mc-test3.in1:3: ...but this definition is similar mc-test3.in1:4: warning: this message is not used diff --git a/gettext-tools/tests/msgcomm-1 b/gettext-tools/tests/msgcomm-1 index 67ab93688..102afcdd7 100755 --- a/gettext-tools/tests/msgcomm-1 +++ b/gettext-tools/tests/msgcomm-1 @@ -3,13 +3,13 @@ # Test --more-than=0 option. -cat < mcomm-test1.in1 +cat <<\EOF > mcomm-test1.in1 #: first.c:123 msgid "1" msgstr "1x" EOF -cat < mcomm-test1.in2 +cat <<\EOF > mcomm-test1.in2 #: hunt.c:759 msgid "2" msgstr "2x" diff --git a/gettext-tools/tests/msgcomm-10 b/gettext-tools/tests/msgcomm-10 index 7dca8c0e1..e69fc1aba 100755 --- a/gettext-tools/tests/msgcomm-10 +++ b/gettext-tools/tests/msgcomm-10 @@ -3,7 +3,7 @@ # Test merge of common entries with --more-than=1 and --omit-header. -cat < mcomm-test10.in1 +cat <<\EOF > mcomm-test10.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -20,7 +20,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test10.in2 +cat <<\EOF > mcomm-test10.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcomm-11 b/gettext-tools/tests/msgcomm-11 index cecee3f3c..1d3219de8 100755 --- a/gettext-tools/tests/msgcomm-11 +++ b/gettext-tools/tests/msgcomm-11 @@ -3,7 +3,7 @@ # Test that --more-than=1 drops entries which occur only once. -cat < mcomm-test11.in1 +cat <<\EOF > mcomm-test11.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -24,7 +24,7 @@ msgid "2" msgstr "2x" EOF -cat < mcomm-test11.in2 +cat <<\EOF > mcomm-test11.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcomm-12 b/gettext-tools/tests/msgcomm-12 index 8c7ff781f..d51ea10b0 100755 --- a/gettext-tools/tests/msgcomm-12 +++ b/gettext-tools/tests/msgcomm-12 @@ -6,7 +6,7 @@ # unique msg in in3 -cat < mcomm-test12.in1 +cat <<\EOF > mcomm-test12.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -24,7 +24,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test12.in2 +cat <<\EOF > mcomm-test12.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -42,7 +42,7 @@ msgid "1" msgstr "" EOF -cat < mcomm-test12.in3 +cat <<\EOF > mcomm-test12.in3 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcomm-13 b/gettext-tools/tests/msgcomm-13 index 9f21eab81..490530595 100755 --- a/gettext-tools/tests/msgcomm-13 +++ b/gettext-tools/tests/msgcomm-13 @@ -6,7 +6,7 @@ # one msg occurs 3 times (has to go away). # An unique msg in in3 has to stay. -cat < mcomm-test13.in1 +cat <<\EOF > mcomm-test13.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -24,7 +24,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test13.in2 +cat <<\EOF > mcomm-test13.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -41,7 +41,7 @@ msgid "1" msgstr "" EOF -cat < mcomm-test13.in3 +cat <<\EOF > mcomm-test13.in3 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcomm-14 b/gettext-tools/tests/msgcomm-14 index 3e0401b28..8e6ac414d 100755 --- a/gettext-tools/tests/msgcomm-14 +++ b/gettext-tools/tests/msgcomm-14 @@ -6,7 +6,7 @@ # no unique msg in input files. # without --force-po don't create any PO file; cf. msgcomm-15 -cat < mcomm-test14.in1 +cat <<\EOF > mcomm-test14.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -24,7 +24,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test14.in2 +cat <<\EOF > mcomm-test14.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -41,7 +41,7 @@ msgid "1" msgstr "" EOF -cat < mcomm-test14.in3 +cat <<\EOF > mcomm-test14.in3 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcomm-15 b/gettext-tools/tests/msgcomm-15 index 043cf13df..5bc225f4f 100755 --- a/gettext-tools/tests/msgcomm-15 +++ b/gettext-tools/tests/msgcomm-15 @@ -7,7 +7,7 @@ # no unique msg in input files. # with --force-po create an empty PO file; cf. msgcomm-14 -cat < mcomm-test15.in1 +cat <<\EOF > mcomm-test15.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -25,7 +25,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test15.in2 +cat <<\EOF > mcomm-test15.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -42,7 +42,7 @@ msgid "1" msgstr "" EOF -cat < mcomm-test15.in3 +cat <<\EOF > mcomm-test15.in3 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcomm-17 b/gettext-tools/tests/msgcomm-17 index 2ec667522..d0159bf9a 100755 --- a/gettext-tools/tests/msgcomm-17 +++ b/gettext-tools/tests/msgcomm-17 @@ -5,7 +5,7 @@ # entries only (entries occurring less than 2 times). But don't drop the # header entry; otherwise msgcomm will fail for multibyte strings. -cat < mcomm-test17.in1 +cat <<\EOF > mcomm-test17.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -23,7 +23,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test17.in2 +cat <<\EOF > mcomm-test17.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcomm-18 b/gettext-tools/tests/msgcomm-18 index 2dab53e54..a771280ec 100755 --- a/gettext-tools/tests/msgcomm-18 +++ b/gettext-tools/tests/msgcomm-18 @@ -3,14 +3,14 @@ # Test --more-than=0; identical message are wanted once only. -cat < mcomm-test18.in1 +cat <<\EOF > mcomm-test18.in1 # Sure. #: first.c:123 msgid "1" msgstr "1x" EOF -cat < mcomm-test18.in2 +cat <<\EOF > mcomm-test18.in2 # Right. #: hunt.c:759 msgid "1" diff --git a/gettext-tools/tests/msgcomm-19 b/gettext-tools/tests/msgcomm-19 index 0b693ad80..6ff3e58ac 100755 --- a/gettext-tools/tests/msgcomm-19 +++ b/gettext-tools/tests/msgcomm-19 @@ -4,7 +4,7 @@ # Test --more-than=0; identical message are wanted once only. # If the first occurrence is fuzzy, keep the fuzzy mark. -cat < mcomm-test19.in1 +cat <<\EOF > mcomm-test19.in1 # Not sure. #: first.c:123 #, fuzzy @@ -12,7 +12,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test19.in2 +cat <<\EOF > mcomm-test19.in2 # Sure. #: hunt.c:759 msgid "1" diff --git a/gettext-tools/tests/msgcomm-2 b/gettext-tools/tests/msgcomm-2 index f93d58de1..f80cd22aa 100755 --- a/gettext-tools/tests/msgcomm-2 +++ b/gettext-tools/tests/msgcomm-2 @@ -3,13 +3,13 @@ # Test --no-location option. -cat < mcomm-test2.in1 +cat <<\EOF > mcomm-test2.in1 #: first.c:123 msgid "1" msgstr "1x" EOF -cat < mcomm-test2.in2 +cat <<\EOF > mcomm-test2.in2 #: hunt.c:759 msgid "2" msgstr "2x" diff --git a/gettext-tools/tests/msgcomm-20 b/gettext-tools/tests/msgcomm-20 index 3beb31ca9..2b45b63b2 100755 --- a/gettext-tools/tests/msgcomm-20 +++ b/gettext-tools/tests/msgcomm-20 @@ -4,14 +4,14 @@ # Test --more-than=0; identical message are wanted once only. # If the first occurrence is not fuzzy, don't make the result fuzzy. -cat < mcomm-test20.in1 +cat <<\EOF > mcomm-test20.in1 # Sure. #: first.c:123 msgid "1" msgstr "1x" EOF -cat < mcomm-test20.in2 +cat <<\EOF > mcomm-test20.in2 # Not sure. #: hunt.c:759 #, fuzzy diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21 index fa32600c0..30ef51549 100755 --- a/gettext-tools/tests/msgcomm-21 +++ b/gettext-tools/tests/msgcomm-21 @@ -4,7 +4,7 @@ # Test --more-than=0; identical message are wanted once only. # If both occurrences are fuzzy, keep the fuzzy mark. -cat < mcomm-test21.in1 +cat <<\EOF > mcomm-test21.in1 # Not sure. #: first.c:123 #, fuzzy @@ -12,7 +12,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test21.in2 +cat <<\EOF > mcomm-test21.in2 # Doubt. #: hunt.c:759 #, fuzzy diff --git a/gettext-tools/tests/msgcomm-24 b/gettext-tools/tests/msgcomm-24 index 2cc5f95d0..dac30e4d8 100755 --- a/gettext-tools/tests/msgcomm-24 +++ b/gettext-tools/tests/msgcomm-24 @@ -3,12 +3,12 @@ # Test --more-than=0 option with Java .properties syntax. -cat < mcomm-test24.in1 +cat <<\EOF > mcomm-test24.in1 #: first.c:123 1=1x EOF -cat < mcomm-test24.in2 +cat <<\EOF > mcomm-test24.in2 #: hunt.c:759 2=2x EOF diff --git a/gettext-tools/tests/msgcomm-27 b/gettext-tools/tests/msgcomm-27 index fda523e0b..eefba06a8 100755 --- a/gettext-tools/tests/msgcomm-27 +++ b/gettext-tools/tests/msgcomm-27 @@ -3,7 +3,7 @@ # Test handling of format and 'range:' flag. -cat < mcomm-test27.in1 +cat <<\EOF > mcomm-test27.in1 msgid "one day" msgid_plural "%d days" msgstr[0] "" @@ -28,7 +28,7 @@ msgstr[0] "" msgstr[1] "" EOF -cat < mcomm-test27.in2 +cat <<\EOF > mcomm-test27.in2 #, c-format, range: 1..6 msgid "one day" msgid_plural "%d days" diff --git a/gettext-tools/tests/msgcomm-28 b/gettext-tools/tests/msgcomm-28 index 48f776161..c9b033f6d 100755 --- a/gettext-tools/tests/msgcomm-28 +++ b/gettext-tools/tests/msgcomm-28 @@ -3,13 +3,13 @@ # Test --add-location=file option. -cat < mcomm-test28.in1 +cat <<\EOF > mcomm-test28.in1 #: first.c:123 msgid "1" msgstr "1x" EOF -cat < mcomm-test28.in2 +cat <<\EOF > mcomm-test28.in2 #: hunt.c:759 msgid "2" msgstr "2x" diff --git a/gettext-tools/tests/msgcomm-3 b/gettext-tools/tests/msgcomm-3 index 67baccd49..e877b753a 100755 --- a/gettext-tools/tests/msgcomm-3 +++ b/gettext-tools/tests/msgcomm-3 @@ -3,13 +3,13 @@ # Test --omit-header option when there is no header. -cat < mcomm-test3.in1 +cat <<\EOF > mcomm-test3.in1 #: first.c:123 msgid "1" msgstr "1x" EOF -cat < mcomm-test3.in2 +cat <<\EOF > mcomm-test3.in2 #: hunt.c:759 msgid "2" msgstr "2x" diff --git a/gettext-tools/tests/msgcomm-4 b/gettext-tools/tests/msgcomm-4 index a292da49d..72f86155b 100755 --- a/gettext-tools/tests/msgcomm-4 +++ b/gettext-tools/tests/msgcomm-4 @@ -3,7 +3,7 @@ # Test what happens with the header entry. -cat < mcomm-test4.in1 +cat <<\EOF > mcomm-test4.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -20,7 +20,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test4.in2 +cat <<\EOF > mcomm-test4.in2 #: hunt.c:759 msgid "2" msgstr "2x" diff --git a/gettext-tools/tests/msgcomm-5 b/gettext-tools/tests/msgcomm-5 index 1eb7acd92..71bfcb088 100755 --- a/gettext-tools/tests/msgcomm-5 +++ b/gettext-tools/tests/msgcomm-5 @@ -3,7 +3,7 @@ # Test --omit-header option when there is a header. -cat < mcomm-test5.in1 +cat <<\EOF > mcomm-test5.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -20,7 +20,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test5.in2 +cat <<\EOF > mcomm-test5.in2 #: hunt.c:759 msgid "2" msgstr "2x" diff --git a/gettext-tools/tests/msgcomm-6 b/gettext-tools/tests/msgcomm-6 index 634d8dbc6..c7a9052d6 100755 --- a/gettext-tools/tests/msgcomm-6 +++ b/gettext-tools/tests/msgcomm-6 @@ -3,7 +3,7 @@ # Test --no-location option when there is a header. -cat < mcomm-test6.in1 +cat <<\EOF > mcomm-test6.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -20,7 +20,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test6.in2 +cat <<\EOF > mcomm-test6.in2 #: hunt.c:759 msgid "2" msgstr "2x" diff --git a/gettext-tools/tests/msgcomm-7 b/gettext-tools/tests/msgcomm-7 index b098ec74a..8d74beb12 100755 --- a/gettext-tools/tests/msgcomm-7 +++ b/gettext-tools/tests/msgcomm-7 @@ -3,7 +3,7 @@ # Test --no-location and --omit-header options together. -cat < mcomm-test7.in1 +cat <<\EOF > mcomm-test7.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -20,7 +20,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test7.in2 +cat <<\EOF > mcomm-test7.in2 #: hunt.c:759 msgid "2" msgstr "2x" diff --git a/gettext-tools/tests/msgcomm-8 b/gettext-tools/tests/msgcomm-8 index 582deff80..4e7f52cb9 100755 --- a/gettext-tools/tests/msgcomm-8 +++ b/gettext-tools/tests/msgcomm-8 @@ -3,7 +3,7 @@ # Test merge of common entries with --more-than=1. -cat < mcomm-test8.in1 +cat <<\EOF > mcomm-test8.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -20,7 +20,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test8.in2 +cat <<\EOF > mcomm-test8.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgcomm-9 b/gettext-tools/tests/msgcomm-9 index fdb37b9a3..85e40ce98 100755 --- a/gettext-tools/tests/msgcomm-9 +++ b/gettext-tools/tests/msgcomm-9 @@ -3,7 +3,7 @@ # Test merge of common entries with --more-than=1 and --no-location. -cat < mcomm-test9.in1 +cat <<\EOF > mcomm-test9.in1 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" @@ -20,7 +20,7 @@ msgid "1" msgstr "1x" EOF -cat < mcomm-test9.in2 +cat <<\EOF > mcomm-test9.in2 msgid "" msgstr "" "Project-Id-Version: GNU one 1.2.3\n" diff --git a/gettext-tools/tests/msgen-1 b/gettext-tools/tests/msgen-1 index 893c8cd08..e6e9b4202 100755 --- a/gettext-tools/tests/msgen-1 +++ b/gettext-tools/tests/msgen-1 @@ -3,7 +3,7 @@ # Test general operation. -cat < men-test1.po +cat <<\EOF > men-test1.po # HEADER. # msgid "" @@ -30,7 +30,7 @@ EOF ${MSGEN} -o men-test1.tmp men-test1.po || Exit 1 LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || Exit 1 -cat < men-test1.ok +cat <<\EOF > men-test1.ok # HEADER. # msgid "" diff --git a/gettext-tools/tests/msgen-4 b/gettext-tools/tests/msgen-4 index 4867e9bb9..552de67d2 100755 --- a/gettext-tools/tests/msgen-4 +++ b/gettext-tools/tests/msgen-4 @@ -3,7 +3,7 @@ # Test --add-location=file option. -cat < men-test1.po +cat <<\EOF > men-test1.po # HEADER. # msgid "" @@ -34,7 +34,7 @@ EOF ${MSGEN} --add-location=file -o men-test1.tmp men-test1.po || Exit 1 LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || Exit 1 -cat < men-test1.ok +cat <<\EOF > men-test1.ok # HEADER. # msgid "" diff --git a/gettext-tools/tests/msgfmt-1 b/gettext-tools/tests/msgfmt-1 index 9bed6afd0..3a6def7b3 100755 --- a/gettext-tools/tests/msgfmt-1 +++ b/gettext-tools/tests/msgfmt-1 @@ -6,7 +6,7 @@ test -d mf-1 || mkdir mf-1 test -d mf-1/LC_MESSAGES || mkdir mf-1/LC_MESSAGES -cat < mf-1-module1.po +cat <<\EOF > mf-1-module1.po #default domain "messages.mo" msgid "SYS_(C)\n" msgstr "MSGFMT(3) portable message object file compiler\n" @@ -24,7 +24,7 @@ msgid "error 3" msgstr "error 3 translation" EOF -cat < mf-1-module2.po +cat <<\EOF > mf-1-module2.po # --- #default domain "messages.mo" msgid "mesg 4" @@ -57,7 +57,7 @@ TEXTDOMAINDIR=. LANGUAGE=mf-1 \ ${GETTEXT} --env LC_ALL=en gen 'SYS_(C) ' | LC_ALL=C tr -d '\r' > mf-test1.out -cat < gtmf-test1.ok +cat <<\EOF > gtmf-test1.ok MSGFMT(3) portable message object file compiler Copyright (C) 1995 Free Software Foundation Report bugs to diff --git a/gettext-tools/tests/msgfmt-2 b/gettext-tools/tests/msgfmt-2 index 4f527971b..32a4fa8a7 100755 --- a/gettext-tools/tests/msgfmt-2 +++ b/gettext-tools/tests/msgfmt-2 @@ -18,7 +18,7 @@ fi test -d mf-2 || mkdir mf-2 test -d mf-2/LC_MESSAGES || mkdir mf-2/LC_MESSAGES -cat < mf-2-module1.po +cat <<\EOF > mf-2-module1.po #default domain "messages.mo" msgid "SYS_(C)\n" msgstr "MSGFMT(3) portable message object file compiler\n" @@ -36,7 +36,7 @@ msgid "error 3" msgstr "error 3 translation" EOF -cat < mf-2-module2.po +cat <<\EOF > mf-2-module2.po # --- #default domain "messages.mo" msgid "mesg 4" diff --git a/gettext-tools/tests/msgfmt-20 b/gettext-tools/tests/msgfmt-20 index 4751ce9a8..bbe12e0a8 100755 --- a/gettext-tools/tests/msgfmt-20 +++ b/gettext-tools/tests/msgfmt-20 @@ -66,7 +66,7 @@ test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES : ${MSGFMT=msgfmt} ${MSGFMT} -o fr/LC_MESSAGES/mf-20.mo mf-20.po || Exit 1 -cat < mf-20.ok +cat <<\EOF > mf-20.ok Le soleil tape. EOF diff --git a/gettext-tools/tests/msgfmt-3 b/gettext-tools/tests/msgfmt-3 index aab90b892..449286787 100755 --- a/gettext-tools/tests/msgfmt-3 +++ b/gettext-tools/tests/msgfmt-3 @@ -3,7 +3,7 @@ # Test that an empty header entry is OK. -cat <mf-test3.po +cat <<\EOF >mf-test3.po # # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/gettext-tools/tests/msgfmt-4 b/gettext-tools/tests/msgfmt-4 index 5630257ec..57bf49d06 100755 --- a/gettext-tools/tests/msgfmt-4 +++ b/gettext-tools/tests/msgfmt-4 @@ -3,7 +3,7 @@ # Test c-format handling. -cat <mf-test4.po +cat <<\EOF >mf-test4.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgfmt-6 b/gettext-tools/tests/msgfmt-6 index aededbcba..747f5c82b 100755 --- a/gettext-tools/tests/msgfmt-6 +++ b/gettext-tools/tests/msgfmt-6 @@ -6,7 +6,7 @@ # Note: On AIX 3 with xlc, this test fails. To make it work, add "-qcheck" # to the CFLAGS, or use gcc. -cat < mf-6.po +cat <<\EOF > mf-6.po msgid "" msgstr "" "Project-Id-Version: msgfmt test 4\n" diff --git a/gettext-tools/tests/msgfmt-7 b/gettext-tools/tests/msgfmt-7 index 79717a150..d4e31bb2c 100755 --- a/gettext-tools/tests/msgfmt-7 +++ b/gettext-tools/tests/msgfmt-7 @@ -3,7 +3,7 @@ # Check for duplicates with identical translations -cat < mf-test7.in1 +cat <<\EOF > mf-test7.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgfmt-8 b/gettext-tools/tests/msgfmt-8 index 9ec1c1eae..5aa37d406 100755 --- a/gettext-tools/tests/msgfmt-8 +++ b/gettext-tools/tests/msgfmt-8 @@ -3,7 +3,7 @@ # Check for duplicates with different translations -cat < mf-test8.in1 +cat <<\EOF > mf-test8.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgfmt-9 b/gettext-tools/tests/msgfmt-9 index e3269bc2b..53e1426cf 100755 --- a/gettext-tools/tests/msgfmt-9 +++ b/gettext-tools/tests/msgfmt-9 @@ -3,7 +3,7 @@ # Duplicates are also fatal in obsolete marked entries. -cat < mf-test9.in1 +cat <<\EOF > mf-test9.in1 # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1 index fab406d59..0a5909a98 100755 --- a/gettext-tools/tests/msgfmt-properties-1 +++ b/gettext-tools/tests/msgfmt-properties-1 @@ -37,7 +37,7 @@ TEXTDOMAINDIR=. LANGUAGE=mf-p-1 \ ${GETTEXT} --env LC_ALL=en gen 'SYS_(C) ' | LC_ALL=C tr -d '\r' > mf-p-test1.out -cat < gtmf-p-test1.ok +cat <<\EOF > gtmf-p-test1.ok MSGFMT(3) portable message object file compiler Copyright (C) 1995 Free Software Foundation Report bugs to diff --git a/gettext-tools/tests/msgmerge-1 b/gettext-tools/tests/msgmerge-1 index 141b6be75..502d3ccfc 100755 --- a/gettext-tools/tests/msgmerge-1 +++ b/gettext-tools/tests/msgmerge-1 @@ -3,7 +3,7 @@ # Test general operation and line wrapping. -cat < mm-test1.in1 +cat <<\EOF > mm-test1.in1 # first #. this should be discarded msgid "1" @@ -20,7 +20,7 @@ msgid "3" msgstr "3z" EOF -cat < mm-test1.in2 +cat <<\EOF > mm-test1.in2 #. this is the first #: snark.c:345 msgid "1" diff --git a/gettext-tools/tests/msgmerge-10 b/gettext-tools/tests/msgmerge-10 index 808134683..c4d3de9a9 100755 --- a/gettext-tools/tests/msgmerge-10 +++ b/gettext-tools/tests/msgmerge-10 @@ -4,7 +4,7 @@ # Test merging of a message which has plural forms in ref.pot but not # in def.po. -cat < mm-test10.po +cat <<\EOF > mm-test10.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -26,7 +26,7 @@ msgid "%d error" msgstr "%d erreur" EOF -cat < mm-test10.pot +cat <<\EOF > mm-test10.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -54,7 +54,7 @@ EOF ${MSGMERGE} -q -o mm-test10.tmp mm-test10.po mm-test10.pot || Exit 1 LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out || Exit 1 -cat < mm-test10.ok +cat <<\EOF > mm-test10.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11 index 888855940..137ef3653 100755 --- a/gettext-tools/tests/msgmerge-11 +++ b/gettext-tools/tests/msgmerge-11 @@ -4,7 +4,7 @@ # Test merging of a message which has plural forms in ref.pot but not # in def.po. -cat < mm-test11.po +cat <<\EOF > mm-test11.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -28,7 +28,7 @@ msgid "%d error" msgstr "%d erreur" EOF -cat < mm-test11.pot +cat <<\EOF > mm-test11.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -56,7 +56,7 @@ EOF ${MSGMERGE} -q -o mm-test11.tmp mm-test11.po mm-test11.pot || Exit 1 LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out || Exit 1 -cat < mm-test11.ok +cat <<\EOF > mm-test11.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-12 b/gettext-tools/tests/msgmerge-12 index fb9f52f5c..e100c137f 100755 --- a/gettext-tools/tests/msgmerge-12 +++ b/gettext-tools/tests/msgmerge-12 @@ -4,7 +4,7 @@ # Test merging of a message which has plural forms in def.po but not # in ref.pot. -cat < mm-test12.po +cat <<\EOF > mm-test12.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -28,7 +28,7 @@ msgstr[0] "%d erreur" msgstr[1] "%d erreurs" EOF -cat < mm-test12.pot +cat <<\EOF > mm-test12.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -54,7 +54,7 @@ EOF ${MSGMERGE} -q -o mm-test12.tmp mm-test12.po mm-test12.pot || Exit 1 LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out || Exit 1 -cat < mm-test12.ok +cat <<\EOF > mm-test12.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-13 b/gettext-tools/tests/msgmerge-13 index 4eb9a4df4..f4216dcec 100755 --- a/gettext-tools/tests/msgmerge-13 +++ b/gettext-tools/tests/msgmerge-13 @@ -4,7 +4,7 @@ # Test merging of a message which has c-format specified in ref.pot but not # in def.po. -cat < mm-test13.po +cat <<\EOF > mm-test13.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -43,7 +43,7 @@ msgid "%age" msgstr "%-Satz" EOF -cat < mm-test13.pot +cat <<\EOF > mm-test13.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -87,7 +87,7 @@ EOF ${MSGMERGE} -q -o mm-test13.tmp mm-test13.po mm-test13.pot || Exit 1 LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out || Exit 1 -cat < mm-test13.ok +cat <<\EOF > mm-test13.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-16 b/gettext-tools/tests/msgmerge-16 index cbff31237..c58d978e6 100755 --- a/gettext-tools/tests/msgmerge-16 +++ b/gettext-tools/tests/msgmerge-16 @@ -28,7 +28,7 @@ msgid "error %1." msgstr "b³±d %1." EOF -cat < mm-test16.pot +cat <<\EOF > mm-test16.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Yoyodyne, Inc. # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/msgmerge-2 b/gettext-tools/tests/msgmerge-2 index 8ff513414..28b2cecf6 100755 --- a/gettext-tools/tests/msgmerge-2 +++ b/gettext-tools/tests/msgmerge-2 @@ -3,13 +3,13 @@ # Test recognition of duplicates. -cat < mm-test2.in1 +cat <<\EOF > mm-test2.in1 msgid "2" msgstr "2" msgid "3" msgstr "3" msgid "2" msgstr "ha ha" EOF -cat < mm-test2.in2 +cat <<\EOF > mm-test2.in2 msgid "1" msgstr "" msgid "2" msgstr "" msgid "3" msgstr "" diff --git a/gettext-tools/tests/msgmerge-25 b/gettext-tools/tests/msgmerge-25 index af76b48bf..b19ac6de8 100755 --- a/gettext-tools/tests/msgmerge-25 +++ b/gettext-tools/tests/msgmerge-25 @@ -3,7 +3,7 @@ # Test --add-location=file option. -cat < mm-test25.in1 +cat <<\EOF > mm-test25.in1 # first #. this should be discarded msgid "1" @@ -20,7 +20,7 @@ msgid "3" msgstr "3z" EOF -cat < mm-test25.in2 +cat <<\EOF > mm-test25.in2 #. this is the first #: snark.c:345 msgid "1" diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26 index b86f7a073..1b7f80959 100755 --- a/gettext-tools/tests/msgmerge-26 +++ b/gettext-tools/tests/msgmerge-26 @@ -3,7 +3,7 @@ # Test --for-msgfmt option. -cat < mm-test26.in1 +cat <<\EOF > mm-test26.in1 #: fruits.c:14 msgid "cherry" msgstr "cerise" @@ -22,7 +22,7 @@ msgid "apple" msgstr "pommes" EOF -cat < mm-test26.in2 +cat <<\EOF > mm-test26.in2 # Fuzzy already in the PO file. #: fruits.c:10 msgid "apple" diff --git a/gettext-tools/tests/msgmerge-29 b/gettext-tools/tests/msgmerge-29 index 4213178d8..91298382b 100755 --- a/gettext-tools/tests/msgmerge-29 +++ b/gettext-tools/tests/msgmerge-29 @@ -17,7 +17,7 @@ msgstr "a" #~ msgstr "b" EOF -cat < mm-test29.pot +cat <<\EOF > mm-test29.pot msgid "a" msgstr "" EOF diff --git a/gettext-tools/tests/msgmerge-3 b/gettext-tools/tests/msgmerge-3 index 3c092ed91..c6231fb8a 100755 --- a/gettext-tools/tests/msgmerge-3 +++ b/gettext-tools/tests/msgmerge-3 @@ -3,7 +3,7 @@ # Test handling of obsolete/untranslated messages. -cat < mm-test3.in1 +cat <<\EOF > mm-test3.in1 # # def.po # @@ -32,7 +32,7 @@ msgstr "translation" # trailing comments should be removed EOF -cat < mm-test3.in2 +cat <<\EOF > mm-test3.in2 # # ref.po # diff --git a/gettext-tools/tests/msgmerge-4 b/gettext-tools/tests/msgmerge-4 index 423ea08d9..f48c5e49b 100755 --- a/gettext-tools/tests/msgmerge-4 +++ b/gettext-tools/tests/msgmerge-4 @@ -3,7 +3,7 @@ # Test handling of comments. -cat < mm-test4.in1.po +cat <<\EOF > mm-test4.in1.po msgid "one" msgstr "eins" # This comment should be copied. @@ -16,7 +16,7 @@ msgstr "zwei" #~ msgstr "vier" EOF -cat < mm-test4.in2.po +cat <<\EOF > mm-test4.in2.po msgid "one" msgstr "" # This is a comment in the POT file. @@ -28,7 +28,7 @@ EOF ${MSGMERGE} -q -o mm-test4.tmp mm-test4.in1.po mm-test4.in2.po || Exit 1 LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out || Exit 1 -cat < mm-test4.ok +cat <<\EOF > mm-test4.ok msgid "one" msgstr "eins" diff --git a/gettext-tools/tests/msgmerge-5 b/gettext-tools/tests/msgmerge-5 index 0b25be23c..8f24ab401 100755 --- a/gettext-tools/tests/msgmerge-5 +++ b/gettext-tools/tests/msgmerge-5 @@ -3,7 +3,7 @@ # Test handling of header entry. -cat < mm-test5.in1.po +cat <<\EOF > mm-test5.in1.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. @@ -26,7 +26,7 @@ msgstr "" "blah blah blah blah blah blah blah blah blah blah blah blah blah bla bla bla\n" EOF -cat < mm-test5.in2.po +cat <<\EOF > mm-test5.in2.po msgid "" msgstr "" @@ -44,7 +44,7 @@ cat mm-test5.err | grep -v 'warning: Charset' | grep -v '^ ' test $result = 0 || { Exit 1; } LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out || Exit 1 -cat < mm-test5.ok +cat <<\EOF > mm-test5.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6 index 9b66bc774..46ae3bda5 100755 --- a/gettext-tools/tests/msgmerge-6 +++ b/gettext-tools/tests/msgmerge-6 @@ -24,7 +24,7 @@ msgid "white" msgstr "weiß" EOF -cat < mm-test6.in2.po +cat <<\EOF > mm-test6.in2.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-7 b/gettext-tools/tests/msgmerge-7 index cdc754278..4930fe182 100755 --- a/gettext-tools/tests/msgmerge-7 +++ b/gettext-tools/tests/msgmerge-7 @@ -29,7 +29,7 @@ msgid "bye" msgstr "A bientôt" EOF -cat < mm-test7.pot +cat <<\EOF > mm-test7.pot domain "foo-de" msgid "Hello" msgstr "" diff --git a/gettext-tools/tests/msgmerge-8 b/gettext-tools/tests/msgmerge-8 index c5fb4dced..fdc0c3bf1 100755 --- a/gettext-tools/tests/msgmerge-8 +++ b/gettext-tools/tests/msgmerge-8 @@ -29,7 +29,7 @@ msgid "bye" msgstr "A bientôt" EOF -cat < mm-test8.pot +cat <<\EOF > mm-test8.pot msgid "Hello" msgstr "" EOF diff --git a/gettext-tools/tests/msgmerge-9 b/gettext-tools/tests/msgmerge-9 index 353c74a73..a6e18840a 100755 --- a/gettext-tools/tests/msgmerge-9 +++ b/gettext-tools/tests/msgmerge-9 @@ -3,7 +3,7 @@ # Duplicates are also fatal in obsolete marked entries (cf. msgmerge-3). -cat < mm-test9.in1 +cat <<\EOF > mm-test9.in1 msgid "2" msgstr "2" msgid "3" msgstr "3" #~ msgid @@ -12,7 +12,7 @@ msgid "3" msgstr "3" #~ "ha ha" EOF -cat < mm-test9.in2 +cat <<\EOF > mm-test9.in2 msgid "1" msgstr "" msgid "2" msgstr "" msgid "3" msgstr "" diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1 index 3d4e0086d..1c17de4c7 100755 --- a/gettext-tools/tests/msgmerge-compendium-1 +++ b/gettext-tools/tests/msgmerge-compendium-1 @@ -3,19 +3,19 @@ # Test compendium option. -cat < mm-c-1.in1 +cat <<\EOF > mm-c-1.in1 #: file.c:123 msgid "1" msgstr "1x" EOF -cat < mm-c-1.com +cat <<\EOF > mm-c-1.com #: file.c:345 msgid "2" msgstr "2x" EOF -cat < mm-c-1.pot +cat <<\EOF > mm-c-1.pot #: file.c:123 msgid "1" msgstr "" diff --git a/gettext-tools/tests/msgmerge-compendium-2 b/gettext-tools/tests/msgmerge-compendium-2 index 650075c9c..44a43022b 100755 --- a/gettext-tools/tests/msgmerge-compendium-2 +++ b/gettext-tools/tests/msgmerge-compendium-2 @@ -3,19 +3,19 @@ # Test compendium option with fuzziness. -cat < mm-c-2.in1 +cat <<\EOF > mm-c-2.in1 #: file.c:123 msgid "1" msgstr "1x" EOF -cat < mm-c-2.com +cat <<\EOF > mm-c-2.com #: file.c:345 msgid "one, two, three" msgstr "1, 2, 3" EOF -cat < mm-c-2.pot +cat <<\EOF > mm-c-2.pot #: file.c:123 msgid "1" msgstr "" diff --git a/gettext-tools/tests/msgmerge-compendium-3 b/gettext-tools/tests/msgmerge-compendium-3 index ce4e54319..40949662b 100755 --- a/gettext-tools/tests/msgmerge-compendium-3 +++ b/gettext-tools/tests/msgmerge-compendium-3 @@ -7,7 +7,7 @@ # the old translation file (mm-c-3.in1) contains the same msgid # Why not make use of the translation from the compendium? -cat < mm-c-3.in1 +cat <<\EOF > mm-c-3.in1 #: file.c:123 msgid "1" msgstr "1x" @@ -17,13 +17,13 @@ msgid "one, two, three" msgstr "" EOF -cat < mm-c-3.com +cat <<\EOF > mm-c-3.com #: file.c:345 msgid "one, two, three" msgstr "1, 2, 3" EOF -cat < mm-c-3.pot +cat <<\EOF > mm-c-3.pot #: file.c:123 msgid "1" msgstr "" diff --git a/gettext-tools/tests/msgmerge-compendium-4 b/gettext-tools/tests/msgmerge-compendium-4 index 050664e82..351d3dc94 100755 --- a/gettext-tools/tests/msgmerge-compendium-4 +++ b/gettext-tools/tests/msgmerge-compendium-4 @@ -16,7 +16,7 @@ msgid "5" msgstr "fünf" EOF -cat < mm-c-4.pot +cat <<\EOF > mm-c-4.pot #: file.c:123 msgid "1" msgstr "" diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1 index f7554b638..f1ceddf69 100755 --- a/gettext-tools/tests/msgmerge-properties-1 +++ b/gettext-tools/tests/msgmerge-properties-1 @@ -3,7 +3,7 @@ # Test handling of obsolete/untranslated messages with Java .properties syntax. -cat < mm-p-1.in1 +cat <<\EOF > mm-p-1.in1 # # def.po # @@ -20,7 +20,7 @@ still\ existing=translation # trailing comments should be removed EOF -cat < mm-p-1.in2 +cat <<\EOF > mm-p-1.in2 # # ref.po # diff --git a/gettext-tools/tests/msgmerge-properties-2 b/gettext-tools/tests/msgmerge-properties-2 index 595f0eb18..69d35a7ad 100755 --- a/gettext-tools/tests/msgmerge-properties-2 +++ b/gettext-tools/tests/msgmerge-properties-2 @@ -9,7 +9,7 @@ cat <<\EOF > mm-p-2.po white=wei\u00df EOF -cat < mm-p-2.pot +cat <<\EOF > mm-p-2.pot #. location changed #: cogarithmetic.cc:33 !white= diff --git a/gettext-tools/tests/msgmerge-update-1 b/gettext-tools/tests/msgmerge-update-1 index 11f072a90..b9222d51b 100755 --- a/gettext-tools/tests/msgmerge-update-1 +++ b/gettext-tools/tests/msgmerge-update-1 @@ -31,7 +31,7 @@ msgstr "" "schwarz" EOF -cat < mm-u-1.pot +cat <<\EOF > mm-u-1.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2 index 0c499c40b..b442b2620 100755 --- a/gettext-tools/tests/msgmerge-update-2 +++ b/gettext-tools/tests/msgmerge-update-2 @@ -26,7 +26,7 @@ msgid "white" msgstr "weiß" EOF -cat < mm-u-2.pot +cat <<\EOF > mm-u-2.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-update-3 b/gettext-tools/tests/msgmerge-update-3 index a77606e69..1723659fb 100755 --- a/gettext-tools/tests/msgmerge-update-3 +++ b/gettext-tools/tests/msgmerge-update-3 @@ -27,7 +27,7 @@ msgid "white" msgstr "weiß" EOF -cat < mm-u-3.pot +cat <<\EOF > mm-u-3.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgmerge-update-4 b/gettext-tools/tests/msgmerge-update-4 index 8c4ea69e5..b2b417242 100755 --- a/gettext-tools/tests/msgmerge-update-4 +++ b/gettext-tools/tests/msgmerge-update-4 @@ -30,7 +30,7 @@ msgstr "wei #~ msgstr "grün" EOF -cat < mm-u-4.pot +cat <<\EOF > mm-u-4.pot # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/msgunfmt-1 b/gettext-tools/tests/msgunfmt-1 index 76aa6ac0c..995727e50 100755 --- a/gettext-tools/tests/msgunfmt-1 +++ b/gettext-tools/tests/msgunfmt-1 @@ -3,7 +3,7 @@ # Test of general operation. -cat < mu-test1.in +cat <<\EOF > mu-test1.in msgid "eight" msgstr "eighth" diff --git a/gettext-tools/tests/msgunfmt-2 b/gettext-tools/tests/msgunfmt-2 index 68abd91fc..64976e1e6 100755 --- a/gettext-tools/tests/msgunfmt-2 +++ b/gettext-tools/tests/msgunfmt-2 @@ -6,7 +6,7 @@ # system-dependent strings), yields a PO file with c-format annotation, so that # msgfmt applied to it will again produce a .mo file of major revision 1. -cat < mu-2.in +cat <<\EOF > mu-2.in #, c-format msgid "truncating at % bytes in output file %s" msgstr "schneide bei % Bytes in Ausgabedatei %s ab" diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1 index 2184dbd0e..0d4dc445e 100755 --- a/gettext-tools/tests/msgunfmt-properties-1 +++ b/gettext-tools/tests/msgunfmt-properties-1 @@ -3,7 +3,7 @@ # Test of general operation with Java .properties syntax. -cat < mu-p-1.in +cat <<\EOF > mu-p-1.in eight=eighth five=fifth diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1 index 2f6602c57..02d5fce46 100755 --- a/gettext-tools/tests/plural-1 +++ b/gettext-tools/tests/plural-1 @@ -7,7 +7,7 @@ ${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$wabs_srcdir"/plural-1-prg.c || Exit 1 LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot || Exit 1 -cat < plural-1-cake.ok +cat <<\EOF > plural-1-cake.ok #, c-format msgid "a piece of cake" msgid_plural "%d pieces of cake" @@ -18,7 +18,7 @@ EOF : ${DIFF=diff} ${DIFF} plural-1-cake.ok plural-1-cake.pot || Exit 1 -cat < plural-1-fr.po +cat <<\EOF > plural-1-fr.po # Les gateaux allemands sont les meilleurs du monde. #, c-format msgid "a piece of cake" diff --git a/gettext-tools/tests/plural-2 b/gettext-tools/tests/plural-2 index e9ea320ab..9ed76bd81 100755 --- a/gettext-tools/tests/plural-2 +++ b/gettext-tools/tests/plural-2 @@ -8,7 +8,7 @@ test -d plural-2-dir || mkdir plural-2-dir test -d plural-2-dir/ll || mkdir plural-2-dir/ll test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES -cat < plural-2.data +cat <<\EOF > plural-2.data ja 0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/gettext-tools/tests/xgettext-18 b/gettext-tools/tests/xgettext-18 index fc225622f..3df4e8ea9 100755 --- a/gettext-tools/tests/xgettext-18 +++ b/gettext-tools/tests/xgettext-18 @@ -25,7 +25,7 @@ ${XGETTEXT} --omit-header --no-location -d xg-18.tmp xg-18-a.py xg-18-b.ui \ || Exit 1 LC_ALL=C tr -d '\r' < xg-18.tmp.po > xg-18.po || Exit 1 -cat < xg-18.ok +cat <<\EOF > xg-18.ok #, python-format msgid "Found %(count)d warnings" msgstr "" diff --git a/gettext-tools/tests/xgettext-2 b/gettext-tools/tests/xgettext-2 index 0535a974c..6273be432 100755 --- a/gettext-tools/tests/xgettext-2 +++ b/gettext-tools/tests/xgettext-2 @@ -4,7 +4,7 @@ # Even an empty string is extracted, if not overridden by xgettext's # default-constructed header entry. -cat < xg-test2.in.c +cat <<\EOF > xg-test2.in.c This is a test of the xgettext functionality. /* xgettext:no-c-format */ _("extract me") @@ -25,7 +25,7 @@ EOF ${XGETTEXT} -d xg-test2.tmp -k_ --omit-header --no-location xg-test2.in.c || Exit 1 LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po || Exit 1 -cat < xg-test2.ok +cat <<\EOF > xg-test2.ok #, no-c-format msgid "extract me" msgstr "" diff --git a/gettext-tools/tests/xgettext-3 b/gettext-tools/tests/xgettext-3 index f5e9f902c..9c7fc89c5 100755 --- a/gettext-tools/tests/xgettext-3 +++ b/gettext-tools/tests/xgettext-3 @@ -4,7 +4,7 @@ # When a header entry is provided by xgettext, it overrides any msgid "" # present in the input. -cat < xg-test3.in.c +cat <<\EOF > xg-test3.in.c This is a test of the xgettext functionality. /* xgettext:no-c-format */ _("extract me") @@ -26,7 +26,7 @@ EOF ${XGETTEXT} --output xg-test3.tmp --no-location -k_ xg-test3.in.c 2>/dev/null || Exit 1 sed -e '/\"POT-Creation-Date:.*/d' < xg-test3.tmp | LC_ALL=C tr -d '\r' > xg-test3.po -cat < xg-test3.ok +cat <<\EOF > xg-test3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-4 b/gettext-tools/tests/xgettext-4 index 1adae342f..d11c2cd38 100755 --- a/gettext-tools/tests/xgettext-4 +++ b/gettext-tools/tests/xgettext-4 @@ -3,7 +3,7 @@ # Test --foreign-user -cat < xg-test4.in.c +cat <<\EOF > xg-test4.in.c _("extract me") EOF @@ -12,7 +12,7 @@ EOF ${XGETTEXT} --output xg-test4.tmp --foreign-user --no-location -k_ xg-test4.in.c || Exit 1 sed -e '/\"POT-Creation-Date:.*/d' < xg-test4.tmp | LC_ALL=C tr -d '\r' > xg-test4.po -cat < xg-test4.ok +cat <<\EOF > xg-test4.ok # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # FIRST AUTHOR , YEAR. diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5 index 85be8ef95..67ec3d554 100755 --- a/gettext-tools/tests/xgettext-5 +++ b/gettext-tools/tests/xgettext-5 @@ -3,7 +3,7 @@ # Test extraction of non-ASCII msgids. -cat < xg-test5.c +cat <<\EOF > xg-test5.c void foo (int option) { printf (_("%s: neznámý pøepínaè -- %c\n"), option); @@ -19,7 +19,7 @@ LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po || Exit 1 sed -e '/POT-Creation-Date/d' < xg-test5.po > xg-test5.pot -cat < xg-test5.ok +cat <<\EOF > xg-test5.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-8 b/gettext-tools/tests/xgettext-8 index 8475a899d..b5319b829 100755 --- a/gettext-tools/tests/xgettext-8 +++ b/gettext-tools/tests/xgettext-8 @@ -27,7 +27,7 @@ msgid "@(#)fifo.c\t1.56 04/10/10 Copyright 1989, 1994-2003 J msgstr "ö" EOF -cat < xg-test8.in.c +cat <<\EOF > xg-test8.in.c _("extract me") EOF diff --git a/gettext-tools/tests/xgettext-appdata-1 b/gettext-tools/tests/xgettext-appdata-1 index 6d57e39d7..7f68a5227 100755 --- a/gettext-tools/tests/xgettext-appdata-1 +++ b/gettext-tools/tests/xgettext-appdata-1 @@ -3,7 +3,7 @@ # Test of AppData support. -cat < xg-gs-1-empty.appdata.xml +cat <<\EOF > xg-gs-1-empty.appdata.xml EOF @@ -15,7 +15,7 @@ test $? = 0 || { Exit 77 } -cat < xg-gs-1.appdata.xml +cat <<\EOF > xg-gs-1.appdata.xml @@ -60,7 +60,7 @@ EOF ${XGETTEXT} --add-comments -o xg-gs-1.tmp xg-gs-1.appdata.xml || Exit 1 func_filter_POT_Creation_Date xg-gs-1.tmp xg-gs-1.pot -cat < xg-gs-1.ok +cat <<\EOF > xg-gs-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-awk-1 b/gettext-tools/tests/xgettext-awk-1 index 651ea4e9d..830395891 100755 --- a/gettext-tools/tests/xgettext-awk-1 +++ b/gettext-tools/tests/xgettext-awk-1 @@ -3,7 +3,7 @@ # Test awk support: --add-comments option. -cat < xg-a-1.awk +cat <<\EOF > xg-a-1.awk # This comment will not be extracted. print _"help" # TRANSLATORS: This is an extracted comment. @@ -20,7 +20,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-a-1.tmp xg-a-1.awk || Exit 1 LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po || Exit 1 -cat < xg-a-1.ok +cat <<\EOF > xg-a-1.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-awk-2 b/gettext-tools/tests/xgettext-awk-2 index 4c904c831..0f5d7e2f1 100755 --- a/gettext-tools/tests/xgettext-awk-2 +++ b/gettext-tools/tests/xgettext-awk-2 @@ -17,7 +17,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-a-2.tmp xg-a-2.awk || Exit 1 LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po || Exit 1 -cat < xg-a-2.ok +cat <<\EOF > xg-a-2.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-awk-stackovfl-1 b/gettext-tools/tests/xgettext-awk-stackovfl-1 index fdd37c118..b8f19e0ff 100755 --- a/gettext-tools/tests/xgettext-awk-stackovfl-1 +++ b/gettext-tools/tests/xgettext-awk-stackovfl-1 @@ -3,7 +3,7 @@ # Test awk support: stack overflow prevented by nesting depth check. -cat < xg-a-so-1.awk +cat <<\EOF > xg-a-so-1.awk (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-a-so-1.tmp xg-a-so-1.awk || Exit 1 LC_ALL=C tr -d '\r' < xg-a-so-1.tmp.po > xg-a-so-1.po || Exit 1 -cat < xg-a-so-1.ok +cat <<\EOF > xg-a-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-awk-stackovfl-2 b/gettext-tools/tests/xgettext-awk-stackovfl-2 index 8e1f75c3b..4c6690855 100755 --- a/gettext-tools/tests/xgettext-awk-stackovfl-2 +++ b/gettext-tools/tests/xgettext-awk-stackovfl-2 @@ -3,7 +3,7 @@ # Test awk support: stack overflow prevented by nesting depth check. -cat < xg-a-so-2.awk +cat <<\EOF > xg-a-so-2.awk (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-c-2 b/gettext-tools/tests/xgettext-c-2 index 21d742e54..feb3d83fc 100755 --- a/gettext-tools/tests/xgettext-c-2 +++ b/gettext-tools/tests/xgettext-c-2 @@ -3,7 +3,7 @@ # Test C support: comments meant for xgettext, whitespace, and literals. -cat < xg-c-2.in.c +cat <<\EOF > xg-c-2.in.c This is a test of the xgettext functionality. /* xgettext:no-c-format */ _("extract me") @@ -37,7 +37,7 @@ EOF ${XGETTEXT} -d xg-c-2.tmp -k_ --omit-header --no-location xg-c-2.in.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po || Exit 1 -cat < xg-c-2.ok +cat <<\EOF > xg-c-2.ok #, no-c-format msgid "extract me" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3 index c06c056cb..d6c7e7ed1 100755 --- a/gettext-tools/tests/xgettext-c-3 +++ b/gettext-tools/tests/xgettext-c-3 @@ -3,7 +3,7 @@ # Test C support: recognition of #line. -cat < xg-c-3.in.c +cat <<\EOF > xg-c-3.in.c #line 42 "bozo" main(){printf(gettext("Hello, World!\n"));} # 6 "clown" @@ -14,7 +14,7 @@ EOF ${XGETTEXT} --omit-header --add-location -d xg-c-3.tmp xg-c-3.in.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po || Exit 1 -cat < xg-c-3.ok +cat <<\EOF > xg-c-3.ok #: bozo:42 #, c-format msgid "Hello, World!\n" diff --git a/gettext-tools/tests/xgettext-c-4 b/gettext-tools/tests/xgettext-c-4 index 9f2b1c591..ea1581ddb 100755 --- a/gettext-tools/tests/xgettext-c-4 +++ b/gettext-tools/tests/xgettext-c-4 @@ -3,7 +3,7 @@ # Test C support: --trigraphs option. -cat < xg-c-4.in.c +cat <<\EOF > xg-c-4.in.c main()?? EOF @@ -11,7 +11,7 @@ EOF ${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4.tmp xg-c-4.in.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po || Exit 1 -cat < xg-c-4.ok +cat <<\EOF > xg-c-4.ok #, c-format msgid "Hello, World!\n" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-6 b/gettext-tools/tests/xgettext-c-6 index 54fab0a6a..cf54f3a37 100755 --- a/gettext-tools/tests/xgettext-c-6 +++ b/gettext-tools/tests/xgettext-c-6 @@ -15,7 +15,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-c-6.tmp xg-c-6.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po || Exit 1 -cat < xg-c-6.ok +cat <<\EOF > xg-c-6.ok #, c-format, range: 1..6 msgid "one week and one day" msgid_plural "one week and %d days" diff --git a/gettext-tools/tests/xgettext-c-comment-1 b/gettext-tools/tests/xgettext-c-comment-1 index a8cb39bdb..25cbef368 100755 --- a/gettext-tools/tests/xgettext-c-comment-1 +++ b/gettext-tools/tests/xgettext-c-comment-1 @@ -3,7 +3,7 @@ # Test C support: comments. -cat < xg-c-comment-1.in.cc +cat <<\EOF > xg-c-comment-1.in.cc main(){printf(gettext/*puke*/(/*barf*/"Hello, " "World!" "\n")); } EOF @@ -11,7 +11,7 @@ EOF ${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-comment-1.tmp xg-c-comment-1.in.cc || Exit 1 LC_ALL=C tr -d '\r' < xg-c-comment-1.tmp.po > xg-c-comment-1.po || Exit 1 -cat < xg-c-comment-1.ok +cat <<\EOF > xg-c-comment-1.ok #. puke #. barf #, c-format diff --git a/gettext-tools/tests/xgettext-c-comment-2 b/gettext-tools/tests/xgettext-c-comment-2 index 9eeb01fe5..e2ad9b258 100755 --- a/gettext-tools/tests/xgettext-c-comment-2 +++ b/gettext-tools/tests/xgettext-c-comment-2 @@ -3,7 +3,7 @@ # Test C support: comments. -cat < xg-c-comment-2.c +cat <<\EOF > xg-c-comment-2.c int main() { @@ -41,7 +41,7 @@ EOF ${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-comment-2.tmp xg-c-comment-2.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-comment-2.tmp.po > xg-c-comment-2.po || Exit 1 -cat < xg-c-comment-2.ok +cat <<\EOF > xg-c-comment-2.ok #. This is a comment which immediately before a keyword. msgid "1" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-comment-3 b/gettext-tools/tests/xgettext-c-comment-3 index 0c92a7b66..4e3a70b55 100755 --- a/gettext-tools/tests/xgettext-c-comment-3 +++ b/gettext-tools/tests/xgettext-c-comment-3 @@ -15,7 +15,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-c-comment-3.tmp xg-c-comment-3.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-comment-3.tmp.po > xg-c-comment-3.po || Exit 1 -cat < xg-c-comment-3.ok +cat <<\EOF > xg-c-comment-3.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-c-comment-4 b/gettext-tools/tests/xgettext-c-comment-4 index 6c76d2f90..a060c05bf 100755 --- a/gettext-tools/tests/xgettext-c-comment-4 +++ b/gettext-tools/tests/xgettext-c-comment-4 @@ -3,7 +3,7 @@ # Test C support: --add-comments option. -cat < xg-c-comment-4.in.C +cat <<\EOF > xg-c-comment-4.in.C /* This comment will not be extracted. */ gettext ("help"); @@ -22,7 +22,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=XXX \ -d xg-c-comment-4.tmp xg-c-comment-4.in.C || Exit 1 LC_ALL=C tr -d '\r' < xg-c-comment-4.tmp.po > xg-c-comment-4.po || Exit 1 -cat < xg-c-comment-4.ok +cat <<\EOF > xg-c-comment-4.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-comment-5 b/gettext-tools/tests/xgettext-c-comment-5 index 48d78bdba..78a90fa0a 100755 --- a/gettext-tools/tests/xgettext-c-comment-5 +++ b/gettext-tools/tests/xgettext-c-comment-5 @@ -3,7 +3,7 @@ # Test C support: --add-comments option. -cat < xg-c-comment-5.c +cat <<\EOF > xg-c-comment-5.c // This comment will not be extracted. print (gettext ("help")); // TRANSLATORS: This is an extracted comment. @@ -25,7 +25,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-c-comment-5.tmp xg-c-comment-5.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-comment-5.tmp.po > xg-c-comment-5.po || Exit 1 -cat < xg-c-comment-5.ok +cat <<\EOF > xg-c-comment-5.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-ctxt-1 b/gettext-tools/tests/xgettext-c-ctxt-1 index 5f38098c7..a4cd1605c 100755 --- a/gettext-tools/tests/xgettext-c-ctxt-1 +++ b/gettext-tools/tests/xgettext-c-ctxt-1 @@ -19,7 +19,7 @@ ${XGETTEXT} --omit-header --no-location \ -d xg-c-ctxt-1.tmp xg-c-ctxt-1.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-ctxt-1.tmp.po > xg-c-ctxt-1.po || Exit 1 -cat < xg-c-ctxt-1.ok +cat <<\EOF > xg-c-ctxt-1.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-ctxt-2 b/gettext-tools/tests/xgettext-c-ctxt-2 index 2df778e6f..e922f9e0e 100755 --- a/gettext-tools/tests/xgettext-c-ctxt-2 +++ b/gettext-tools/tests/xgettext-c-ctxt-2 @@ -19,7 +19,7 @@ ${XGETTEXT} --omit-header --no-location \ -d xg-c-ctxt-2.tmp xg-c-ctxt-2.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-ctxt-2.tmp.po > xg-c-ctxt-2.po || Exit 1 -cat < xg-c-ctxt-2.ok +cat <<\EOF > xg-c-ctxt-2.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-ctxt-3 b/gettext-tools/tests/xgettext-c-ctxt-3 index ead038a22..3a81457aa 100755 --- a/gettext-tools/tests/xgettext-c-ctxt-3 +++ b/gettext-tools/tests/xgettext-c-ctxt-3 @@ -16,7 +16,7 @@ ${XGETTEXT} --omit-header --no-location \ -d xg-c-ctxt-3.tmp xg-c-ctxt-3.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-ctxt-3.tmp.po > xg-c-ctxt-3.po || Exit 1 -cat < xg-c-ctxt-3.ok +cat <<\EOF > xg-c-ctxt-3.ok msgctxt "Printer" msgid "Open" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-format-1 b/gettext-tools/tests/xgettext-c-format-1 index ffc0f1b54..98c272a7d 100755 --- a/gettext-tools/tests/xgettext-c-format-1 +++ b/gettext-tools/tests/xgettext-c-format-1 @@ -12,7 +12,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-c-format-1.tmp xg-c-format-1.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-format-1.tmp.po > xg-c-format-1.po || Exit 1 -cat < xg-c-format-1.ok +cat <<\EOF > xg-c-format-1.ok msgid "%1% on, %2% off" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-c-format-2 b/gettext-tools/tests/xgettext-c-format-2 index b1f92320f..389f388d0 100755 --- a/gettext-tools/tests/xgettext-c-format-2 +++ b/gettext-tools/tests/xgettext-c-format-2 @@ -3,7 +3,7 @@ # Test recognition of ISO C 99 format string directives. -cat < xg-c-format-2.c +cat <<\EOF > xg-c-format-2.c void foo () { printf (_("File size is: %" PRId64), size); @@ -17,7 +17,7 @@ EOF ${XGETTEXT} --omit-header --no-location -k_ -o xg-c-format-2.tmp xg-c-format-2.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-format-2.tmp > xg-c-format-2.po || Exit 1 -cat < xg-c-format-2.ok +cat <<\EOF > xg-c-format-2.ok #, c-format msgid "File size is: %" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-format-3 b/gettext-tools/tests/xgettext-c-format-3 index e3a58d3d8..dc49ffdc3 100755 --- a/gettext-tools/tests/xgettext-c-format-3 +++ b/gettext-tools/tests/xgettext-c-format-3 @@ -18,7 +18,7 @@ ${XGETTEXT} --omit-header --no-location -d xg-c-format-3.tmp \ xg-c-format-3.cc || Exit 1 LC_ALL=C tr -d '\r' < xg-c-format-3.tmp.po > xg-c-format-3.po || Exit 1 -cat < xg-c-format-3.ok +cat <<\EOF > xg-c-format-3.ok #, qt-format msgid "on" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-format-4 b/gettext-tools/tests/xgettext-c-format-4 index 021573abd..212604b3c 100755 --- a/gettext-tools/tests/xgettext-c-format-4 +++ b/gettext-tools/tests/xgettext-c-format-4 @@ -19,7 +19,7 @@ ${XGETTEXT} --omit-header --no-location -d xg-c-format-4.tmp --language=C++ --kd xg-c-format-4.cc || Exit 1 LC_ALL=C tr -d '\r' < xg-c-format-4.tmp.po > xg-c-format-4.po || Exit 1 -cat < xg-c-format-4.ok +cat <<\EOF > xg-c-format-4.ok #, c-format, kde-format msgid "used time: %1m %2s" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-format-6 b/gettext-tools/tests/xgettext-c-format-6 index f08b67f40..bee4ae349 100755 --- a/gettext-tools/tests/xgettext-c-format-6 +++ b/gettext-tools/tests/xgettext-c-format-6 @@ -18,7 +18,7 @@ ${XGETTEXT} --omit-header --no-location -kQ_ -kX_ \ -d xg-c-format-6.tmp xg-c-format-6.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-format-6.tmp.po > xg-c-format-6.po || Exit 1 -cat < xg-c-format-6.ok +cat <<\EOF > xg-c-format-6.ok #, c-format msgid "blablaQ %d and %s" msgstr "" diff --git a/gettext-tools/tests/xgettext-c-stackovfl-1 b/gettext-tools/tests/xgettext-c-stackovfl-1 index 98060c45e..04f68d941 100755 --- a/gettext-tools/tests/xgettext-c-stackovfl-1 +++ b/gettext-tools/tests/xgettext-c-stackovfl-1 @@ -3,7 +3,7 @@ # Test C support: stack overflow prevented by nesting depth check. -cat < xg-c-so-1.c +cat <<\EOF > xg-c-so-1.c (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-c-so-1.tmp xg-c-so-1.c || Exit 1 LC_ALL=C tr -d '\r' < xg-c-so-1.tmp.po > xg-c-so-1.po || Exit 1 -cat < xg-c-so-1.ok +cat <<\EOF > xg-c-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-c-stackovfl-2 b/gettext-tools/tests/xgettext-c-stackovfl-2 index 7f37795df..68f46069e 100755 --- a/gettext-tools/tests/xgettext-c-stackovfl-2 +++ b/gettext-tools/tests/xgettext-c-stackovfl-2 @@ -3,7 +3,7 @@ # Test C support: stack overflow prevented by nesting depth check. -cat < xg-c-so-2.c +cat <<\EOF > xg-c-so-2.c (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-combine-1 b/gettext-tools/tests/xgettext-combine-1 index 70e02a7aa..f2131ac2a 100755 --- a/gettext-tools/tests/xgettext-combine-1 +++ b/gettext-tools/tests/xgettext-combine-1 @@ -3,11 +3,11 @@ # Test combining of POT files by merging them. -cat < xg-co-test1-a.c +cat <<\EOF > xg-co-test1-a.c void f () { gettext ("foobar"); } EOF -cat < xg-co-test1-b.py +cat <<\EOF > xg-co-test1-b.py print gettext.gettext("sumsum"); EOF @@ -20,7 +20,7 @@ LC_ALL=C tr -d '\r' < xg-co-test1-all.tmp1 > xg-co-test1-all.tmp2 || Exit 1 sed -e '/POT-Creation-Date/d' < xg-co-test1-all.tmp2 > xg-co-test1-all.pot -cat < xg-co-test1.ok +cat <<\EOF > xg-co-test1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-combine-2 b/gettext-tools/tests/xgettext-combine-2 index 4c5fb7b53..0ee950c6b 100755 --- a/gettext-tools/tests/xgettext-combine-2 +++ b/gettext-tools/tests/xgettext-combine-2 @@ -4,11 +4,11 @@ # Test combining of POT files by using the -j option on a file with # suffix ".pot". -cat < xg-co-test2-a.c +cat <<\EOF > xg-co-test2-a.c void f () { gettext ("foobar"); } EOF -cat < xg-co-test2-b.py +cat <<\EOF > xg-co-test2-b.py print gettext.gettext("sumsum"); EOF @@ -20,7 +20,7 @@ LC_ALL=C tr -d '\r' < xg-co-test2-all-tmp.pot > xg-co-test2-all.tmp2 || Exit 1 sed -e '/POT-Creation-Date/d' < xg-co-test2-all.tmp2 > xg-co-test2-all.pot -cat < xg-co-test2.ok +cat <<\EOF > xg-co-test2.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-combine-3 b/gettext-tools/tests/xgettext-combine-3 index 1fd33f1f3..a0e66fe36 100755 --- a/gettext-tools/tests/xgettext-combine-3 +++ b/gettext-tools/tests/xgettext-combine-3 @@ -5,11 +5,11 @@ # suffix, e.g. with suffix ".po" (as generated by the --default-domain option). # -cat < xg-co-test3-a.c +cat <<\EOF > xg-co-test3-a.c void f () { gettext ("foobar"); } EOF -cat < xg-co-test3-b.py +cat <<\EOF > xg-co-test3-b.py print gettext.gettext("sumsum"); EOF @@ -21,7 +21,7 @@ LC_ALL=C tr -d '\r' < xg-co-test3-all-tmp.po > xg-co-test3-all.tmp2 || Exit 1 sed -e '/POT-Creation-Date/d' < xg-co-test3-all.tmp2 > xg-co-test3-all.pot -cat < xg-co-test3.ok +cat <<\EOF > xg-co-test3.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-csharp-1 b/gettext-tools/tests/xgettext-csharp-1 index cbb3c32f6..92f149707 100755 --- a/gettext-tools/tests/xgettext-csharp-1 +++ b/gettext-tools/tests/xgettext-csharp-1 @@ -3,7 +3,7 @@ # Some tests for C# support -cat < xg-cs-1.cs +cat <<\EOF > xg-cs-1.cs using GNU.Gettext; class TestCase { public TestCase() { @@ -34,7 +34,7 @@ EOF ${XGETTEXT} --omit-header --no-location -c -d xg-cs-1.tmp xg-cs-1.cs || Exit 1 LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po || Exit 1 -cat < xg-cs-1.ok +cat <<\EOF > xg-cs-1.ok #. standard usage msgid "Test String 1" msgstr "" diff --git a/gettext-tools/tests/xgettext-csharp-4 b/gettext-tools/tests/xgettext-csharp-4 index 1fc2ef0c6..426f6fc09 100755 --- a/gettext-tools/tests/xgettext-csharp-4 +++ b/gettext-tools/tests/xgettext-csharp-4 @@ -3,7 +3,7 @@ # Tests for C# plural keyword support -cat < xg-cs-4.cs +cat <<\EOF > xg-cs-4.cs class TestCase { public static void Main (String[] args) { GetPluralString("test 1", "plural test"); @@ -17,7 +17,7 @@ ${XGETTEXT} --omit-header --no-location --keyword=MyPluralString:2,3 \ -d xg-cs-4.tmp xg-cs-4.cs || Exit 1 LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po || Exit 1 -cat < xg-cs-4.ok +cat <<\EOF > xg-cs-4.ok msgid "test 1" msgid_plural "plural test" msgstr[0] "" diff --git a/gettext-tools/tests/xgettext-csharp-5 b/gettext-tools/tests/xgettext-csharp-5 index 2d6b0c41d..a3fd3ec44 100755 --- a/gettext-tools/tests/xgettext-csharp-5 +++ b/gettext-tools/tests/xgettext-csharp-5 @@ -3,7 +3,7 @@ # Test C# support: --add-comments option. -cat < xg-cs-5.cs +cat <<\EOF > xg-cs-5.cs // This comment will not be extracted. Console.WriteLine(GetString("help")); // TRANSLATORS: This is an extracted comment. @@ -25,7 +25,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-cs-5.tmp xg-cs-5.cs || Exit 1 LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po || Exit 1 -cat < xg-cs-5.ok +cat <<\EOF > xg-cs-5.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-csharp-6 b/gettext-tools/tests/xgettext-csharp-6 index 83cf7e529..84dc210cf 100755 --- a/gettext-tools/tests/xgettext-csharp-6 +++ b/gettext-tools/tests/xgettext-csharp-6 @@ -15,7 +15,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-cs-6.tmp xg-cs-6.cs || Exit 1 LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po || Exit 1 -cat < xg-cs-6.ok +cat <<\EOF > xg-cs-6.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-csharp-7 b/gettext-tools/tests/xgettext-csharp-7 index 6cb31f20e..64d675b20 100755 --- a/gettext-tools/tests/xgettext-csharp-7 +++ b/gettext-tools/tests/xgettext-csharp-7 @@ -12,7 +12,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-cs-7.tmp xg-cs-7.cs || Exit 1 LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po || Exit 1 -cat < xg-cs-7.ok +cat <<\EOF > xg-cs-7.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-csharp-stackovfl-1 b/gettext-tools/tests/xgettext-csharp-stackovfl-1 index 9bdb27e53..2b1da6e05 100755 --- a/gettext-tools/tests/xgettext-csharp-stackovfl-1 +++ b/gettext-tools/tests/xgettext-csharp-stackovfl-1 @@ -3,7 +3,7 @@ # Test C# support: stack overflow prevented by nesting depth check. -cat < xg-cs-so-1.cs +cat <<\EOF > xg-cs-so-1.cs (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-cs-so-1.tmp xg-cs-so-1.cs || Exit 1 LC_ALL=C tr -d '\r' < xg-cs-so-1.tmp.po > xg-cs-so-1.po || Exit 1 -cat < xg-cs-so-1.ok +cat <<\EOF > xg-cs-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-csharp-stackovfl-2 b/gettext-tools/tests/xgettext-csharp-stackovfl-2 index 6fb475b7d..206eda90a 100755 --- a/gettext-tools/tests/xgettext-csharp-stackovfl-2 +++ b/gettext-tools/tests/xgettext-csharp-stackovfl-2 @@ -3,7 +3,7 @@ # Test C# support: stack overflow prevented by nesting depth check. -cat < xg-cs-so-2.cs +cat <<\EOF > xg-cs-so-2.cs (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-csharp-stackovfl-3 b/gettext-tools/tests/xgettext-csharp-stackovfl-3 index f1c4c7413..704ed459a 100755 --- a/gettext-tools/tests/xgettext-csharp-stackovfl-3 +++ b/gettext-tools/tests/xgettext-csharp-stackovfl-3 @@ -3,7 +3,7 @@ # Test C# support: stack overflow prevented by nesting depth check. -cat < xg-cs-so-3.cs +cat <<\EOF > xg-cs-so-3.cs {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-cs-so-3.tmp xg-cs-so-3.cs || Exit 1 LC_ALL=C tr -d '\r' < xg-cs-so-3.tmp.po > xg-cs-so-3.po || Exit 1 -cat < xg-cs-so-3.ok +cat <<\EOF > xg-cs-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-csharp-stackovfl-4 b/gettext-tools/tests/xgettext-csharp-stackovfl-4 index 629390809..cbb5d35fb 100755 --- a/gettext-tools/tests/xgettext-csharp-stackovfl-4 +++ b/gettext-tools/tests/xgettext-csharp-stackovfl-4 @@ -3,7 +3,7 @@ # Test C# support: stack overflow prevented by nesting depth check. -cat < xg-cs-so-4.cs +cat <<\EOF > xg-cs-so-4.cs {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ diff --git a/gettext-tools/tests/xgettext-elisp-1 b/gettext-tools/tests/xgettext-elisp-1 index ccb75bcf2..0a7ad13b6 100755 --- a/gettext-tools/tests/xgettext-elisp-1 +++ b/gettext-tools/tests/xgettext-elisp-1 @@ -3,7 +3,7 @@ # Test EmacsLisp support: --add-comments option. -cat < xg-el-1.el +cat <<\EOF > xg-el-1.el ; This comment will not be extracted. (princ (_ "help")) ;; TRANSLATORS: This is an extracted comment. @@ -20,7 +20,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-el-1.tmp xg-el-1.el || Exit 1 LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po || Exit 1 -cat < xg-el-1.ok +cat <<\EOF > xg-el-1.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-elisp-2 b/gettext-tools/tests/xgettext-elisp-2 index e67811d44..4d2873833 100755 --- a/gettext-tools/tests/xgettext-elisp-2 +++ b/gettext-tools/tests/xgettext-elisp-2 @@ -18,7 +18,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-el-2.tmp xg-el-2.el || Exit 1 LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po || Exit 1 -cat < xg-el-2.ok +cat <<\EOF > xg-el-2.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-elisp-stackovfl-1 b/gettext-tools/tests/xgettext-elisp-stackovfl-1 index 5b7c9bc30..2083c584f 100755 --- a/gettext-tools/tests/xgettext-elisp-stackovfl-1 +++ b/gettext-tools/tests/xgettext-elisp-stackovfl-1 @@ -3,7 +3,7 @@ # Test EmacsLisp support: stack overflow prevented by nesting depth check. -cat < xg-el-so-1.el +cat <<\EOF > xg-el-so-1.el (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-el-so-1.tmp xg-el-so-1.el || Exit 1 LC_ALL=C tr -d '\r' < xg-el-so-1.tmp.po > xg-el-so-1.po || Exit 1 -cat < xg-el-so-1.ok +cat <<\EOF > xg-el-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-elisp-stackovfl-2 b/gettext-tools/tests/xgettext-elisp-stackovfl-2 index a8cbcb19c..cdb1cf47d 100755 --- a/gettext-tools/tests/xgettext-elisp-stackovfl-2 +++ b/gettext-tools/tests/xgettext-elisp-stackovfl-2 @@ -3,7 +3,7 @@ # Test EmacsLisp support: stack overflow prevented by nesting depth check. -cat < xg-el-so-2.el +cat <<\EOF > xg-el-so-2.el (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-glade-1 b/gettext-tools/tests/xgettext-glade-1 index 66bab03ee..1a6a5c199 100755 --- a/gettext-tools/tests/xgettext-glade-1 +++ b/gettext-tools/tests/xgettext-glade-1 @@ -3,7 +3,7 @@ # Test of Glade support. -cat < xg-gl-1-empty.glade +cat <<\EOF > xg-gl-1-empty.glade EOF @@ -15,7 +15,7 @@ test $? = 0 || { Exit 77 } -cat < xg-gl-1-widgets.glade +cat <<\EOF > xg-gl-1-widgets.glade @@ -1333,7 +1333,7 @@ EOF ${XGETTEXT} --add-comments -o xg-gl-1.tmp xg-gl-1-widgets.glade || Exit 1 func_filter_POT_Creation_Date xg-gl-1.tmp xg-gl-1.pot -cat < xg-gl-1.ok +cat <<\EOF > xg-gl-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2 index d6856f2f5..7917d503c 100755 --- a/gettext-tools/tests/xgettext-glade-2 +++ b/gettext-tools/tests/xgettext-glade-2 @@ -4,7 +4,7 @@ # Test of Glade support, in particular ISO-8859-1 to UTF-8 conversion # and ASCII entities (< > "). -cat < xg-gl-2-empty.glade +cat <<\EOF > xg-gl-2-empty.glade EOF diff --git a/gettext-tools/tests/xgettext-glade-3 b/gettext-tools/tests/xgettext-glade-3 index 5e6288864..1d2fb643e 100755 --- a/gettext-tools/tests/xgettext-glade-3 +++ b/gettext-tools/tests/xgettext-glade-3 @@ -3,7 +3,7 @@ # Test of Glade 2 support. -cat < xg-gl-3-empty.glade +cat <<\EOF > xg-gl-3-empty.glade EOF @@ -15,7 +15,7 @@ test $? = 0 || { Exit 77 } -cat < xg-gl-3-asciitable.glade2 +cat <<\EOF > xg-gl-3-asciitable.glade2 diff --git a/gettext-tools/tests/xgettext-glade-4 b/gettext-tools/tests/xgettext-glade-4 index b9cbd3cba..03eda94de 100755 --- a/gettext-tools/tests/xgettext-glade-4 +++ b/gettext-tools/tests/xgettext-glade-4 @@ -3,7 +3,7 @@ # Test of Glade 2 support. -cat < xg-gl-4-empty.glade +cat <<\EOF > xg-gl-4-empty.glade EOF @@ -15,7 +15,7 @@ test $? = 0 || { Exit 77 } -cat < xg-gl-4.glade +cat <<\EOF > xg-gl-4.glade @@ -71,7 +71,7 @@ test $result = 0 || { rm -fr $tempfiles; exit $result } -cat < xg-gl-4a.glade +cat <<\EOF > xg-gl-4a.glade diff --git a/gettext-tools/tests/xgettext-glade-5 b/gettext-tools/tests/xgettext-glade-5 index 05719259b..01b17826f 100755 --- a/gettext-tools/tests/xgettext-glade-5 +++ b/gettext-tools/tests/xgettext-glade-5 @@ -3,7 +3,7 @@ # Test of Glade 2 support for msgctxt. -cat < xg-gl-5-empty.glade +cat <<\EOF > xg-gl-5-empty.glade EOF @@ -15,7 +15,7 @@ test $? = 0 || { Exit 77 } -cat < xg-gl-5.glade +cat <<\EOF > xg-gl-5.glade @@ -106,7 +106,7 @@ test $result = 0 || { exit $result } -cat < xg-gl-5b.glade +cat <<\EOF > xg-gl-5b.glade diff --git a/gettext-tools/tests/xgettext-glade-6 b/gettext-tools/tests/xgettext-glade-6 index 84d15ae9b..208111a90 100755 --- a/gettext-tools/tests/xgettext-glade-6 +++ b/gettext-tools/tests/xgettext-glade-6 @@ -5,7 +5,7 @@ # Checks that the extracted pot contains the right translatable # content, comments and context. -cat < xg-gl-6-empty.glade +cat <<\EOF > xg-gl-6-empty.glade EOF @@ -17,7 +17,7 @@ test $? = 0 || { Exit 77 } -cat < xg-gl-6.ui +cat <<\EOF > xg-gl-6.ui @@ -35,7 +35,7 @@ EOF ${XGETTEXT} -o xg-gl-6.tmp xg-gl-6.ui || Exit 1 func_filter_POT_Creation_Date xg-gl-6.tmp xg-gl-6.pot -cat < xg-gl-6.ok +cat <<\EOF > xg-gl-6.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-glade-7 b/gettext-tools/tests/xgettext-glade-7 index 5d751bf2a..f25c48c28 100755 --- a/gettext-tools/tests/xgettext-glade-7 +++ b/gettext-tools/tests/xgettext-glade-7 @@ -5,7 +5,7 @@ # Checks the extraction of a medium size GtkBuilder file, with # comments, context and translatable and not translatable content. -cat < xg-gl-7-empty.glade +cat <<\EOF > xg-gl-7-empty.glade EOF @@ -17,7 +17,7 @@ test $? = 0 || { Exit 77 } -cat < xg-gl-7.ui +cat <<\EOF > xg-gl-7.ui diff --git a/gettext-tools/tests/xgettext-gsettings-1 b/gettext-tools/tests/xgettext-gsettings-1 index 6befd96a4..1bce4daf1 100755 --- a/gettext-tools/tests/xgettext-gsettings-1 +++ b/gettext-tools/tests/xgettext-gsettings-1 @@ -3,7 +3,7 @@ # Test of GSettings support. -cat < xg-gs-1-empty.gschema.xml +cat <<\EOF > xg-gs-1-empty.gschema.xml EOF @@ -15,7 +15,7 @@ test $? = 0 || { Exit 77 } -cat < xg-gs-1.gschema.xml +cat <<\EOF > xg-gs-1.gschema.xml @@ -46,7 +46,7 @@ EOF ${XGETTEXT} --add-comments -o xg-gs-1.tmp xg-gs-1.gschema.xml || Exit 1 func_filter_POT_Creation_Date xg-gs-1.tmp xg-gs-1.pot -cat < xg-gs-1.ok +cat <<\EOF > xg-gs-1.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. diff --git a/gettext-tools/tests/xgettext-java-1 b/gettext-tools/tests/xgettext-java-1 index 53fb5ee0f..50a1bc4c6 100755 --- a/gettext-tools/tests/xgettext-java-1 +++ b/gettext-tools/tests/xgettext-java-1 @@ -4,7 +4,7 @@ # Some tests for java support # -cat < xg-j-1.java +cat <<\EOF > xg-j-1.java class TestCase { public TestCase() { ResourceBundle b = ResourceBundle.getBundle("test"); @@ -32,7 +32,7 @@ EOF ${XGETTEXT} --omit-header --no-location -c -d xg-j-1.tmp xg-j-1.java || Exit 1 LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po || Exit 1 -cat < xg-j-1.ok +cat <<\EOF > xg-j-1.ok #. standard usage msgid "Test String 1" msgstr "" diff --git a/gettext-tools/tests/xgettext-java-3 b/gettext-tools/tests/xgettext-java-3 index b10ccaa7e..74d43ae70 100755 --- a/gettext-tools/tests/xgettext-java-3 +++ b/gettext-tools/tests/xgettext-java-3 @@ -4,7 +4,7 @@ # Some tests for java plural keyword support # -cat < xg-j-3.java +cat <<\EOF > xg-j-3.java class TestCase { public TestCase() { Bundle test = Bundle.getBundle(); @@ -17,7 +17,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-j-3.tmp xg-j-3.java || Exit 1 LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po || Exit 1 -cat < xg-j-3.ok +cat <<\EOF > xg-j-3.ok msgid "test 1" msgid_plural "plural test" msgstr[0] "" diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4 index 321eadaeb..e4c88a23a 100755 --- a/gettext-tools/tests/xgettext-java-4 +++ b/gettext-tools/tests/xgettext-java-4 @@ -4,7 +4,7 @@ # Some tests for java plural keyword support # -cat < xg-j-4.java +cat <<\EOF > xg-j-4.java class TestCase { public TestCase() { Bundle test = Bundle.getBundle(); @@ -18,7 +18,7 @@ ${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 \ -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 -cat < xg-j-4.ok +cat <<\EOF > xg-j-4.ok msgid "test 1" msgid_plural "plural test" msgstr[0] "" diff --git a/gettext-tools/tests/xgettext-java-5 b/gettext-tools/tests/xgettext-java-5 index bd9587fbf..c7240f2c1 100755 --- a/gettext-tools/tests/xgettext-java-5 +++ b/gettext-tools/tests/xgettext-java-5 @@ -3,7 +3,7 @@ # Test Java support: --add-comments option. -cat < xg-j-5.java +cat <<\EOF > xg-j-5.java // This comment will not be extracted. System.out.println(gettext("help")); // TRANSLATORS: This is an extracted comment. @@ -25,7 +25,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-j-5.tmp xg-j-5.java || Exit 1 LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po || Exit 1 -cat < xg-j-5.ok +cat <<\EOF > xg-j-5.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-java-6 b/gettext-tools/tests/xgettext-java-6 index 066cfca4e..47d7de3ae 100755 --- a/gettext-tools/tests/xgettext-java-6 +++ b/gettext-tools/tests/xgettext-java-6 @@ -15,7 +15,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-j-6.tmp xg-j-6.java || Exit 1 LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po || Exit 1 -cat < xg-j-6.ok +cat <<\EOF > xg-j-6.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-java-7 b/gettext-tools/tests/xgettext-java-7 index b61680cf8..caf730200 100755 --- a/gettext-tools/tests/xgettext-java-7 +++ b/gettext-tools/tests/xgettext-java-7 @@ -13,7 +13,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-j-7.tmp xg-j-7.java || Exit 1 LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po || Exit 1 -cat < xg-j-7.ok +cat <<\EOF > xg-j-7.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-java-stackovfl-1 b/gettext-tools/tests/xgettext-java-stackovfl-1 index 3471ecca0..df066b014 100755 --- a/gettext-tools/tests/xgettext-java-stackovfl-1 +++ b/gettext-tools/tests/xgettext-java-stackovfl-1 @@ -3,7 +3,7 @@ # Test Java support: stack overflow prevented by nesting depth check. -cat < xg-j-so-1.java +cat <<\EOF > xg-j-so-1.java (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-j-so-1.tmp xg-j-so-1.java || Exit 1 LC_ALL=C tr -d '\r' < xg-j-so-1.tmp.po > xg-j-so-1.po || Exit 1 -cat < xg-j-so-1.ok +cat <<\EOF > xg-j-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-java-stackovfl-2 b/gettext-tools/tests/xgettext-java-stackovfl-2 index 7939d836f..e134c2766 100755 --- a/gettext-tools/tests/xgettext-java-stackovfl-2 +++ b/gettext-tools/tests/xgettext-java-stackovfl-2 @@ -3,7 +3,7 @@ # Test Java support: stack overflow prevented by nesting depth check. -cat < xg-j-so-2.java +cat <<\EOF > xg-j-so-2.java (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-java-stackovfl-3 b/gettext-tools/tests/xgettext-java-stackovfl-3 index ab39764f6..3fa2240b1 100755 --- a/gettext-tools/tests/xgettext-java-stackovfl-3 +++ b/gettext-tools/tests/xgettext-java-stackovfl-3 @@ -3,7 +3,7 @@ # Test Java support: stack overflow prevented by nesting depth check. -cat < xg-j-so-3.java +cat <<\EOF > xg-j-so-3.java {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-j-so-3.tmp xg-j-so-3.java || Exit 1 LC_ALL=C tr -d '\r' < xg-j-so-3.tmp.po > xg-j-so-3.po || Exit 1 -cat < xg-j-so-3.ok +cat <<\EOF > xg-j-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-java-stackovfl-4 b/gettext-tools/tests/xgettext-java-stackovfl-4 index 63002c3b6..b2a6e45db 100755 --- a/gettext-tools/tests/xgettext-java-stackovfl-4 +++ b/gettext-tools/tests/xgettext-java-stackovfl-4 @@ -3,7 +3,7 @@ # Test Java support: stack overflow prevented by nesting depth check. -cat < xg-j-so-4.java +cat <<\EOF > xg-j-so-4.java {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ diff --git a/gettext-tools/tests/xgettext-javascript-stackovfl-1 b/gettext-tools/tests/xgettext-javascript-stackovfl-1 index 3fd583a1c..8025ca6f8 100755 --- a/gettext-tools/tests/xgettext-javascript-stackovfl-1 +++ b/gettext-tools/tests/xgettext-javascript-stackovfl-1 @@ -3,7 +3,7 @@ # Test JavaScript support: stack overflow prevented by nesting depth check. -cat < xg-js-so-1.js +cat <<\EOF > xg-js-so-1.js (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-js-so-1.tmp xg-js-so-1.js || Exit 1 LC_ALL=C tr -d '\r' < xg-js-so-1.tmp.po > xg-js-so-1.po || Exit 1 -cat < xg-js-so-1.ok +cat <<\EOF > xg-js-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-javascript-stackovfl-2 b/gettext-tools/tests/xgettext-javascript-stackovfl-2 index f8940f98e..817b79c22 100755 --- a/gettext-tools/tests/xgettext-javascript-stackovfl-2 +++ b/gettext-tools/tests/xgettext-javascript-stackovfl-2 @@ -3,7 +3,7 @@ # Test JavaScript support: stack overflow prevented by nesting depth check. -cat < xg-js-so-2.js +cat <<\EOF > xg-js-so-2.js (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-javascript-stackovfl-3 b/gettext-tools/tests/xgettext-javascript-stackovfl-3 index 53e39e46d..90d3aa9cd 100755 --- a/gettext-tools/tests/xgettext-javascript-stackovfl-3 +++ b/gettext-tools/tests/xgettext-javascript-stackovfl-3 @@ -3,7 +3,7 @@ # Test JavaScript support: stack overflow prevented by nesting depth check. -cat < xg-js-so-3.js +cat <<\EOF > xg-js-so-3.js [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-js-so-3.tmp xg-js-so-3.js || Exit 1 LC_ALL=C tr -d '\r' < xg-js-so-3.tmp.po > xg-js-so-3.po || Exit 1 -cat < xg-js-so-3.ok +cat <<\EOF > xg-js-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-javascript-stackovfl-4 b/gettext-tools/tests/xgettext-javascript-stackovfl-4 index 664a81f62..478703749 100755 --- a/gettext-tools/tests/xgettext-javascript-stackovfl-4 +++ b/gettext-tools/tests/xgettext-javascript-stackovfl-4 @@ -3,7 +3,7 @@ # Test JavaScript support: stack overflow prevented by nesting depth check. -cat < xg-js-so-4.js +cat <<\EOF > xg-js-so-4.js [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ diff --git a/gettext-tools/tests/xgettext-javascript-stackovfl-5 b/gettext-tools/tests/xgettext-javascript-stackovfl-5 index 134a82c04..84e7c035c 100755 --- a/gettext-tools/tests/xgettext-javascript-stackovfl-5 +++ b/gettext-tools/tests/xgettext-javascript-stackovfl-5 @@ -3,7 +3,7 @@ # Test JavaScript support: stack overflow prevented by nesting depth check. -cat < xg-js-so-5.js +cat <<\EOF > xg-js-so-5.js {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-js-so-5.tmp xg-js-so-5.js || Exit 1 LC_ALL=C tr -d '\r' < xg-js-so-5.tmp.po > xg-js-so-5.po || Exit 1 -cat < xg-js-so-5.ok +cat <<\EOF > xg-js-so-5.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-javascript-stackovfl-6 b/gettext-tools/tests/xgettext-javascript-stackovfl-6 index 550ce882d..68df9adec 100755 --- a/gettext-tools/tests/xgettext-javascript-stackovfl-6 +++ b/gettext-tools/tests/xgettext-javascript-stackovfl-6 @@ -3,7 +3,7 @@ # Test JavaScript support: stack overflow prevented by nesting depth check. -cat < xg-js-so-6.js +cat <<\EOF > xg-js-so-6.js {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ diff --git a/gettext-tools/tests/xgettext-javascript-stackovfl-7 b/gettext-tools/tests/xgettext-javascript-stackovfl-7 index 2af1e13b4..5209609f0 100755 --- a/gettext-tools/tests/xgettext-javascript-stackovfl-7 +++ b/gettext-tools/tests/xgettext-javascript-stackovfl-7 @@ -3,7 +3,7 @@ # Test JavaScript support: stack overflow prevented by nesting depth check. -cat < xg-js-so-7.js +cat <<\EOF > xg-js-so-7.js @@ -111,7 +111,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-js-so-7.tmp xg-js-so-7.js || Exit 1 LC_ALL=C tr -d '\r' < xg-js-so-7.tmp.po > xg-js-so-7.po || Exit 1 -cat < xg-js-so-7.ok +cat <<\EOF > xg-js-so-7.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-javascript-stackovfl-8 b/gettext-tools/tests/xgettext-javascript-stackovfl-8 index 5d3c617fe..389577070 100755 --- a/gettext-tools/tests/xgettext-javascript-stackovfl-8 +++ b/gettext-tools/tests/xgettext-javascript-stackovfl-8 @@ -3,7 +3,7 @@ # Test JavaScript support: stack overflow prevented by nesting depth check. -cat < xg-js-so-8.js +cat <<\EOF > xg-js-so-8.js diff --git a/gettext-tools/tests/xgettext-librep-1 b/gettext-tools/tests/xgettext-librep-1 index fa89f949d..dd5a9c258 100755 --- a/gettext-tools/tests/xgettext-librep-1 +++ b/gettext-tools/tests/xgettext-librep-1 @@ -3,7 +3,7 @@ # Test librep support: --add-comments option. -cat < xg-lr-1.jl +cat <<\EOF > xg-lr-1.jl ; This comment will not be extracted. (princ (_ "help")) ;; TRANSLATORS: This is an extracted comment. @@ -21,7 +21,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-lr-1.tmp xg-lr-1.jl || Exit 1 LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po || Exit 1 -cat < xg-lr-1.ok +cat <<\EOF > xg-lr-1.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-librep-2 b/gettext-tools/tests/xgettext-librep-2 index 7397a0829..693248a6f 100755 --- a/gettext-tools/tests/xgettext-librep-2 +++ b/gettext-tools/tests/xgettext-librep-2 @@ -15,7 +15,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-lr-2.tmp xg-lr-2.jl || Exit 1 LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po || Exit 1 -cat < xg-lr-2.ok +cat <<\EOF > xg-lr-2.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-librep-stackovfl-1 b/gettext-tools/tests/xgettext-librep-stackovfl-1 index 11fe30aad..1b2fc3d98 100755 --- a/gettext-tools/tests/xgettext-librep-stackovfl-1 +++ b/gettext-tools/tests/xgettext-librep-stackovfl-1 @@ -3,7 +3,7 @@ # Test librep support: stack overflow prevented by nesting depth check. -cat < xg-lr-so-1.jl +cat <<\EOF > xg-lr-so-1.jl (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-lr-so-1.tmp xg-lr-so-1.jl || Exit 1 LC_ALL=C tr -d '\r' < xg-lr-so-1.tmp.po > xg-lr-so-1.po || Exit 1 -cat < xg-lr-so-1.ok +cat <<\EOF > xg-lr-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-librep-stackovfl-2 b/gettext-tools/tests/xgettext-librep-stackovfl-2 index 24c643496..0cb7bd729 100755 --- a/gettext-tools/tests/xgettext-librep-stackovfl-2 +++ b/gettext-tools/tests/xgettext-librep-stackovfl-2 @@ -3,7 +3,7 @@ # Test librep support: stack overflow prevented by nesting depth check. -cat < xg-lr-so-2.jl +cat <<\EOF > xg-lr-so-2.jl (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-lisp-1 b/gettext-tools/tests/xgettext-lisp-1 index acbf3c5b7..5445746d2 100755 --- a/gettext-tools/tests/xgettext-lisp-1 +++ b/gettext-tools/tests/xgettext-lisp-1 @@ -3,7 +3,7 @@ # Test Lisp support: --add-comments option. -cat < xg-ls-1.lisp +cat <<\EOF > xg-ls-1.lisp ; This comment will not be extracted. (write-line (gettext "help")) ;; TRANSLATORS: This is an extracted comment. @@ -21,7 +21,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-ls-1.tmp xg-ls-1.lisp || Exit 1 LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po || Exit 1 -cat < xg-ls-1.ok +cat <<\EOF > xg-ls-1.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-lisp-2 b/gettext-tools/tests/xgettext-lisp-2 index 434336a16..3144d5819 100755 --- a/gettext-tools/tests/xgettext-lisp-2 +++ b/gettext-tools/tests/xgettext-lisp-2 @@ -15,7 +15,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-ls-2.tmp xg-ls-2.lisp || Exit 1 LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po || Exit 1 -cat < xg-ls-2.ok +cat <<\EOF > xg-ls-2.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-lisp-3 b/gettext-tools/tests/xgettext-lisp-3 index 901c245a7..e33d1420b 100755 --- a/gettext-tools/tests/xgettext-lisp-3 +++ b/gettext-tools/tests/xgettext-lisp-3 @@ -3,7 +3,7 @@ # Test Lisp support: lisp-format string with a loop. -cat < xg-ls-3.lisp +cat <<\EOF > xg-ls-3.lisp (gettext "~{~*~}") EOF @@ -11,7 +11,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-ls-3.tmp xg-ls-3.lisp || Exit 1 LC_ALL=C tr -d '\r' < xg-ls-3.tmp.po > xg-ls-3.po || Exit 1 -cat < xg-ls-3.ok +cat <<\EOF > xg-ls-3.ok #, lisp-format msgid "~{~*~}" msgstr "" diff --git a/gettext-tools/tests/xgettext-lisp-4 b/gettext-tools/tests/xgettext-lisp-4 index b8d8b6bfa..1f47d6feb 100755 --- a/gettext-tools/tests/xgettext-lisp-4 +++ b/gettext-tools/tests/xgettext-lisp-4 @@ -3,7 +3,7 @@ # Test Lisp support: lisp-format string with a complex nested loop. -cat < xg-ls-4.lisp +cat <<\EOF > xg-ls-4.lisp (gettext "A~0{B~0b~,v*C~:*D~,v*E~,v*F~0{G~0{H~}I~}J~^~}K") EOF @@ -11,7 +11,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-ls-4.tmp xg-ls-4.lisp || Exit 1 LC_ALL=C tr -d '\r' < xg-ls-4.tmp.po > xg-ls-4.po || Exit 1 -cat < xg-ls-4.ok +cat <<\EOF > xg-ls-4.ok #, lisp-format msgid "A~0{B~0b~,v*C~:*D~,v*E~,v*F~0{G~0{H~}I~}J~^~}K" msgstr "" diff --git a/gettext-tools/tests/xgettext-lisp-5 b/gettext-tools/tests/xgettext-lisp-5 index 0818128d4..4d1edecd6 100755 --- a/gettext-tools/tests/xgettext-lisp-5 +++ b/gettext-tools/tests/xgettext-lisp-5 @@ -3,7 +3,7 @@ # Test Lisp support: lisp-format string with a ~V at an unknown position. -cat < xg-ls-5.lisp +cat <<\EOF > xg-ls-5.lisp (gettext "~@?~v!") EOF @@ -11,7 +11,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-ls-5.tmp xg-ls-5.lisp || Exit 1 LC_ALL=C tr -d '\r' < xg-ls-5.tmp.po > xg-ls-5.po || Exit 1 -cat < xg-ls-5.ok +cat <<\EOF > xg-ls-5.ok #, lisp-format msgid "~@?~v!" msgstr "" diff --git a/gettext-tools/tests/xgettext-lisp-6 b/gettext-tools/tests/xgettext-lisp-6 index bcfbff7d6..c5563c24a 100755 --- a/gettext-tools/tests/xgettext-lisp-6 +++ b/gettext-tools/tests/xgettext-lisp-6 @@ -3,7 +3,7 @@ # Test Lisp support: lisp-format string with initial arguments and a loop. -cat < xg-ls-6.lisp +cat <<\EOF > xg-ls-6.lisp (gettext "~{~}~^~:*~@{~,v*~w~}") EOF @@ -11,7 +11,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-ls-6.tmp xg-ls-6.lisp || Exit 1 LC_ALL=C tr -d '\r' < xg-ls-6.tmp.po > xg-ls-6.po || Exit 1 -cat < xg-ls-6.ok +cat <<\EOF > xg-ls-6.ok #, lisp-format msgid "~{~}~^~:*~@{~,v*~w~}" msgstr "" diff --git a/gettext-tools/tests/xgettext-lisp-stackovfl-1 b/gettext-tools/tests/xgettext-lisp-stackovfl-1 index fe7635ec4..875704643 100755 --- a/gettext-tools/tests/xgettext-lisp-stackovfl-1 +++ b/gettext-tools/tests/xgettext-lisp-stackovfl-1 @@ -3,7 +3,7 @@ # Test Lisp support: stack overflow prevented by nesting depth check. -cat < xg-ls-so-1.lisp +cat <<\EOF > xg-ls-so-1.lisp (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-ls-so-1.tmp xg-ls-so-1.lisp || Exit 1 LC_ALL=C tr -d '\r' < xg-ls-so-1.tmp.po > xg-ls-so-1.po || Exit 1 -cat < xg-ls-so-1.ok +cat <<\EOF > xg-ls-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-lisp-stackovfl-2 b/gettext-tools/tests/xgettext-lisp-stackovfl-2 index b025a92cd..ffc51c8b5 100755 --- a/gettext-tools/tests/xgettext-lisp-stackovfl-2 +++ b/gettext-tools/tests/xgettext-lisp-stackovfl-2 @@ -3,7 +3,7 @@ # Test Lisp support: stack overflow prevented by nesting depth check. -cat < xg-ls-so-2.lisp +cat <<\EOF > xg-ls-so-2.lisp (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-lua-1 b/gettext-tools/tests/xgettext-lua-1 index 7e4715fbc..270d7e224 100755 --- a/gettext-tools/tests/xgettext-lua-1 +++ b/gettext-tools/tests/xgettext-lua-1 @@ -38,7 +38,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-lu-1.tmp xg-lu-1.lua || Exit 1 LC_ALL=C tr -d '\r' < xg-lu-1.tmp.po > xg-lu-1.po || Exit 1 -cat < xg-lu-1.ok +cat <<\EOF > xg-lu-1.ok msgid "This is a test string." msgstr "" diff --git a/gettext-tools/tests/xgettext-lua-2 b/gettext-tools/tests/xgettext-lua-2 index c92cad4e3..df82135ef 100755 --- a/gettext-tools/tests/xgettext-lua-2 +++ b/gettext-tools/tests/xgettext-lua-2 @@ -28,7 +28,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-lu-2.tmp xg-lu-2.lua || Exit 1 LC_ALL=C tr -d '\r' < xg-lu-2.tmp.po > xg-lu-2.po || Exit 1 -cat < xg-lu-2.ok +cat <<\EOF > xg-lu-2.ok msgid "Hmm." msgstr "" diff --git a/gettext-tools/tests/xgettext-lua-stackovfl-1 b/gettext-tools/tests/xgettext-lua-stackovfl-1 index 227855b63..764fb201c 100755 --- a/gettext-tools/tests/xgettext-lua-stackovfl-1 +++ b/gettext-tools/tests/xgettext-lua-stackovfl-1 @@ -3,7 +3,7 @@ # Test Lua support: stack overflow prevented by nesting depth check. -cat < xg-lu-so-1.lua +cat <<\EOF > xg-lu-so-1.lua (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-lu-so-1.tmp xg-lu-so-1.lua || Exit 1 LC_ALL=C tr -d '\r' < xg-lu-so-1.tmp.po > xg-lu-so-1.po || Exit 1 -cat < xg-lu-so-1.ok +cat <<\EOF > xg-lu-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-lua-stackovfl-2 b/gettext-tools/tests/xgettext-lua-stackovfl-2 index eab9fd169..faa5e9a9c 100755 --- a/gettext-tools/tests/xgettext-lua-stackovfl-2 +++ b/gettext-tools/tests/xgettext-lua-stackovfl-2 @@ -3,7 +3,7 @@ # Test Lua support: stack overflow prevented by nesting depth check. -cat < xg-lu-so-2.lua +cat <<\EOF > xg-lu-so-2.lua (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-lua-stackovfl-3 b/gettext-tools/tests/xgettext-lua-stackovfl-3 index 723f03012..4020f2bda 100755 --- a/gettext-tools/tests/xgettext-lua-stackovfl-3 +++ b/gettext-tools/tests/xgettext-lua-stackovfl-3 @@ -3,7 +3,7 @@ # Test Lua support: stack overflow prevented by nesting depth check. -cat < xg-lu-so-3.lua +cat <<\EOF > xg-lu-so-3.lua [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ @@ -71,7 +71,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-lu-so-3.tmp xg-lu-so-3.lua || Exit 1 LC_ALL=C tr -d '\r' < xg-lu-so-3.tmp.po > xg-lu-so-3.po || Exit 1 -cat < xg-lu-so-3.ok +cat <<\EOF > xg-lu-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-lua-stackovfl-4 b/gettext-tools/tests/xgettext-lua-stackovfl-4 index 05a5e2dfa..fe8b5d7f2 100755 --- a/gettext-tools/tests/xgettext-lua-stackovfl-4 +++ b/gettext-tools/tests/xgettext-lua-stackovfl-4 @@ -3,7 +3,7 @@ # Test Lua support: stack overflow prevented by nesting depth check. -cat < xg-lu-so-4.lua +cat <<\EOF > xg-lu-so-4.lua [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ diff --git a/gettext-tools/tests/xgettext-objc-2 b/gettext-tools/tests/xgettext-objc-2 index 21d174c20..c9a9bc8f6 100755 --- a/gettext-tools/tests/xgettext-objc-2 +++ b/gettext-tools/tests/xgettext-objc-2 @@ -3,7 +3,7 @@ # Test ObjectiveC support: --add-comments option. -cat < xg-ob-2.m +cat <<\EOF > xg-ob-2.m // This comment will not be extracted. print (NSLocalizedString (@ "help")); @@ -29,7 +29,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-ob-2.tmp xg-ob-2.m || Exit 1 LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po || Exit 1 -cat < xg-ob-2.ok +cat <<\EOF > xg-ob-2.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-perl-5 b/gettext-tools/tests/xgettext-perl-5 index cc83907ae..6e7bb6308 100755 --- a/gettext-tools/tests/xgettext-perl-5 +++ b/gettext-tools/tests/xgettext-perl-5 @@ -3,7 +3,7 @@ # Test Perl support: --add-comments option. -cat < xg-pl-5.pl +cat <<\EOF > xg-pl-5.pl # This comment will not be extracted. print gettext "help"; # TRANSLATORS: This is an extracted comment. @@ -20,7 +20,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-pl-5.tmp xg-pl-5.pl || Exit 1 LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po || Exit 1 -cat < xg-pl-5.ok +cat <<\EOF > xg-pl-5.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-perl-7 b/gettext-tools/tests/xgettext-perl-7 index 6918587b4..fafbef260 100755 --- a/gettext-tools/tests/xgettext-perl-7 +++ b/gettext-tools/tests/xgettext-perl-7 @@ -19,7 +19,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-pl-7.tmp xg-pl-7.pl || Exit 1 LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po || Exit 1 -cat < xg-pl-7.ok +cat <<\EOF > xg-pl-7.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-perl-stackovfl-1 b/gettext-tools/tests/xgettext-perl-stackovfl-1 index 54b909f16..2d373c535 100755 --- a/gettext-tools/tests/xgettext-perl-stackovfl-1 +++ b/gettext-tools/tests/xgettext-perl-stackovfl-1 @@ -3,7 +3,7 @@ # Test Perl support: stack overflow prevented by nesting depth check. -cat < xg-pl-so-1.pl +cat <<\EOF > xg-pl-so-1.pl [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-pl-so-1.tmp xg-pl-so-1.pl || Exit 1 LC_ALL=C tr -d '\r' < xg-pl-so-1.tmp.po > xg-pl-so-1.po || Exit 1 -cat < xg-pl-so-1.ok +cat <<\EOF > xg-pl-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-perl-stackovfl-2 b/gettext-tools/tests/xgettext-perl-stackovfl-2 index 77dd8d022..b9d0f89d4 100755 --- a/gettext-tools/tests/xgettext-perl-stackovfl-2 +++ b/gettext-tools/tests/xgettext-perl-stackovfl-2 @@ -3,7 +3,7 @@ # Test Perl support: stack overflow prevented by nesting depth check. -cat < xg-pl-so-2.pl +cat <<\EOF > xg-pl-so-2.pl [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ diff --git a/gettext-tools/tests/xgettext-perl-stackovfl-3 b/gettext-tools/tests/xgettext-perl-stackovfl-3 index 6be7ce9f6..b1de3652c 100755 --- a/gettext-tools/tests/xgettext-perl-stackovfl-3 +++ b/gettext-tools/tests/xgettext-perl-stackovfl-3 @@ -3,7 +3,7 @@ # Test Perl support: stack overflow prevented by nesting depth check. -cat < xg-pl-so-3.pl +cat <<\EOF > xg-pl-so-3.pl {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-pl-so-3.tmp xg-pl-so-3.pl || Exit 1 LC_ALL=C tr -d '\r' < xg-pl-so-3.tmp.po > xg-pl-so-3.po || Exit 1 -cat < xg-pl-so-3.ok +cat <<\EOF > xg-pl-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-perl-stackovfl-4 b/gettext-tools/tests/xgettext-perl-stackovfl-4 index ff68ed2a1..3169c7d5a 100755 --- a/gettext-tools/tests/xgettext-perl-stackovfl-4 +++ b/gettext-tools/tests/xgettext-perl-stackovfl-4 @@ -3,7 +3,7 @@ # Test Perl support: stack overflow prevented by nesting depth check. -cat < xg-pl-so-4.pl +cat <<\EOF > xg-pl-so-4.pl {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ diff --git a/gettext-tools/tests/xgettext-php-1 b/gettext-tools/tests/xgettext-php-1 index 09338ae1c..9c9891c4d 100755 --- a/gettext-tools/tests/xgettext-php-1 +++ b/gettext-tools/tests/xgettext-php-1 @@ -3,7 +3,7 @@ # Test PHP support: --add-comments option. -cat < xg-ph-1.php +cat <<\EOF > xg-ph-1.php xg-ph-1.po || Exit 1 -cat < xg-ph-1.ok +cat <<\EOF > xg-ph-1.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-php-2 b/gettext-tools/tests/xgettext-php-2 index 3eb6a92ea..b343ed6a4 100755 --- a/gettext-tools/tests/xgettext-php-2 +++ b/gettext-tools/tests/xgettext-php-2 @@ -3,7 +3,7 @@ # Test PHP support: here documents. -cat < xg-ph-2.php +cat <<\EOF > xg-ph-2.php xg-ph-2d.po || Exit 1 ${XGETTEXT} --omit-header --no-location -d xg-ph-2s.tmp xg-ph-2s.php || Exit 1 LC_ALL=C tr -d '\r' < xg-ph-2s.tmp.po > xg-ph-2s.po || Exit 1 -cat < xg-ph-2.ok +cat <<\EOF > xg-ph-2.ok msgid "Egyptians" msgstr "" diff --git a/gettext-tools/tests/xgettext-php-3 b/gettext-tools/tests/xgettext-php-3 index 056139536..127d3c640 100755 --- a/gettext-tools/tests/xgettext-php-3 +++ b/gettext-tools/tests/xgettext-php-3 @@ -17,7 +17,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-ph-3.tmp xg-ph-3.php || Exit 1 LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po || Exit 1 -cat < xg-ph-3.ok +cat <<\EOF > xg-ph-3.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-php-4 b/gettext-tools/tests/xgettext-php-4 index 842ad31ad..139576361 100755 --- a/gettext-tools/tests/xgettext-php-4 +++ b/gettext-tools/tests/xgettext-php-4 @@ -3,7 +3,7 @@ # Test PHP support: string concatenation. -cat < xg-ph-4.php +cat <<\EOF > xg-ph-4.php xg-ph-4.po || Exit 1 -cat < xg-ph-4.ok +cat <<\EOF > xg-ph-4.ok msgid "foobar" msgstr "" diff --git a/gettext-tools/tests/xgettext-php-stackovfl-1 b/gettext-tools/tests/xgettext-php-stackovfl-1 index 797701074..3f1a91594 100755 --- a/gettext-tools/tests/xgettext-php-stackovfl-1 +++ b/gettext-tools/tests/xgettext-php-stackovfl-1 @@ -3,7 +3,7 @@ # Test PHP support: stack overflow prevented by nesting depth check. -cat < xg-ph-so-1.php +cat <<\EOF > xg-ph-so-1.php xg-ph-so-1.po || Exit 1 -cat < xg-ph-so-1.ok +cat <<\EOF > xg-ph-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-php-stackovfl-2 b/gettext-tools/tests/xgettext-php-stackovfl-2 index 28f1c4073..fd2ff86b1 100755 --- a/gettext-tools/tests/xgettext-php-stackovfl-2 +++ b/gettext-tools/tests/xgettext-php-stackovfl-2 @@ -3,7 +3,7 @@ # Test PHP support: stack overflow prevented by nesting depth check. -cat < xg-ph-so-2.php +cat <<\EOF > xg-ph-so-2.php xg-ph-so-3.php +cat <<\EOF > xg-ph-so-3.php xg-ph-so-3.po || Exit 1 -cat < xg-ph-so-3.ok +cat <<\EOF > xg-ph-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-php-stackovfl-4 b/gettext-tools/tests/xgettext-php-stackovfl-4 index f3ae1b238..e48c39f54 100755 --- a/gettext-tools/tests/xgettext-php-stackovfl-4 +++ b/gettext-tools/tests/xgettext-php-stackovfl-4 @@ -3,7 +3,7 @@ # Test PHP support: stack overflow prevented by nesting depth check. -cat < xg-ph-so-4.php +cat <<\EOF > xg-ph-so-4.php xg-po-1.in.po +cat <<\EOF > xg-po-1.in.po #: file1.c:199 #, fuzzy msgid "extract me" @@ -19,7 +19,7 @@ msgid "hello" msgstr "Again some text for fuzzy" EOF -cat < xg-po-1.c +cat <<\EOF > xg-po-1.c #include #include int @@ -30,7 +30,7 @@ main (int argc, char *argv[]) } EOF -cat < xg-po-1.cc +cat <<\EOF > xg-po-1.cc #include #include #include @@ -47,7 +47,7 @@ ${XGETTEXT} --omit-header -n \ -d xg-po-1.tmp xg-po-1.in.po xg-po-1.c xg-po-1.cc || Exit 1 LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po || Exit 1 -cat < xg-po-1.ok +cat <<\EOF > xg-po-1.ok #: file1.c:199 #, fuzzy msgid "extract me" diff --git a/gettext-tools/tests/xgettext-po-2 b/gettext-tools/tests/xgettext-po-2 index c4bd9d040..0214e70e4 100755 --- a/gettext-tools/tests/xgettext-po-2 +++ b/gettext-tools/tests/xgettext-po-2 @@ -3,7 +3,7 @@ # Test PO extractors with multiple input files. -cat < xg-po-2-1.po +cat <<\EOF > xg-po-2-1.po msgid "first msgid" msgid_plural "first msgid (plural)" msgstr[0] "" @@ -15,7 +15,7 @@ msgstr[0] "" msgstr[1] "" EOF -cat < xg-po-2-2.po +cat <<\EOF > xg-po-2-2.po msgid "third msgid" msgid_plural "third msgid (plural)" msgstr[0] "" @@ -31,7 +31,7 @@ EOF ${XGETTEXT} --omit-header xg-po-2-1.po xg-po-2-2.po -o xg-po-2.tmp.po || Exit 1 LC_ALL=C tr -d '\r' < xg-po-2.tmp.po > xg-po-2.po || Exit 1 -cat < xg-po-2.ok +cat <<\EOF > xg-po-2.ok msgid "first msgid" msgid_plural "first msgid (plural)" msgstr[0] "" diff --git a/gettext-tools/tests/xgettext-properties-1 b/gettext-tools/tests/xgettext-properties-1 index 1261944a1..7862ce4a0 100755 --- a/gettext-tools/tests/xgettext-properties-1 +++ b/gettext-tools/tests/xgettext-properties-1 @@ -3,7 +3,7 @@ # Test C, C++, JavaProperties extractors. -cat < xg-pr-1.in.properties +cat <<\EOF > xg-pr-1.in.properties #: file1.c:199 #, fuzzy !extract\ me=some text to get fuzzy copied to result @@ -16,7 +16,7 @@ cat < xg-pr-1.in.properties !hello=Again some text for fuzzy EOF -cat < xg-pr-1.c +cat <<\EOF > xg-pr-1.c #include #include int @@ -27,7 +27,7 @@ main (int argc, char *argv[]) } EOF -cat < xg-pr-1.cc +cat <<\EOF > xg-pr-1.cc #include #include #include @@ -44,7 +44,7 @@ ${XGETTEXT} --omit-header -n \ -d xg-pr-1.tmp xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc || Exit 1 LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po || Exit 1 -cat < xg-pr-1.ok +cat <<\EOF > xg-pr-1.ok #: file1.c:199 #, fuzzy msgid "extract me" diff --git a/gettext-tools/tests/xgettext-python-2 b/gettext-tools/tests/xgettext-python-2 index 2b3d739e0..5aec46a50 100755 --- a/gettext-tools/tests/xgettext-python-2 +++ b/gettext-tools/tests/xgettext-python-2 @@ -3,7 +3,7 @@ # Test Python support: --add-comments option. -cat < xg-py-2.py +cat <<\EOF > xg-py-2.py # This comment will not be extracted. print gettext.gettext("help") # TRANSLATORS: This is an extracted comment. @@ -24,7 +24,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-py-2.tmp xg-py-2.py || Exit 1 LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po || Exit 1 -cat < xg-py-2.ok +cat <<\EOF > xg-py-2.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-python-4 b/gettext-tools/tests/xgettext-python-4 index e1f5cd5f3..f0599bb5f 100755 --- a/gettext-tools/tests/xgettext-python-4 +++ b/gettext-tools/tests/xgettext-python-4 @@ -17,7 +17,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-py-4.tmp xg-py-4.py || Exit 1 LC_ALL=C tr -d '\r' < xg-py-4.tmp.po > xg-py-4.po || Exit 1 -cat < xg-py-4.ok +cat <<\EOF > xg-py-4.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-python-6 b/gettext-tools/tests/xgettext-python-6 index 72657a0bb..697f77900 100755 --- a/gettext-tools/tests/xgettext-python-6 +++ b/gettext-tools/tests/xgettext-python-6 @@ -11,7 +11,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-py-6.tmp xg-py-6.py || Exit 1 LC_ALL=C tr -d '\r' < xg-py-6.tmp.po > xg-py-6.po || Exit 1 -cat < xg-py-6.ok +cat <<\EOF > xg-py-6.ok msgid "{0:" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-python-7 b/gettext-tools/tests/xgettext-python-7 index 2b98ac6c1..454eeb26d 100755 --- a/gettext-tools/tests/xgettext-python-7 +++ b/gettext-tools/tests/xgettext-python-7 @@ -14,7 +14,7 @@ ${XGETTEXT} --flag=my_old_format:1:python-format \ --omit-header --no-location -d xg-py-7.tmp xg-py-7.py || Exit 1 LC_ALL=C tr -d '\r' < xg-py-7.tmp.po > xg-py-7.po || Exit 1 -cat < xg-py-7.ok +cat <<\EOF > xg-py-7.ok #, python-format msgid "blaold %d and %s" msgstr "" diff --git a/gettext-tools/tests/xgettext-python-stackovfl-1 b/gettext-tools/tests/xgettext-python-stackovfl-1 index a38a25fb9..83ec38782 100755 --- a/gettext-tools/tests/xgettext-python-stackovfl-1 +++ b/gettext-tools/tests/xgettext-python-stackovfl-1 @@ -3,7 +3,7 @@ # Test Python support: stack overflow prevented by nesting depth check. -cat < xg-py-so-1.py +cat <<\EOF > xg-py-so-1.py (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-py-so-1.tmp xg-py-so-1.py || Exit 1 LC_ALL=C tr -d '\r' < xg-py-so-1.tmp.po > xg-py-so-1.po || Exit 1 -cat < xg-py-so-1.ok +cat <<\EOF > xg-py-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-python-stackovfl-2 b/gettext-tools/tests/xgettext-python-stackovfl-2 index 706244292..0abdf34c8 100755 --- a/gettext-tools/tests/xgettext-python-stackovfl-2 +++ b/gettext-tools/tests/xgettext-python-stackovfl-2 @@ -3,7 +3,7 @@ # Test Python support: stack overflow prevented by nesting depth check. -cat < xg-py-so-2.py +cat <<\EOF > xg-py-so-2.py (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-python-stackovfl-3 b/gettext-tools/tests/xgettext-python-stackovfl-3 index 01e0f3821..d53b1fcd1 100755 --- a/gettext-tools/tests/xgettext-python-stackovfl-3 +++ b/gettext-tools/tests/xgettext-python-stackovfl-3 @@ -3,7 +3,7 @@ # Test Python support: stack overflow prevented by nesting depth check. -cat < xg-py-so-3.py +cat <<\EOF > xg-py-so-3.py [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-py-so-3.tmp xg-py-so-3.py || Exit 1 LC_ALL=C tr -d '\r' < xg-py-so-3.tmp.po > xg-py-so-3.po || Exit 1 -cat < xg-py-so-3.ok +cat <<\EOF > xg-py-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-python-stackovfl-4 b/gettext-tools/tests/xgettext-python-stackovfl-4 index ed290474d..0d879f2f8 100755 --- a/gettext-tools/tests/xgettext-python-stackovfl-4 +++ b/gettext-tools/tests/xgettext-python-stackovfl-4 @@ -3,7 +3,7 @@ # Test Python support: stack overflow prevented by nesting depth check. -cat < xg-py-so-4.py +cat <<\EOF > xg-py-so-4.py [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ diff --git a/gettext-tools/tests/xgettext-scheme-1 b/gettext-tools/tests/xgettext-scheme-1 index 576bb5166..797650d12 100755 --- a/gettext-tools/tests/xgettext-scheme-1 +++ b/gettext-tools/tests/xgettext-scheme-1 @@ -3,7 +3,7 @@ # Test Scheme support: --add-comments option. -cat < xg-sc-1.scm +cat <<\EOF > xg-sc-1.scm ; This comment will not be extracted. (display (_ "help")) ;; TRANSLATORS: This is an extracted comment. @@ -18,7 +18,7 @@ ${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-sc-1.tmp xg-sc-1.scm || Exit 1 LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po || Exit 1 -cat < xg-sc-1.ok +cat <<\EOF > xg-sc-1.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-scheme-2 b/gettext-tools/tests/xgettext-scheme-2 index 8c7fbb811..9b04bb35a 100755 --- a/gettext-tools/tests/xgettext-scheme-2 +++ b/gettext-tools/tests/xgettext-scheme-2 @@ -3,14 +3,14 @@ # Test Scheme support: strings outside any function call. -cat < xg-sc-2.scm +cat <<\EOF > xg-sc-2.scm (define foo '("bar" "quux")) EOF : ${XGETTEXT=xgettext} ${XGETTEXT} -k_ --omit-header --no-location --force-po -d xg-sc-2 xg-sc-2.scm || Exit 1 -cat < xg-sc-2.ok +cat <<\EOF > xg-sc-2.ok EOF : ${DIFF=diff} diff --git a/gettext-tools/tests/xgettext-scheme-3 b/gettext-tools/tests/xgettext-scheme-3 index fe28ebbc7..82127886c 100755 --- a/gettext-tools/tests/xgettext-scheme-3 +++ b/gettext-tools/tests/xgettext-scheme-3 @@ -18,7 +18,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-sc-3.tmp xg-sc-3.scm || Exit 1 LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po || Exit 1 -cat < xg-sc-3.ok +cat <<\EOF > xg-sc-3.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-scheme-4 b/gettext-tools/tests/xgettext-scheme-4 index 1851a46b1..32051abac 100755 --- a/gettext-tools/tests/xgettext-scheme-4 +++ b/gettext-tools/tests/xgettext-scheme-4 @@ -3,7 +3,7 @@ # Test Scheme support: GIMP script-fu extension _"..." -cat < xg-sc-4.scm +cat <<\EOF > xg-sc-4.scm (script-fu-register "script-fu-paste-as-brush" _"New _Brush..." _"Paste the clipboard contents into a new brush" @@ -22,7 +22,7 @@ ${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-sc-4.tmp xg-sc-4.scm || Exit 1 LC_ALL=C tr -d '\r' < xg-sc-4.tmp.po > xg-sc-4.po || Exit 1 -cat < xg-sc-4.ok +cat <<\EOF > xg-sc-4.ok msgid "New _Brush..." msgstr "" diff --git a/gettext-tools/tests/xgettext-scheme-5 b/gettext-tools/tests/xgettext-scheme-5 index 9d9284585..26cd2adc5 100755 --- a/gettext-tools/tests/xgettext-scheme-5 +++ b/gettext-tools/tests/xgettext-scheme-5 @@ -3,7 +3,7 @@ # Test Scheme support: scheme-format string with a loop. -cat < xg-sc-5.scm +cat <<\EOF > xg-sc-5.scm (_ "~{~*~}") EOF @@ -11,7 +11,7 @@ EOF ${XGETTEXT} -k_ --omit-header --no-location -d xg-sc-5.tmp xg-sc-5.scm || Exit 1 LC_ALL=C tr -d '\r' < xg-sc-5.tmp.po > xg-sc-5.po || Exit 1 -cat < xg-sc-5.ok +cat <<\EOF > xg-sc-5.ok #, scheme-format msgid "~{~*~}" msgstr "" diff --git a/gettext-tools/tests/xgettext-scheme-6 b/gettext-tools/tests/xgettext-scheme-6 index f91ca43a9..6926acf5a 100755 --- a/gettext-tools/tests/xgettext-scheme-6 +++ b/gettext-tools/tests/xgettext-scheme-6 @@ -3,7 +3,7 @@ # Test Scheme support: scheme-format string with a complex nested loop. -cat < xg-sc-6.scm +cat <<\EOF > xg-sc-6.scm (_ "A~0{B~0b~,v*C~:*D~,v*E~,v*F~0{G~0{H~}I~}J~^~}K") EOF @@ -11,7 +11,7 @@ EOF ${XGETTEXT} -k_ --omit-header --no-location -d xg-sc-6.tmp xg-sc-6.scm || Exit 1 LC_ALL=C tr -d '\r' < xg-sc-6.tmp.po > xg-sc-6.po || Exit 1 -cat < xg-sc-6.ok +cat <<\EOF > xg-sc-6.ok #, scheme-format msgid "A~0{B~0b~,v*C~:*D~,v*E~,v*F~0{G~0{H~}I~}J~^~}K" msgstr "" diff --git a/gettext-tools/tests/xgettext-scheme-stackovfl-1 b/gettext-tools/tests/xgettext-scheme-stackovfl-1 index bb8700032..f054ac5db 100755 --- a/gettext-tools/tests/xgettext-scheme-stackovfl-1 +++ b/gettext-tools/tests/xgettext-scheme-stackovfl-1 @@ -3,7 +3,7 @@ # Test Scheme support: stack overflow prevented by nesting depth check. -cat < xg-sc-so-1.scm +cat <<\EOF > xg-sc-so-1.scm (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} -k_ --omit-header --no-location -d xg-sc-so-1.tmp xg-sc-so-1.scm || Exit 1 LC_ALL=C tr -d '\r' < xg-sc-so-1.tmp.po > xg-sc-so-1.po || Exit 1 -cat < xg-sc-so-1.ok +cat <<\EOF > xg-sc-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-scheme-stackovfl-2 b/gettext-tools/tests/xgettext-scheme-stackovfl-2 index a487ec30e..1b4e0a88d 100755 --- a/gettext-tools/tests/xgettext-scheme-stackovfl-2 +++ b/gettext-tools/tests/xgettext-scheme-stackovfl-2 @@ -3,7 +3,7 @@ # Test Scheme support: stack overflow prevented by nesting depth check. -cat < xg-sc-so-2.scm +cat <<\EOF > xg-sc-so-2.scm (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-sh-2 b/gettext-tools/tests/xgettext-sh-2 index a4b7e8d0b..06c7883e4 100755 --- a/gettext-tools/tests/xgettext-sh-2 +++ b/gettext-tools/tests/xgettext-sh-2 @@ -3,7 +3,7 @@ # Test Shell support: --add-comments option. -cat < xg-sh-2.sh +cat <<\EOF > xg-sh-2.sh # This comment will not be extracted. gettext "help" # TRANSLATORS: This is an extracted comment. @@ -20,7 +20,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-sh-2.tmp xg-sh-2.sh || Exit 1 LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po || Exit 1 -cat < xg-sh-2.ok +cat <<\EOF > xg-sh-2.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-sh-6 b/gettext-tools/tests/xgettext-sh-6 index 656781df7..0daf5b628 100755 --- a/gettext-tools/tests/xgettext-sh-6 +++ b/gettext-tools/tests/xgettext-sh-6 @@ -13,7 +13,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-sh-6.tmp xg-sh-6.sh || Exit 1 LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po || Exit 1 -cat < xg-sh-6.ok +cat <<\EOF > xg-sh-6.ok #. a msgid "hello world" msgstr "" diff --git a/gettext-tools/tests/xgettext-sh-stackovfl-1 b/gettext-tools/tests/xgettext-sh-stackovfl-1 index e33ee686b..cb323e915 100755 --- a/gettext-tools/tests/xgettext-sh-stackovfl-1 +++ b/gettext-tools/tests/xgettext-sh-stackovfl-1 @@ -71,7 +71,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-sh-so-1.tmp xg-sh-so-1.sh || Exit 1 LC_ALL=C tr -d '\r' < xg-sh-so-1.tmp.po > xg-sh-so-1.po || Exit 1 -cat < xg-sh-so-1.ok +cat <<\EOF > xg-sh-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-sh-stackovfl-3 b/gettext-tools/tests/xgettext-sh-stackovfl-3 index a8ded6c8f..13b939ab1 100755 --- a/gettext-tools/tests/xgettext-sh-stackovfl-3 +++ b/gettext-tools/tests/xgettext-sh-stackovfl-3 @@ -3,7 +3,7 @@ # Test Shell support: stack overflow prevented by nesting depth check. -cat < xg-sh-so-3.sh +cat <<\EOF > xg-sh-so-3.sh x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<( x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<( x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<(x<( diff --git a/gettext-tools/tests/xgettext-sh-stackovfl-4 b/gettext-tools/tests/xgettext-sh-stackovfl-4 index ee7c2b33b..bf158ee43 100755 --- a/gettext-tools/tests/xgettext-sh-stackovfl-4 +++ b/gettext-tools/tests/xgettext-sh-stackovfl-4 @@ -3,7 +3,7 @@ # Test Shell support: stack overflow prevented by nesting depth check. -cat < xg-sh-so-4.sh +cat <<\EOF > xg-sh-so-4.sh x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>( x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>( x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>(x>( diff --git a/gettext-tools/tests/xgettext-sh-stackovfl-5 b/gettext-tools/tests/xgettext-sh-stackovfl-5 index 11a918829..385a2383f 100755 --- a/gettext-tools/tests/xgettext-sh-stackovfl-5 +++ b/gettext-tools/tests/xgettext-sh-stackovfl-5 @@ -4091,7 +4091,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-sh-so-5.tmp xg-sh-so-5.sh || Exit 1 LC_ALL=C tr -d '\r' < xg-sh-so-5.tmp.po > xg-sh-so-5.po || Exit 1 -cat < xg-sh-so-5.ok +cat <<\EOF > xg-sh-so-5.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-smalltalk-1 b/gettext-tools/tests/xgettext-smalltalk-1 index b94938025..46dea6816 100755 --- a/gettext-tools/tests/xgettext-smalltalk-1 +++ b/gettext-tools/tests/xgettext-smalltalk-1 @@ -3,7 +3,7 @@ # Test Smalltalk support: --add-comments option. -cat < xg-st-1.st +cat <<\EOF > xg-st-1.st "This comment will not be extracted." Transcript showCr: (NLS ? 'help'). " TRANSLATORS: This is an extracted comment." @@ -21,7 +21,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-st-1.tmp xg-st-1.st || Exit 1 LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po || Exit 1 -cat < xg-st-1.ok +cat <<\EOF > xg-st-1.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-smalltalk-2 b/gettext-tools/tests/xgettext-smalltalk-2 index 01d61fa98..64bed548f 100755 --- a/gettext-tools/tests/xgettext-smalltalk-2 +++ b/gettext-tools/tests/xgettext-smalltalk-2 @@ -17,7 +17,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location \ -d xg-st-2.tmp xg-st-2.st || Exit 1 LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po || Exit 1 -cat < xg-st-2.ok +cat <<\EOF > xg-st-2.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-tcl-2 b/gettext-tools/tests/xgettext-tcl-2 index bbacdf8ad..13aa98305 100755 --- a/gettext-tools/tests/xgettext-tcl-2 +++ b/gettext-tools/tests/xgettext-tcl-2 @@ -3,7 +3,7 @@ # Test Tcl support: --add-comments option. -cat < xg-t-2.tcl +cat <<\EOF > xg-t-2.tcl # This comment will not be extracted. puts [_ "help"] # TRANSLATORS: This is an extracted comment. @@ -20,7 +20,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: -k_ \ -d xg-t-2.tmp xg-t-2.tcl || Exit 1 LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po || Exit 1 -cat < xg-t-2.ok +cat <<\EOF > xg-t-2.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-tcl-3 b/gettext-tools/tests/xgettext-tcl-3 index fd60c7437..74c04b6d7 100755 --- a/gettext-tools/tests/xgettext-tcl-3 +++ b/gettext-tools/tests/xgettext-tcl-3 @@ -14,7 +14,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-t-3.tmp xg-t-3.tcl || Exit 1 LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po || Exit 1 -cat < xg-t-3.ok +cat <<\EOF > xg-t-3.ok #. a msgid "hello world" msgstr "" diff --git a/gettext-tools/tests/xgettext-tcl-stackovfl-1 b/gettext-tools/tests/xgettext-tcl-stackovfl-1 index 95005d619..3e45c1b68 100755 --- a/gettext-tools/tests/xgettext-tcl-stackovfl-1 +++ b/gettext-tools/tests/xgettext-tcl-stackovfl-1 @@ -3,7 +3,7 @@ # Test Tcl support: stack overflow prevented by nesting depth check. -cat < xg-t-so-1.tcl +cat <<\EOF > xg-t-so-1.tcl [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} -k_ --omit-header --no-location -d xg-t-so-1.tmp xg-t-so-1.tcl || Exit 1 LC_ALL=C tr -d '\r' < xg-t-so-1.tmp.po > xg-t-so-1.po || Exit 1 -cat < xg-t-so-1.ok +cat <<\EOF > xg-t-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-tcl-stackovfl-2 b/gettext-tools/tests/xgettext-tcl-stackovfl-2 index c41ae7f79..bc6ca6b6b 100755 --- a/gettext-tools/tests/xgettext-tcl-stackovfl-2 +++ b/gettext-tools/tests/xgettext-tcl-stackovfl-2 @@ -3,7 +3,7 @@ # Test Tcl support: stack overflow prevented by nesting depth check. -cat < xg-t-so-2.tcl +cat <<\EOF > xg-t-so-2.tcl [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ diff --git a/gettext-tools/tests/xgettext-tcl-stackovfl-3 b/gettext-tools/tests/xgettext-tcl-stackovfl-3 index 2afa0147a..64636d8cf 100755 --- a/gettext-tools/tests/xgettext-tcl-stackovfl-3 +++ b/gettext-tools/tests/xgettext-tcl-stackovfl-3 @@ -3,7 +3,7 @@ # Test Tcl support: stack overflow prevented by nesting depth check. -cat < xg-t-so-3.tcl +cat <<\EOF > xg-t-so-3.tcl {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ @@ -51,7 +51,7 @@ EOF ${XGETTEXT} -k_ --omit-header --no-location -d xg-t-so-3.tmp xg-t-so-3.tcl || Exit 1 LC_ALL=C tr -d '\r' < xg-t-so-3.tmp.po > xg-t-so-3.po || Exit 1 -cat < xg-t-so-3.ok +cat <<\EOF > xg-t-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-tcl-stackovfl-4 b/gettext-tools/tests/xgettext-tcl-stackovfl-4 index 34a37ab63..d8ee44ed2 100755 --- a/gettext-tools/tests/xgettext-tcl-stackovfl-4 +++ b/gettext-tools/tests/xgettext-tcl-stackovfl-4 @@ -3,7 +3,7 @@ # Test Tcl support: stack overflow prevented by nesting depth check. -cat < xg-t-so-4.tcl +cat <<\EOF > xg-t-so-4.tcl {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ diff --git a/gettext-tools/tests/xgettext-vala-stackovfl-1 b/gettext-tools/tests/xgettext-vala-stackovfl-1 index 9894418b1..fe500e36c 100755 --- a/gettext-tools/tests/xgettext-vala-stackovfl-1 +++ b/gettext-tools/tests/xgettext-vala-stackovfl-1 @@ -3,7 +3,7 @@ # Test Vala support: stack overflow prevented by nesting depth check. -cat < xg-vala-so-1.vala +cat <<\EOF > xg-vala-so-1.vala (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-vala-so-1.tmp xg-vala-so-1.vala || Exit 1 LC_ALL=C tr -d '\r' < xg-vala-so-1.tmp.po > xg-vala-so-1.po || Exit 1 -cat < xg-vala-so-1.ok +cat <<\EOF > xg-vala-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-vala-stackovfl-2 b/gettext-tools/tests/xgettext-vala-stackovfl-2 index 44121b995..a136619b3 100755 --- a/gettext-tools/tests/xgettext-vala-stackovfl-2 +++ b/gettext-tools/tests/xgettext-vala-stackovfl-2 @@ -3,7 +3,7 @@ # Test Vala support: stack overflow prevented by nesting depth check. -cat < xg-vala-so-2.vala +cat <<\EOF > xg-vala-so-2.vala (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-ycp-1 b/gettext-tools/tests/xgettext-ycp-1 index 72eef7cc2..0b0bd6ab3 100755 --- a/gettext-tools/tests/xgettext-ycp-1 +++ b/gettext-tools/tests/xgettext-ycp-1 @@ -4,7 +4,7 @@ # Plural test for YCP # -cat < xg-y-1.ycp +cat <<\EOF > xg-y-1.ycp title = sformat (_("%1 package", "%1 packages", num), num); EOF @@ -12,7 +12,7 @@ EOF ${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1.tmp xg-y-1.ycp || Exit 1 LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po || Exit 1 -cat < xg-y-1.ok +cat <<\EOF > xg-y-1.ok #, ycp-format msgid "%1 package" msgid_plural "%1 packages" diff --git a/gettext-tools/tests/xgettext-ycp-2 b/gettext-tools/tests/xgettext-ycp-2 index b8bb5a7e0..940d0aa3b 100755 --- a/gettext-tools/tests/xgettext-ycp-2 +++ b/gettext-tools/tests/xgettext-ycp-2 @@ -3,7 +3,7 @@ # Test YCP support: --add-comments option. -cat < xg-y-2.ycp +cat <<\EOF > xg-y-2.ycp // This comment will not be extracted. print (_("help")); // TRANSLATORS: This is an extracted comment. @@ -23,7 +23,7 @@ ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \ -d xg-y-2.tmp xg-y-2.ycp || Exit 1 LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po || Exit 1 -cat < xg-y-2.ok +cat <<\EOF > xg-y-2.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-ycp-4 b/gettext-tools/tests/xgettext-ycp-4 index d9fb173c5..f89511c9b 100755 --- a/gettext-tools/tests/xgettext-ycp-4 +++ b/gettext-tools/tests/xgettext-ycp-4 @@ -15,7 +15,7 @@ ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \ -d xg-y-4.tmp xg-y-4.ycp || Exit 1 LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po || Exit 1 -cat < xg-y-4.ok +cat <<\EOF > xg-y-4.ok #. a #. b #. c diff --git a/gettext-tools/tests/xgettext-ycp-stackovfl-1 b/gettext-tools/tests/xgettext-ycp-stackovfl-1 index 9c4d31561..c0c4eab24 100755 --- a/gettext-tools/tests/xgettext-ycp-stackovfl-1 +++ b/gettext-tools/tests/xgettext-ycp-stackovfl-1 @@ -3,7 +3,7 @@ # Test YCP support: stack overflow prevented by nesting depth check. -cat < xg-y-so-1.ycp +cat <<\EOF > xg-y-so-1.ycp (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( @@ -51,7 +51,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-y-so-1.tmp xg-y-so-1.ycp || Exit 1 LC_ALL=C tr -d '\r' < xg-y-so-1.tmp.po > xg-y-so-1.po || Exit 1 -cat < xg-y-so-1.ok +cat <<\EOF > xg-y-so-1.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-ycp-stackovfl-2 b/gettext-tools/tests/xgettext-ycp-stackovfl-2 index e3a3da7e7..af4cd0b9f 100755 --- a/gettext-tools/tests/xgettext-ycp-stackovfl-2 +++ b/gettext-tools/tests/xgettext-ycp-stackovfl-2 @@ -3,7 +3,7 @@ # Test YCP support: stack overflow prevented by nesting depth check. -cat < xg-y-so-2.ycp +cat <<\EOF > xg-y-so-2.ycp (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( (((((((((((((((((((((((((((((((((((((((((((((((((( diff --git a/gettext-tools/tests/xgettext-ycp-stackovfl-3 b/gettext-tools/tests/xgettext-ycp-stackovfl-3 index bb1f45142..7cf49480c 100755 --- a/gettext-tools/tests/xgettext-ycp-stackovfl-3 +++ b/gettext-tools/tests/xgettext-ycp-stackovfl-3 @@ -3,7 +3,7 @@ # Test YCP support: stack overflow prevented by nesting depth check. -cat < xg-y-so-3.ycp +cat <<\EOF > xg-y-so-3.ycp _(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_( _(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_( _(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_( @@ -71,7 +71,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-y-so-3.tmp xg-y-so-3.ycp || Exit 1 LC_ALL=C tr -d '\r' < xg-y-so-3.tmp.po > xg-y-so-3.po || Exit 1 -cat < xg-y-so-3.ok +cat <<\EOF > xg-y-so-3.ok msgid "Hello!" msgstr "" EOF diff --git a/gettext-tools/tests/xgettext-ycp-stackovfl-4 b/gettext-tools/tests/xgettext-ycp-stackovfl-4 index e7ecfbaba..7ff1d7325 100755 --- a/gettext-tools/tests/xgettext-ycp-stackovfl-4 +++ b/gettext-tools/tests/xgettext-ycp-stackovfl-4 @@ -3,7 +3,7 @@ # Test YCP support: stack overflow prevented by nesting depth check. -cat < xg-y-so-4.ycp +cat <<\EOF > xg-y-so-4.ycp _(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_( _(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_( _(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(_(