From: Bruno Haible Date: Tue, 4 Mar 2025 15:50:35 +0000 (+0100) Subject: tests: Prefer 'cat <<\EOF' to 'cat < xg-rs-1.rs +cat <<\EOF > xg-rs-1.rs use gettext_rs::gettext; pub trait TestCase { @@ -34,7 +34,7 @@ EOF ${XGETTEXT} --omit-header --no-location -k'gettext!' -c -d xg-rs-1.tmp xg-rs-1.rs || Exit 1 LC_ALL=C tr -d '\r' < xg-rs-1.tmp.po > xg-rs-1.po || Exit 1 -cat < xg-rs-1.ok +cat <<\EOF > xg-rs-1.ok #. standard usage msgid "Test String 1" msgstr "" diff --git a/gettext-tools/tests/xgettext-rust-4 b/gettext-tools/tests/xgettext-rust-4 index 3183a5770..9d85b8403 100755 --- a/gettext-tools/tests/xgettext-rust-4 +++ b/gettext-tools/tests/xgettext-rust-4 @@ -3,7 +3,7 @@ # Test Rust support: plurals. -cat < xg-rs-4.rs +cat <<\EOF > xg-rs-4.rs pub trait TestCase { fn main () { ngettext("test 1", "plural test"); @@ -17,7 +17,7 @@ ${XGETTEXT} --omit-header --no-location --keyword=myngettext:2,3 \ -d xg-rs-4.tmp xg-rs-4.rs || Exit 1 LC_ALL=C tr -d '\r' < xg-rs-4.tmp.po > xg-rs-4.po || Exit 1 -cat < xg-rs-4.ok +cat <<\EOF > xg-rs-4.ok msgid "test 1" msgid_plural "plural test" msgstr[0] "" diff --git a/gettext-tools/tests/xgettext-rust-5 b/gettext-tools/tests/xgettext-rust-5 index be3ec074c..d55bfa488 100755 --- a/gettext-tools/tests/xgettext-rust-5 +++ b/gettext-tools/tests/xgettext-rust-5 @@ -12,7 +12,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-rs-5.tmp xg-rs-5.rs || Exit 1 LC_ALL=C tr -d '\r' < xg-rs-5.tmp.po > xg-rs-5.po || Exit 1 -cat < xg-rs-5.ok +cat <<\EOF > xg-rs-5.ok msgid "help" msgstr "" diff --git a/gettext-tools/tests/xgettext-rust-6 b/gettext-tools/tests/xgettext-rust-6 index d8c352ae0..307822cd0 100755 --- a/gettext-tools/tests/xgettext-rust-6 +++ b/gettext-tools/tests/xgettext-rust-6 @@ -18,7 +18,7 @@ EOF ${XGETTEXT} --omit-header --no-location -d xg-rs-6a.tmp xg-rs-6.rs || Exit 1 LC_ALL=C tr -d '\r' < xg-rs-6a.tmp.po > xg-rs-6a.po || Exit 1 -cat < xg-rs-6a.ok +cat <<\EOF > xg-rs-6a.ok msgid "Hello1" msgstr "" @@ -33,7 +33,7 @@ ${DIFF} xg-rs-6a.ok xg-rs-6a.po || exit 1 ${XGETTEXT} --omit-header --no-location -k'tr!' -d xg-rs-6b.tmp xg-rs-6.rs || Exit 1 LC_ALL=C tr -d '\r' < xg-rs-6b.tmp.po > xg-rs-6b.po || Exit 1 -cat < xg-rs-6b.ok +cat <<\EOF > xg-rs-6b.ok #, rust-format msgid "Hello {}" msgstr "" diff --git a/gettext-tools/tests/xgettext-rust-7 b/gettext-tools/tests/xgettext-rust-7 index f892d2948..6b3c49df3 100755 --- a/gettext-tools/tests/xgettext-rust-7 +++ b/gettext-tools/tests/xgettext-rust-7 @@ -59,7 +59,7 @@ EOF ${XGETTEXT} --omit-header --no-location --flag=format:1:rust-format -d xg-rs-7.tmp xg-rs-7.rs || Exit 1 LC_ALL=C tr -d '\r' < xg-rs-7.tmp.po > xg-rs-7.po || Exit 1 -cat < xg-rs-7.ok +cat <<\EOF > xg-rs-7.ok msgid "Hello10" msgstr ""