OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update tst_mbrlen/tst_mbrtowc for mblen change 

commit 9781a37002 changed the expected
results for mbrlen in case of passing n=0 to -2. The initialization of
tst_mbrlen_loc and tst_mbrtowc should be updated accordingly.

	* tests-mbwc/dat_mbrlen.c (tst_mbrlen_loc): Change expected
	result to -2 in case of n == 0.
	* tests-mbwc/tst_mbrtowc.c (tst_mbrtowc): Check result against
	-2 instead of 0.
This commit is contained in:
Stefan Liebler 2015-04-10 15:42:00 -07:00 committed by H.J. Lu
parent 5556d30cae
commit 7378b1f8f8
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
localedata/ChangeLog
View File

@ -1,3 +1,10 @@
2015-04-10 Stefan Liebler <stli@linux.vnet.ibm.com>
* tests-mbwc/dat_mbrlen.c (tst_mbrlen_loc): Change expected
result to -2 in case of n == 0.
* tests-mbwc/tst_mbrtowc.c (tst_mbrtowc): Check result against
-2 instead of 0.
2015-03-04 Roland McGrath <roland@hack.frob.com>
* bug-setlocale1.c (do_test): Remove argument handling and

10
localedata/tests-mbwc/dat_mbrlen.c
View File

@ -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, },
}

2
localedata/tests-mbwc/tst_mbrtowc.c
View File

@ -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,