xgettext: New tests for non-ASCII extracted comments.

* gettext-tools/tests/xgettext-c-24: New file.
* gettext-tools/tests/xg-c-24.c: New file.
* gettext-tools/tests/xgettext-vala-2: New file.
* gettext-tools/tests/xg-vala-2.vala: New file.
* gettext-tools/tests/Makefile.am (TESTS): Add xgettext-c-24, xgettext-vala-2.
(EXTRA_DIST): Add xg-c-24.c, xg-vala-2.vala.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index afc3e3b0afe38a3eb9a3aca569cab9cda3bc69a2..d79627a48ebabe4f8101de42e346b2f06125206c 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -82,7 +82,7 @@ TESTS = gettext-1 gettext-2 \
        xgettext-c-6 xgettext-c-7 xgettext-c-8 xgettext-c-9 xgettext-c-10 \
        xgettext-c-11 xgettext-c-12 xgettext-c-13 xgettext-c-14 xgettext-c-15 \
        xgettext-c-16 xgettext-c-17 xgettext-c-18 xgettext-c-19 xgettext-c-20 \
-       xgettext-c-21 xgettext-c-22 xgettext-c-23 \
+       xgettext-c-21 xgettext-c-22 xgettext-c-23 xgettext-c-24 \
        xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \
        xgettext-csharp-4 xgettext-csharp-5 xgettext-csharp-6 \
        xgettext-csharp-7 xgettext-csharp-8 \
@@ -114,7 +114,7 @@ TESTS = gettext-1 gettext-2 \
        xgettext-lua-1 xgettext-lua-2 \
        xgettext-javascript-1 xgettext-javascript-2 xgettext-javascript-3 \
        xgettext-javascript-4 xgettext-javascript-5 xgettext-javascript-6 \
-       xgettext-vala-1 \
+       xgettext-vala-1 xgettext-vala-2 \
        xgettext-gsettings-1 \
        xgettext-desktop-1 \
        xgettext-its-1 xgettext-its-2 \
@@ -169,7 +169,7 @@ EXTRA_DIST += init.sh init.cfg $(TESTS) \
        intl-thread-3.po \
        gettextpo-1.de.po \
        xgettext-1 \
-       xgettext-c-1 xg-c-21.c \
+       xgettext-c-1 xg-c-21.c xg-c-24.c xg-vala-2.vala \
        common/supplemental/plurals.xml
 
 XGETTEXT = ../src/xgettext

diff --git a/gettext-tools/tests/xg-c-24.c b/gettext-tools/tests/xg-c-24.c
new file mode 100644 (file)
index 0000000..0e6da6a
--- /dev/null
+++ b/gettext-tools/tests/xg-c-24.c
@@ -0,0 +1,3 @@
+/* A mountain near Zürich.  */
+gettext("Käferberg");
+

diff --git a/gettext-tools/tests/xg-vala-2.vala b/gettext-tools/tests/xg-vala-2.vala
new file mode 100644 (file)
index 0000000..9c54477
--- /dev/null
+++ b/gettext-tools/tests/xg-vala-2.vala
@@ -0,0 +1,2 @@
+// A mountain near Zürich.
+var s1 = _("Käferberg");

diff --git a/gettext-tools/tests/xgettext-c-24 b/gettext-tools/tests/xgettext-c-24
new file mode 100755 (executable)
index 0000000..eac9243
--- /dev/null
+++ b/gettext-tools/tests/xgettext-c-24
@@ -0,0 +1,38 @@
+#! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
+
+# Test C support: non-ASCII extracted comments.
+
+: ${XGETTEXT=xgettext}
+
+${XGETTEXT} --from-code=ISO-8859-1 --add-comments --no-location --no-wrap \
+            -o xg-c-24.tmp "$abs_srcdir"/xg-c-24.c || Exit 1
+grep -v 'POT-Creation-Date' < xg-c-24.tmp > xg-c-24.tmq || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-24.tmq > xg-c-24.po || Exit 1
+
+cat <<\EOF > xg-c-24.ok
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. A mountain near Zürich.
+msgid "Käferberg"
+msgstr ""
+EOF
+
+: ${DIFF=diff}
+${DIFF} xg-c-24.ok xg-c-24.po || Exit 1

diff --git a/gettext-tools/tests/xgettext-vala-2 b/gettext-tools/tests/xgettext-vala-2
new file mode 100755 (executable)
index 0000000..66f688e
--- /dev/null
+++ b/gettext-tools/tests/xgettext-vala-2
@@ -0,0 +1,38 @@
+#! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
+
+# Test Vala support: non-ASCII extracted comments.
+
+: ${XGETTEXT=xgettext}
+
+${XGETTEXT} --from-code=ISO-8859-1 --add-comments --no-location --no-wrap \
+            -o xg-vala-2.tmp "$abs_srcdir"/xg-vala-2.vala || Exit 1
+grep -v 'POT-Creation-Date' < xg-vala-2.tmp > xg-vala-2.tmq || Exit 1
+LC_ALL=C tr -d '\r' < xg-vala-2.tmq > xg-vala-2.po || Exit 1
+
+cat <<\EOF > xg-vala-2.ok
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. A mountain near Zürich.
+msgid "Käferberg"
+msgstr ""
+EOF
+
+: ${DIFF=diff}
+${DIFF} xg-vala-2.ok xg-vala-2.po || Exit 1