From c0fa324e0860f47294631d3ec4f1dbf77e0b8a2f Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Thu, 8 Nov 2018 23:28:26 +0100
Subject: [PATCH] xgettext tests: Rename xgettext-c-17 to xgettext-c-format-4.

* gettext-tools/tests/xgettext-c-format-4: Renamed from
gettext-tools/tests/xgettext-c-17.
* Makefile.am (TESTS): Update.
---
 gettext-tools/tests/Makefile.am                      |  3 ++-
 .../tests/{xgettext-c-17 => xgettext-c-format-4}     | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename gettext-tools/tests/{xgettext-c-17 => xgettext-c-format-4} (68%)

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 9a5effdb7..be6906059 100644
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -81,9 +81,10 @@ TESTS = gettext-1 gettext-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-17 xgettext-c-18 xgettext-c-19 \
+	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-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-17 b/gettext-tools/tests/xgettext-c-format-4
similarity index 68%
rename from gettext-tools/tests/xgettext-c-17
rename to gettext-tools/tests/xgettext-c-format-4
index ec8147698..021573abd 100755
--- a/gettext-tools/tests/xgettext-c-17
+++ b/gettext-tools/tests/xgettext-c-format-4
@@ -3,7 +3,7 @@
 
 # Test C++ support: test kde-format and format recognition heuristics.
 
-cat <<\EOF > xg-c-17.cc
+cat <<\EOF > xg-c-format-4.cc
 /* When xgettext has no info, it flags both c-format and kde-format, based
    on the heuristics.  */
 gettext ("used time: %1m %2s");
@@ -15,11 +15,11 @@ gettext ("remaining time: %1m %2s");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-17.tmp --language=C++ --kde \
-  xg-c-17.cc || Exit 1
-LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po || Exit 1
+${XGETTEXT} --omit-header --no-location -d xg-c-format-4.tmp --language=C++ --kde \
+  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 <<EOF > xg-c-17.ok
+cat <<EOF > xg-c-format-4.ok
 #, c-format, kde-format
 msgid "used time: %1m %2s"
 msgstr ""
@@ -30,7 +30,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-c-17.ok xg-c-17.po
+${DIFF} xg-c-format-4.ok xg-c-format-4.po
 result=$?
 
 exit $result
-- 
2.47.3