diff mbox

[PING,BZ,#17596] mblen return code when n is zero

Message ID mg0p07$nrk$1@ger.gmane.org
State Committed
Headers show

Commit Message

Stefan Liebler April 7, 2015, 2:18 p.m. UTC
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  <stli@linux.vnet.ibm.com>

	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.
>

Comments

H.J. Lu April 10, 2015, 10:46 p.m. UTC | #1
On Tue, Apr 7, 2015 at 7:18 AM, Stefan Liebler <stli@linux.vnet.ibm.com> wrote:
> 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  <stli@linux.vnet.ibm.com>
>
>         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.
>

Pushed.  Thanks.
diff mbox

Patch

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,