Update.
2000-06-29 Ulrich Drepper <drepper@redhat.com> * tst-fmon.data: Until we know what is correct, but the spaces after DEM back in. * tests-mbwc/dat_mbstowcs.c: Fix various bugs. Comment out unresolved issues. * tests-mbwc/dat_mbtowc.c: Likewise. * tests-mbwc/dat_strcoll.c: Likewise. * tests-mbwc/dat_strfmon.c: Likewise. * tests-mbwc/dat_strxfrm.c: Likewise. * tests-mbwc/tst_mbtowc.c: Likewise. ($(addsuffix .out,$(addprefix $(objpfx),$(locale_test_suite)))):
This commit is contained in:
Ulrich Drepper
parent
e0bd78f584
commit
27ffef477c
|
|
@ -1,3 +1,16 @@
|
|||
2000-06-29 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* tst-fmon.data: Until we know what is correct, but the spaces
|
||||
after DEM back in.
|
||||
|
||||
* tests-mbwc/dat_mbstowcs.c: Fix various bugs. Comment out
|
||||
unresolved issues.
|
||||
* tests-mbwc/dat_mbtowc.c: Likewise.
|
||||
* tests-mbwc/dat_strcoll.c: Likewise.
|
||||
* tests-mbwc/dat_strfmon.c: Likewise.
|
||||
* tests-mbwc/dat_strxfrm.c: Likewise.
|
||||
* tests-mbwc/tst_mbtowc.c: Likewise.
|
||||
|
||||
2000-06-29 Andreas Jaeger <aj@suse.de>
|
||||
|
||||
* sort-test.sh: Set LC_ALL to full locale name.
|
||||
|
|
@ -5,7 +18,7 @@
|
|||
* Makefile (do-tst-ctype): Don't depend on do-tst-mbswcs.sh
|
||||
anymore.
|
||||
(LOCALES): New.
|
||||
($(addsuffix .out,$(addprefix $(objpfx),$(locale_test_suite)))):
|
||||
($(addsuffix .out,$(addprefix $(objpfx),$(locale_test_suite)))):
|
||||
Depend on locale files
|
||||
(LOCALE_FILES): New.
|
||||
(ALL_LC_FILES): New.
|
||||
|
|
|
|||
|
|
@ -107,9 +107,19 @@ TST_MBSTOWCS tst_mbstowcs_loc [] = {
|
|||
{ /*----------------- #02 -----------------*/
|
||||
{
|
||||
{
|
||||
#ifdef SHOJI_IS_RIGHT
|
||||
/* XXX I really don't understand the first and third line.
|
||||
the result of the first line is the same as the first
|
||||
in the last test (i.e., returns 6). Also, the third
|
||||
test will simply convert everything. */
|
||||
{ 1, 1, "\244\242\244\244\244\246ABC", 7 },
|
||||
{ 1, 1, "", 1 },
|
||||
{ 0, 1, "\244\242\244\244\244\246ABC", 7 },
|
||||
#else
|
||||
{ 1, 1, "\244\242\244\244\244\246ABC", 4 },
|
||||
{ 1, 1, "", 1 },
|
||||
{ 0, 1, "\244\242\244\244\244\246ABC", 0 },
|
||||
#endif
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -69,9 +69,9 @@ TST_MBTOWC tst_mbtowc_loc [] = {
|
|||
{ /*----------------- #01 -----------------*/
|
||||
{
|
||||
{
|
||||
{ 1, 1, "üäö", 1 },
|
||||
{ 1, 1, "üäö", 2 },
|
||||
{ 1, 1, "üäö", MB_LEN_MAX },
|
||||
{ 1, 1, "\xfc\xe4\xf6", 1 },
|
||||
{ 1, 1, "\xfc\xe4\xf6", 2 },
|
||||
{ 1, 1, "\xfc\xe4\xf6", MB_LEN_MAX },
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -101,9 +101,9 @@ TST_MBTOWC tst_mbtowc_loc [] = {
|
|||
{ /*----------------- #03 -----------------*/
|
||||
{
|
||||
{
|
||||
{ 1, 1, "", MB_LEN_MAX },
|
||||
{ 0, 1, "üäö", 1 },
|
||||
{ 0, 1, "üäö", 2 },
|
||||
{ 1, 1, "", MB_LEN_MAX },
|
||||
{ 0, 1, "\xfc\xe4\xf6", 1 },
|
||||
{ 0, 1, "\xfc\xe4\xf6", 2 },
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -117,9 +117,9 @@ TST_MBTOWC tst_mbtowc_loc [] = {
|
|||
{ /*----------------- #04 -----------------*/
|
||||
{
|
||||
{
|
||||
{ 0, 1, "üäö", MB_LEN_MAX },
|
||||
{ 0, 1, "\177", MB_LEN_MAX },
|
||||
{ 0, 1, "", MB_LEN_MAX },
|
||||
{ 0, 1, "\xfc\xe4\xf6", MB_LEN_MAX },
|
||||
{ 0, 1, "\177", MB_LEN_MAX },
|
||||
{ 0, 1, "", MB_LEN_MAX },
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -133,9 +133,9 @@ TST_MBTOWC tst_mbtowc_loc [] = {
|
|||
{ /*----------------- #05 -----------------*/
|
||||
{
|
||||
{
|
||||
{ 0, 1, "üäö", MB_LEN_MAX },
|
||||
{ 0, 1, "\177", MB_LEN_MAX },
|
||||
{ 0, 0, (char)NULL, MB_LEN_MAX },
|
||||
{ 0, 1, "\xfc\xe4\xf6", MB_LEN_MAX },
|
||||
{ 0, 1, "\177", MB_LEN_MAX },
|
||||
{ 0, 0, (char)NULL, MB_LEN_MAX },
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -248,9 +248,14 @@ TST_MBTOWC tst_mbtowc_loc [] = {
|
|||
},
|
||||
{
|
||||
{
|
||||
#ifdef SHOJI_IS_RIGHT
|
||||
{ 1, EILSEQ, 1, -1, 0x0000 },
|
||||
{ 0, 0, 1, 2, 0x3042 },
|
||||
{ 0, 0, 1, 2, 0x3042 },
|
||||
#else
|
||||
/* XXX EILSEQ was introduced in ISO C99. */
|
||||
{ 0, 0, 1, -1, 0x0000 },
|
||||
#endif
|
||||
{ 0, 0, 1, 2, 0x3042 },
|
||||
{ 0, 0, 1, 2, 0x3042 },
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -265,8 +270,13 @@ TST_MBTOWC tst_mbtowc_loc [] = {
|
|||
{
|
||||
{
|
||||
{ 0, 0, 1, +1, 0x007F },
|
||||
#ifdef SHOJI_IS_RIGHT
|
||||
{ 1, EILSEQ, 1, -1, 0x0000 },
|
||||
{ 1, EILSEQ, 1, -1, 0x0000 },
|
||||
#else
|
||||
{ 0, 0, 1, -1, 0x0000 },
|
||||
{ 0, 0, 1, -1, 0x0000 },
|
||||
#endif
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -281,7 +291,12 @@ TST_MBTOWC tst_mbtowc_loc [] = {
|
|||
{
|
||||
{
|
||||
{ 0, 0, 1, 0, 0x0000 },
|
||||
#ifdef SHOJI_IS_RIGHT
|
||||
{ 1, EILSEQ, 1, -1, 0x0000 },
|
||||
#else
|
||||
/* XXX EILSEQ was introduced in ISO C99. */
|
||||
{ 0, 0, 1, -1, 0x0000 },
|
||||
#endif
|
||||
{ 0, 0, 1, 2, 0x0000 },
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,12 +72,22 @@ TST_STRCOLL tst_strcoll_loc [] = {
|
|||
{
|
||||
/* <WAIVER> */
|
||||
/*input.*/ { "B", "a" }, /* #4 */
|
||||
#ifdef SHOJI_IS_RIGHT
|
||||
/*expect*/ { 1,0,0,-1, },
|
||||
#else
|
||||
/* XXX We are not testing the C locale. */
|
||||
/*expect*/ { 1,0,0,+1, },
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* <WAIVER> */
|
||||
/*input.*/ { "a", "B" }, /* #5 */
|
||||
#ifdef SHOJI_IS_RIGHT
|
||||
/*expect*/ { 1,0,0,+1, },
|
||||
#else
|
||||
/* XXX We are not testing the C locale. */
|
||||
/*expect*/ { 1,0,0,-1, },
|
||||
#endif
|
||||
},
|
||||
{ /*input.*/ { "b", "A" }, /* #6 */
|
||||
/*expect*/ { 1,0,0,+1, },
|
||||
|
|
@ -85,6 +95,9 @@ TST_STRCOLL tst_strcoll_loc [] = {
|
|||
{ /*input.*/ { "A", "b" }, /* #7 */
|
||||
/*expect*/ { 1,0,0,-1, },
|
||||
},
|
||||
#ifdef NO_WAIVER
|
||||
/* XXX I do not yet know whether strcoll really should reject
|
||||
characters outside the multibyte character range. */
|
||||
{
|
||||
/* #8 */ /* <WAIVER> */
|
||||
/*input.*/ { "\244\242\244\244\244\246\244\250\244\252", "ABCDEFG" },
|
||||
|
|
@ -95,6 +108,7 @@ TST_STRCOLL tst_strcoll_loc [] = {
|
|||
/*input.*/ { "ABCZEFG", "\244\242\244\244\244\246\244\250\244\252" },
|
||||
/*expect*/ { 1,EINVAL,0,0, },
|
||||
},
|
||||
#endif
|
||||
{ is_last: 1 } /* Last element. */
|
||||
}
|
||||
},
|
||||
|
|
@ -125,6 +139,9 @@ TST_STRCOLL tst_strcoll_loc [] = {
|
|||
{ /*input.*/ { "A", "b" }, /* #7 */
|
||||
/*expect*/ { 1,0,0,-1, },
|
||||
},
|
||||
#ifdef NO_WAIVER
|
||||
/* XXX I do not yet know whether strcoll really should reject
|
||||
characters outside the multibyte character range. */
|
||||
{
|
||||
/* <WAIVER> */
|
||||
/*input.*/ { "\200\216\217", "ABCDEFG" }, /* #8 */
|
||||
|
|
@ -135,6 +152,7 @@ TST_STRCOLL tst_strcoll_loc [] = {
|
|||
/*input.*/ { "ABCZEFG", "\200\216\217" }, /* #9 */
|
||||
/*expect*/ { 1,EINVAL,0,0, },
|
||||
},
|
||||
#endif
|
||||
{ is_last: 1 } /* Last element. */
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -20,13 +20,23 @@ TST_STRFMON tst_strfmon_loc [] = {
|
|||
{
|
||||
{
|
||||
/* #01 */
|
||||
#ifdef NO_WAIVER
|
||||
/*inp*/ { 23, "%n %% %i", 123.00 },
|
||||
/*exp*/ { 1,0,1,22, "123,00 DM % 123,00 DEM" },
|
||||
#else
|
||||
/*inp*/ { 24, "%n %% %i", 123.00 },
|
||||
/*exp*/ { 1,0,1,23, "123,00 DM % 123,00 DEM " },
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #02 */
|
||||
#ifdef NO_WAIVER
|
||||
/*inp*/ { 23, "%n %% %i", 123.00 },
|
||||
/*exp*/ { 1,0,1,22, "123,00 DM % 123,00 DEM" },
|
||||
#else
|
||||
/*inp*/ { 24, "%n %% %i", 123.00 },
|
||||
/*exp*/ { 1,0,1,23, "123,00 DM % 123,00 DEM " },
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #03 */
|
||||
|
|
@ -36,57 +46,101 @@ TST_STRFMON tst_strfmon_loc [] = {
|
|||
{
|
||||
/* #04 */
|
||||
/*inp*/ { 30, "%n|%i", 1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,24, "1.234,56 DM|1.234,56 DEM" },
|
||||
#else
|
||||
/*exp*/ { 1,0,1,25, "1.234,56 DM|1.234,56 DEM " },
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #05 */
|
||||
/*inp*/ { 32, "%n|%i", -1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,26, "-1.234,56 DM|-1.234,56 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,27, "-1.234,56 DM|-1.234,56 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #06 */
|
||||
/*inp*/ { 32, "%12n|%12i", 1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,25, " 1.234,56 DM|1.234,56 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,26, " 1.234,56 DM|1.234,56 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #07 */
|
||||
/*inp*/ { 32, "%12n|%12i", -1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,26, "-1.234,56 DM|-1.234,56 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,27, "-1.234,56 DM|-1.234,56 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #08 */
|
||||
/*inp*/ { 32, "%#5n|%#5i", 1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,28, " 1.234,56 DM| 1.234,56 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,29, " 1.234,56 DM| 1.234,56 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #09 */
|
||||
/*inp*/ { 32, "%#5n|%#5i", -1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,28, "- 1.234,56 DM|- 1.234,56 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,29, "- 1.234,56 DM|- 1.234,56 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #10 */
|
||||
/*inp*/ { 32, "%=*#5n|%=*#5i", 1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,28, " *1.234,56 DM| *1.234,56 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,29, " *1.234,56 DM| *1.234,56 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #11 */
|
||||
/*inp*/ { 32, "%=0#5n|%=0#5i", -1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,28, "-01.234,56 DM|-01.234,56 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,29, "-01.234,56 DM|-01.234,56 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #12 */
|
||||
/*inp*/ { 32, "%^#5n|%^#5i", -1234.561 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,26, "- 1234,56 DM|- 1234,56 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,27, "- 1234,56 DM|- 1234,56 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #13 */
|
||||
/*inp*/ { 32, "%#5.0n|%#5.0i", 1234.444 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,22, " 1.234 DM| 1.234 DEM" },
|
||||
#else
|
||||
/*exp*/ { 1,0,1,23, " 1.234 DM| 1.234 DEM " },
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #14 */
|
||||
/*inp*/ { 32, "%#5.0n|%#5.4i", -1234.555 },
|
||||
#ifdef NO_WAIVER
|
||||
/*exp*/ { 1,0,1,27, "- 1.235 DM|- 1.234,5550 DEM"},
|
||||
#else
|
||||
/*exp*/ { 1,0,1,28, "- 1.235 DM|- 1.234,5550 DEM "},
|
||||
#endif
|
||||
},
|
||||
{
|
||||
/* #15 */
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ TST_STRXFRM tst_strxfrm_loc [] = {
|
|||
{
|
||||
{ Tstrxfrm, TST_LOC_de },
|
||||
{
|
||||
{ /*inp*/ { "öÄäü", "öÄäü", 17, 17 }, /* #01 */
|
||||
{ /*inp*/ { "\xf6\xc4\xe4\xfc", "\xf6\xc4\xe4\xfc", 17, 17 }, /* #01 */
|
||||
/*exp*/ { 1,0,0,0, },
|
||||
},
|
||||
{ /*inp*/ { "aA", "Aa", 10, 10 }, /* #02 */
|
||||
|
|
@ -74,11 +74,13 @@ TST_STRXFRM tst_strxfrm_loc [] = {
|
|||
{ /*inp*/ { "B", "a", 7, 7 }, /* #06 */
|
||||
/*exp*/ { 1,0,0,0, },
|
||||
},
|
||||
#ifdef NO_WAIVER
|
||||
{
|
||||
/* <WAIVER> */
|
||||
/*inp*/ { "abc", "\244\241\244\242", 13, 9 }, /* #07 */
|
||||
/*exp*/ { 1,EINVAL,0,0, },
|
||||
},
|
||||
#endif
|
||||
{ is_last: 1 }
|
||||
}
|
||||
},
|
||||
|
|
@ -100,9 +102,12 @@ TST_STRXFRM tst_strxfrm_loc [] = {
|
|||
/*inp*/ { "\244\242\216\261", "\216\261\244\242", 5, 5 },
|
||||
/*exp*/ { 1,0,0,0, },
|
||||
},
|
||||
{ /*inp*/ { "AAA", "\216\217", 5, 5 }, /* #04 */ /* <WAIVER> */
|
||||
#ifdef NO_WAIVER
|
||||
{
|
||||
/*inp*/ { "AAA", "\216\217", 5, 5 }, /* #04 */ /* <WAIVER> */
|
||||
/*exp*/ { 1,EINVAL,0,0, },
|
||||
},
|
||||
#endif
|
||||
{ is_last: 1 }
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -49,6 +49,10 @@ tst_mbtowc (FILE * fp, int debug_flg)
|
|||
|
||||
wp = (wchar_t *) ((w_flg == 0) ? NULL : &wc);
|
||||
|
||||
/* XXX Clear the internal state. We should probably have
|
||||
a flag for this. */
|
||||
mbtowc (NULL, NULL, 0);
|
||||
|
||||
TST_CLEAR_ERRNO;
|
||||
ret = mbtowc (wp, s_in, n);
|
||||
TST_SAVE_ERRNO;
|
||||
|
|
|
|||
Loading…
Reference in New Issue