From patchwork Mon Aug 26 14:41:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 34270 Received: (qmail 31749 invoked by alias); 26 Aug 2019 14:41:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 31738 invoked by uid 89); 26 Aug 2019 14:41:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.5 required=5.0 tests=AWL, BAYES_00, BODY_8BITS, GARBLED_BODY, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=clarification, D*it, U*aj, consequently X-HELO: mx0a-001b2d01.pphosted.com To: GNU C Library From: Stefan Liebler Subject: [PATCH] Fix posix/tst-regex by using ISO-8859 encoding for ChangeLog.8. Date: Mon, 26 Aug 2019 16:41:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 x-cbid: 19082614-0028-0000-0000-0000039422CA X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19082614-0029-0000-0000-000024565809 Message-Id: <6b0df162-d17a-ec1d-0fc0-728dc3a8ef9b@linux.ibm.com> Hi, the recent commit e6855a3bdfe147c52b29b5e7d70a95a8aa22ece0 changed the encoding of ChangeLog.old/ChangeLog.8 from ISO-8859 to UTF-8. Unfortunately the test posix/tst-regex assumes the former encoding. This patch just changes the encoding back to ISO-8859. Furthermore Francesco Potortì is now written with 'ì' instead of 'i`' which leads to two further matches in the first call to test_expr. Bye Stefan ChangeLog: * ChangeLog.old/ChangeLog.8: Use ISO-8859 encoding. commit 695be39994979a372e7643eabf90578de6246e20 Author: Stefan Liebler Date: Mon Aug 26 13:47:21 2019 +0200 Fix posix/tst-regex by using ISO-8859 encoding for ChangeLog.8 The recent commit e6855a3bdfe147c52b29b5e7d70a95a8aa22ece0 changed the encoding of ChangeLog.old/ChangeLog.8 from ISO-8859 to UTF-8. Unfortunately the test posix/tst-regex assumes the former encoding. This patch just changes the encoding back to ISO-8859. Furthermore Francesco Potortì is now written with 'ì' instead of 'i`' which leads to two further matches in the first call to test_expr. ChangeLog: * ChangeLog.old/ChangeLog.8: Use ISO-8859 encoding. diff --git a/ChangeLog.old/ChangeLog.8 b/ChangeLog.old/ChangeLog.8 index c48660d23a..12988d982a 100644 --- a/ChangeLog.old/ChangeLog.8 +++ b/ChangeLog.old/ChangeLog.8 @@ -6025,7 +6025,7 @@ (Host Address Functions): Use uint32_t consequently and add a number of clarifications for IPv4/IPv6, classless addresses. (Internet Namespace): Added some paragraphs about IPv6. - Based on suggestions by Francesco Potortì . + Based on suggestions by Francesco Potortì . 1998-04-05 Philip Blundell @@ -6565,7 +6565,7 @@ * manual/examples/mkfsock.c (make_named_socket): Removed blank lines for clarification. (make_named_socket): Use strncpy instead of strcpy. - Reported by Francesco Potortì . + Reported by Francesco Potortì . 1998-03-30 13:28 Ulrich Drepper @@ -8314,7 +8314,7 @@ 1998-02-27 Ulrich Drepper * misc/efgcvt_r.c (APPEND): Handle printing of 0.0 correctly. - Reported by Göran Uddeborg . + Reported by Göran Uddeborg . * misc/tst-efgcvt.c (ecvt_tests): Add new test case for reported bug. @@ -8322,7 +8322,7 @@ 1998-02-25 Andreas Jaeger * manual/arith.texi (Old-style number conversion): Correct - typo. Reported by Göran Uddeborg . + typo. Reported by Göran Uddeborg . 1998-02-27 Ulrich Drepper diff --git a/posix/tst-regex.c b/posix/tst-regex.c index fe05da9b63..995ad38c7f 100644 --- a/posix/tst-regex.c +++ b/posix/tst-regex.c @@ -124,7 +124,7 @@ do_test (void) /* Run the actual tests. All tests are run in a single-byte and a multi-byte locale. */ - result = test_expr ("[äáàâéèêíìîñöóòôüúùû]", 2, 2); + result = test_expr ("[äáàâéèêíìîñöóòôüúùû]", 4, 4); result |= test_expr ("G.ran", 2, 3); result |= test_expr ("G.\\{1\\}ran", 2, 3); result |= test_expr ("G.*ran", 3, 44);