From: Bruno Haible <bruno@clisp.org>
Date: Thu, 8 Nov 2018 22:05:00 +0000 (+0100)
Subject: xgettext tests: Rename xgettext-c-20 to xgettext-c-c++-1.
X-Git-Tag: v0.20~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be39779f0e0e798cfb068a6c12fdb6390cad61d0;p=thirdparty%2Fgettext.git

xgettext tests: Rename xgettext-c-20 to xgettext-c-c++-1.

* gettext-tools/tests/xgettext-c-c++-1: Renamed from
gettext-tools/tests/xgettext-c-20.
* Makefile.am (TESTS): Update.
---

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 9bca237ca..4d57f72a8 100644
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -81,8 +81,9 @@ 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-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-16 xgettext-c-17 xgettext-c-18 xgettext-c-19 \
 	xgettext-c-21 xgettext-c-22 xgettext-c-23 xgettext-c-24 xgettext-c-25 \
+	xgettext-c-c++-1 \
 	xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \
 	xgettext-csharp-4 xgettext-csharp-5 xgettext-csharp-6 \
 	xgettext-csharp-7 xgettext-csharp-8 \
diff --git a/gettext-tools/tests/xgettext-c-20 b/gettext-tools/tests/xgettext-c-c++-1
similarity index 83%
rename from gettext-tools/tests/xgettext-c-20
rename to gettext-tools/tests/xgettext-c-c++-1
index 214c77e3d..f6c2cda83 100755
--- a/gettext-tools/tests/xgettext-c-20
+++ b/gettext-tools/tests/xgettext-c-c++-1
@@ -21,7 +21,7 @@ EOF
 
 (LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.cc 2>&1; exit) | grep 'unterminated raw string literal' || Exit 1
 
-cat <<\EOF > xg-c-20.cc
+cat <<\EOF > xg-c-c++-1.cc
 #define X ""
 gettext (X"This is a concatenation of a macro and a string");
 
@@ -79,11 +79,11 @@ gettext(\"abc\");
 EOF
 
 ${XGETTEXT} --add-comments --no-location --no-wrap \
-            -o xg-c-20.tmp xg-c-20.cc || Exit 1
-grep -v 'POT-Creation-Date' < xg-c-20.tmp > xg-c-20.tmq || Exit 1
-LC_ALL=C tr -d '\r' < xg-c-20.tmq > xg-c-20.po || Exit 1
+            -o xg-c-c++-1.tmp xg-c-c++-1.cc || Exit 1
+grep -v 'POT-Creation-Date' < xg-c-c++-1.tmp > xg-c-c++-1.tmq || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-c++-1.tmq > xg-c-c++-1.po || Exit 1
 
-cat <<\EOF > xg-c-20.ok
+cat <<\EOF > xg-c-c++-1.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -123,9 +123,9 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-c-20.ok xg-c-20.po || Exit 1
+${DIFF} xg-c-c++-1.ok xg-c-c++-1.po || Exit 1
 
-cat <<\EOF > xg-c-20.c
+cat <<\EOF > xg-c-c++-1.c
 gettext (R"aaa(This is NOT a raw string");
 
 gettext (u8R"aaa(This is NOT a raw string");
@@ -134,11 +134,11 @@ uR"aaa(This is NOT a raw string";
 EOF
 
 ${XGETTEXT} --add-comments --no-location --no-wrap \
-            -o xg-c-20c.tmp xg-c-20.c || Exit 1
-grep -v 'POT-Creation-Date' < xg-c-20c.tmp > xg-c-20c.tmq || Exit 1
-LC_ALL=C tr -d '\r' < xg-c-20c.tmq > xg-c-20c.po || Exit 1
+            -o xg-c-c++-1c.tmp xg-c-c++-1.c || Exit 1
+grep -v 'POT-Creation-Date' < xg-c-c++-1c.tmp > xg-c-c++-1c.tmq || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-c++-1c.tmq > xg-c-c++-1c.po || Exit 1
 
-cat <<\EOF > xg-c-20c.ok
+cat <<\EOF > xg-c-c++-1c.ok
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -161,4 +161,4 @@ msgid "aaa(This is NOT a raw string"
 msgstr ""
 EOF
 
-${DIFF} xg-c-20c.ok xg-c-20c.po || Exit 1
+${DIFF} xg-c-c++-1c.ok xg-c-c++-1c.po || Exit 1