From: Daiki Ueno Date: Wed, 24 Jun 2015 01:35:25 +0000 (+0900) Subject: tests: Skip KUIT tests when libexpat is missing X-Git-Tag: v0.19.5~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=945abda2f0fe59bf8ad1871f4d82b69479c75515;p=thirdparty%2Fgettext.git tests: Skip KUIT tests when libexpat is missing * format-kde-kuit-1: Skip if KDE KUIT format is not supported. * format-kde-kuit-2: Likewise. Suggested by Chusslove Illich. --- diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 632568e37..dc7aa3e77 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,9 @@ +2015-06-24 Daiki Ueno + + * format-kde-kuit-1: Skip if KDE KUIT format is not supported. + * format-kde-kuit-2: Likewise. + Suggested by Chusslove Illich. + 2015-06-23 Daiki Ueno * msginit-4: Don't check the Project-Id-Version: field, which diff --git a/gettext-tools/tests/format-kde-kuit-1 b/gettext-tools/tests/format-kde-kuit-1 index a63ff3d0e..aeaa74324 100755 --- a/gettext-tools/tests/format-kde-kuit-1 +++ b/gettext-tools/tests/format-kde-kuit-1 @@ -3,6 +3,18 @@ # Test recognition of KUIT format strings. +: ${XGETTEXT=xgettext} + +cat <<\EOF > f-kd-invalid.cpp +xi18n(""); +EOF + +LC_ALL=C ${XGETTEXT} -L C++ --kde --flag=xi18n:1:kde-kuit-format -o - f-kd-invalid.cpp 2>&1 | grep 'not a valid KDE KUIT format' > /dev/null 2>&1 +test $? = 0 || { + echo "Skipping test: xgettext was built without KDE KUIT format support" + exit 77 +} + cat <<\EOF > f-kd-1.data # Unrecognized: unbalanced filename tag "a" @@ -24,7 +36,6 @@ cat <<\EOF > f-kd-1.data "**a" EOF -: ${XGETTEXT=xgettext} n=0 while read comment; do read string diff --git a/gettext-tools/tests/format-kde-kuit-2 b/gettext-tools/tests/format-kde-kuit-2 index b2653d188..0634b628c 100755 --- a/gettext-tools/tests/format-kde-kuit-2 +++ b/gettext-tools/tests/format-kde-kuit-2 @@ -3,6 +3,20 @@ # Test checking of KDE KUIT format strings. +cat <<\EOF > f-kd-invalid.po +#, kde-kuit-format +msgid "foo" +msgstr "<" +EOF + +: ${MSGFMT=msgfmt} + +LC_ALL=C ${MSGFMT} --check-format -o /dev/null f-kd-invalid.po 2>&1 | grep 'not a valid KDE KUIT format' > /dev/null 2>&1 +test $? = 0 || { + echo "Skipping test: msgfmt was built without KDE KUIT format support" + exit 77 +} + cat <<\EOF > f-kd-2.data # Valid: one argument msgid "%1" @@ -30,7 +44,6 @@ msgid "foo" msgstr "&" EOF -: ${MSGFMT=msgfmt} n=0 while read comment; do read msgid_line