From patchwork Tue Apr 7 14:18:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 6069 Received: (qmail 83954 invoked by alias); 7 Apr 2015 14:19:08 -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 83911 invoked by uid 89); 7 Apr 2015 14:19:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: plane.gmane.org To: libc-alpha@sourceware.org From: Stefan Liebler Subject: Re: [PING][PATCH] [BZ #17596] mblen return code when n is zero Date: Tue, 07 Apr 2015 16:18:47 +0200 Lines: 145 Message-ID: References: <1415890908-50691-1-git-send-email-raji@linux.vnet.ibm.com> <5464D746.2030300@cs.ucla.edu> <5465A7FC.4080701@linux.vnet.ibm.com> <20141127170625.GA13805@domone> <20150306103646.GW12857@vapier> <20150403134913.GA22649@domone> Mime-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 In-Reply-To: <20150403134913.GA22649@domone> Hi, the test localedata/tst_mbrlen fails with: mbrlen:de_DE.ISO-8859-1:1:1:2:F:the return value is different from an expected value mbrlen:de_DE.ISO-8859-1:1:2:2:S:PASSED mbrlen:de_DE.ISO-8859-1:1:3:2:S:PASSED mbrlen:de_DE.ISO-8859-1:2:1:2:F:the return value is different from an expected value mbrlen:de_DE.ISO-8859-1:2:2:2:S:PASSED mbrlen:de_DE.ISO-8859-1:2:3:2:S:PASSED mbrlen:en_US.ANSI_X3.4-1968:1:1:2:F:the return value is different from an expected value mbrlen:en_US.ANSI_X3.4-1968:1:2:2:S:PASSED mbrlen:en_US.ANSI_X3.4-1968:1:3:2:S:PASSED mbrlen:en_US.ANSI_X3.4-1968:2:1:2:F:the return value is different from an expected value mbrlen:en_US.ANSI_X3.4-1968:2:2:1:S:PASSED mbrlen:en_US.ANSI_X3.4-1968:2:2:2:S:PASSED mbrlen:en_US.ANSI_X3.4-1968:2:3:1:S:PASSED mbrlen:en_US.ANSI_X3.4-1968:2:3:2:S:PASSED mbrlen:ja_JP.EUC-JP:1:1:2:S:PASSED mbrlen:ja_JP.EUC-JP:1:2:2:S:PASSED mbrlen:ja_JP.EUC-JP:1:3:2:S:PASSED mbrlen:ja_JP.EUC-JP:2:1:2:S:PASSED mbrlen:ja_JP.EUC-JP:2:2:2:S:PASSED mbrlen:ja_JP.EUC-JP:2:3:2:S:PASSED mbrlen:ja_JP.EUC-JP:3:1:2:F:the return value is different from an expected value mbrlen:ja_JP.EUC-JP:3:2:2:S:PASSED mbrlen:ja_JP.EUC-JP:3:3:1:S:PASSED mbrlen:ja_JP.EUC-JP:3:3:2:S:PASSED and test localedata/tst_mbrtowc fails with: mbrtowc:de_DE.ISO-8859-1:1:1:3:F:Initialization failed - skipping this test case. mbrtowc:de_DE.ISO-8859-1:2:1:3:F:Initialization failed - skipping this test case. This patch change the expected results for mbrlen in case of passing n=0 to -2. The initialization of tst_mbrtowc is changed in the same way. Tested on s390/s390x. Please commit. Bye Stefan --- 2015-04-07 Stefan Liebler localedata/tests-mbwc/dat_mbrlen.c (tst_mbrlen_loc): Change expected result to -2 in case of n == 0. localedata/tests-mbwc/tst_mbrtowc.c (tst_mbrtowc): Check result against -2 instead of 0. On 04/03/2015 03:49 PM, Ondřej Bílka wrote: > On Fri, Mar 06, 2015 at 05:36:46AM -0500, Mike Frysinger wrote: >> On 27 Nov 2014 18:06, Ondřej Bílka wrote: >>> Andreas, do you have more comments or could you commit it as it looks as >>> correct fix? >> >> lets push it >> -mike > > Done. > diff --git a/localedata/tests-mbwc/dat_mbrlen.c b/localedata/tests-mbwc/dat_mbrlen.c index 61e8423..1df485e 100644 --- a/localedata/tests-mbwc/dat_mbrlen.c +++ b/localedata/tests-mbwc/dat_mbrlen.c @@ -30,7 +30,7 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 0, 1, 0, }, + { 0, 1, -2, }, { 0, 1, 0, }, { 0, 1, 1, }, } @@ -46,7 +46,7 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 0, 1, 0, }, + { 0, 1, -2, }, { 0, 1, 1, }, { 0, 1, 1, }, } @@ -68,7 +68,7 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 0, 1, 0, }, + { 0, 1, -2, }, { 0, 1, 1, }, { 0, 1, 1, }, } @@ -84,7 +84,7 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 0, 1, 0, }, + { 0, 1, -2, }, { EILSEQ, 1, -1, }, { EILSEQ, 1, -1, }, } @@ -140,7 +140,7 @@ TST_MBRLEN tst_mbrlen_loc [] = { }, { { - { 0, 1, 0, }, + { 0, 1, -2, }, { 0, 1, -2, }, { EILSEQ, 1, -1, }, } diff --git a/localedata/tests-mbwc/tst_mbrtowc.c b/localedata/tests-mbwc/tst_mbrtowc.c index ffb33ce..20507ab 100644 --- a/localedata/tests-mbwc/tst_mbrtowc.c +++ b/localedata/tests-mbwc/tst_mbrtowc.c @@ -26,7 +26,7 @@ tst_mbrtowc (FILE * fp, int debug_flg) TST_HEAD_LOCALE (mbrtowc, S_MBRTOWC); TST_DO_REC (mbrtowc) { - if (mbrtowc (NULL, "", 0, &t) != 0) + if (mbrtowc (NULL, "", 0, &t) != -2) { err_count++; Result (C_FAILURE, S_MBRTOWC, CASE_3,