From: Bruno Haible Date: Thu, 8 Nov 2018 22:30:36 +0000 (+0100) Subject: xgettext tests: Rename xgettext-c-14 to xgettext-c-format-5. X-Git-Tag: v0.20~245 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbc506978ad957231283faed2eaf0af30064df6c;p=thirdparty%2Fgettext.git xgettext tests: Rename xgettext-c-14 to xgettext-c-format-5. * gettext-tools/tests/xgettext-c-format-5: Renamed from gettext-tools/tests/xgettext-c-14. * Makefile.am (TESTS): Update. --- diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index be6906059..866ca7256 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -80,11 +80,10 @@ TESTS = gettext-1 gettext-2 \ xgettext-awk-1 xgettext-awk-2 \ xgettext-c-2 xgettext-c-3 xgettext-c-4 xgettext-c-5 \ xgettext-c-6 xgettext-c-7 xgettext-c-9 \ - xgettext-c-14 \ xgettext-c-16 xgettext-c-18 xgettext-c-19 \ xgettext-c-21 xgettext-c-23 xgettext-c-24 xgettext-c-25 \ xgettext-c-format-1 xgettext-c-format-2 xgettext-c-format-3 \ - xgettext-c-format-4 \ + xgettext-c-format-4 xgettext-c-format-5 \ xgettext-c-ctxt-1 xgettext-c-ctxt-2 xgettext-c-ctxt-3 \ xgettext-c-c++-1 xgettext-c-c++-2 \ xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \ diff --git a/gettext-tools/tests/xgettext-c-14 b/gettext-tools/tests/xgettext-c-format-5 similarity index 83% rename from gettext-tools/tests/xgettext-c-14 rename to gettext-tools/tests/xgettext-c-format-5 index 498d07c9a..7ba1185fc 100755 --- a/gettext-tools/tests/xgettext-c-14 +++ b/gettext-tools/tests/xgettext-c-format-5 @@ -3,7 +3,7 @@ # Test C++ support: test boost-format. -cat <<\EOF > xg-c-14.cc +cat <<\EOF > xg-c-format-5.cc // These are recognized as boost-format because of the keyword 'format'. format(gettext("%s on, %s off")); format(gettext("%1$d on, %2$d off")); @@ -17,14 +17,14 @@ gettext("heuristic %1% on, %2% off"); EOF : ${XGETTEXT=xgettext} -${XGETTEXT} --omit-header --no-location -d xg-c-14.tmp --boost xg-c-14.cc || Exit 1 -LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po || Exit 1 +${XGETTEXT} --omit-header --no-location -d xg-c-format-5.tmp --boost xg-c-format-5.cc || Exit 1 +LC_ALL=C tr -d '\r' < xg-c-format-5.tmp.po > xg-c-format-5.po || Exit 1 # The first 4 are not marked as c-format, because they are known as # boost-format. The last 4 are governed by the heuristic. The first two # among them are valid c-format strings. The last one is a valid but unlikely # c-format string, therefore the heuristic doesn't mark it. -cat <<\EOF > xg-c-14.ok +cat <<\EOF > xg-c-format-5.ok #, boost-format msgid "%s on, %s off" msgstr "" @@ -59,7 +59,7 @@ msgstr "" EOF : ${DIFF=diff} -${DIFF} xg-c-14.ok xg-c-14.po +${DIFF} xg-c-format-5.ok xg-c-format-5.po result=$? exit $result