qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

localedata: Use hexadecimal character escape on tests 

Instead of latin1 ones.

Reviewed-by: Sam James <sam@gentoo.org>
This commit is contained in:
Adhemerval Zanella 2022-03-28 15:50:07 -03:00 committed by H.J. Lu
parent e5a5229868
commit 90edd56c01
11 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
localedata/bug-iconv-trans.c
View File

@ -7,7 +7,7 @@ int
main (void)
{
iconv_t cd;
const char str[] = "ÄäÖöÜüß";
const char str[] = "\xc4\xe4\xd6\xf6\xdc\xfc\xdf";
const char expected[] = "AEaeOEoeUEuess";
char *inptr = (char *) str;
size_t inlen = strlen (str) + 1;

12
localedata/tests-mbwc/dat_mbrtowc.c
View File

@ -23,9 +23,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
{ /*----------------- #01 -----------------*/
{
{
{ 1, 1, "ÄÖÜ", 1, 0, 0 },
{ 1, 1, "ÄÖÜ", 2, 0, 0 },
{ 1, 1, "ÄÖÜ", USE_MBCURMAX, 0, 0 },
{ 1, 1, "\xc4\xd6\xdc", 1, 0, 0 },
{ 1, 1, "\xc4\xd6\xdc", 2, 0, 0 },
{ 1, 1, "\xc4\xd6\xdc", USE_MBCURMAX, 0, 0 },
}
},
{
@ -39,9 +39,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
{ /*----------------- #02 -----------------*/
{
{
{ 1, 1, "ÄÖÜ", 1, 0, 0 },
{ 1, 1, "ÄÖÜ", 2, 0, 0 },
{ 1, 1, "ÄÖÜ", USE_MBCURMAX, 0, 0 },
{ 1, 1, "\xc4\xd6\xdc", 1, 0, 0 },
{ 1, 1, "\xc4\xd6\xdc", 2, 0, 0 },
{ 1, 1, "\xc4\xd6\xdc", USE_MBCURMAX, 0, 0 },
}
},
{

12
localedata/tests-mbwc/dat_mbsrtowcs.c
View File

@ -15,9 +15,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = {
{ /*----------------- #01 -----------------*/
{
{
{ 1, "<EFBFBD><EFBFBD><EFBFBD>", 4, 0,0 },
{ 1, "<EFBFBD><EFBFBD><EFBFBD>", 3, 0,0 },
{ 1, "<EFBFBD><EFBFBD><EFBFBD>", 2, 0,0 },
{ 1, "\xfc\xe4\xf6", 4, 0,0 },
{ 1, "\xfc\xe4\xf6", 3, 0,0 },
{ 1, "\xfc\xe4\xf6", 2, 0,0 },
}
},
{
@ -31,9 +31,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = {
{ /*----------------- #02 -----------------*/
{
{
{ 1, "<EFBFBD><EFBFBD><EFBFBD>", 4, 0,0 },
{ 1, "", 1, 0,0 },
{ 0, "<EFBFBD><EFBFBD><EFBFBD>", 4, 0,0 },
{ 1, "\xfc\xe4\xf6", 4, 0,0 },
{ 1, "", 1, 0,0 },
{ 0, "\xfc\xe4\xf6", 4, 0,0 },
}
},
{

13
localedata/tests-mbwc/dat_strcoll.c
View File

@ -27,13 +27,16 @@ TST_STRCOLL tst_strcoll_loc [] = {
{
{ Tstrcoll, TST_LOC_de },
{
{ /*input.*/ { "ÄBCDEFG", "ÄBCDEFG" }, /* #1 */
{ /*input.*/ { "\xc4\x42\x43\x44\x45\x46\x47",
"\xc4\x42\x43\x44\x45\x46\x47" }, /* #1 */
/*expect*/ { 0,1,0, },
},
{ /*input.*/ { "XX Ä XX", "XX B XX" }, /* #2 */
{ /*input.*/ { "\x58\x58\x20\xc4\x20\x58\x58",
"XX B XX" }, /* #2 */
/*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "XX B XX", "XX Ä XX" }, /* #3 */
{ /*input.*/ { "XX B XX",
"\x58\x58\x20\xc4\x20\x58\x58" }, /* #3 */
/*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "B", "a" }, /* #4 */
@ -48,10 +51,10 @@ TST_STRCOLL tst_strcoll_loc [] = {
{ /*input.*/ { "A", "b" }, /* #7 */
/*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "ä", "B" }, /* #8 */
{ /*input.*/ { "\xe4", "B" }, /* #8 */
/*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "B", "ä" }, /* #9 */
{ /*input.*/ { "B", "\xe4" }, /* #9 */
/*expect*/ { 0,0,+1, },
},
{ .is_last = 1 } /* Last element. */

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

@ -31,7 +31,7 @@ TST_SWSCANF tst_swscanf_loc [] =
{ /* The fields are: err_val, ret_flag, ret_val,
val_int, val_uns, val_flt, val_c, val_s, val_S. */
0,1,5,
-1, 2, 3.3, '<EFBFBD>', "<EFBFBD><EFBFBD>", { 0x0000, },
-1, 2, 3.3, '\xe4', "\xc4\xdc", { 0x0000, },
},
},
/*------------------------ 02 -----------------------*/

4
localedata/tests-mbwc/dat_wcrtomb.c
View File

@ -13,11 +13,11 @@ TST_WCRTOMB tst_wcrtomb_loc [] = {
{
/* #01 : normal case */
{ /*input.*/ { 1, 0x00FC, 0,0 },
/*expect*/ { 0, 1,1, "<EFBFBD>" },
/*expect*/ { 0, 1,1, "\xfc" },
},
/* #02 : normal case */
{ /*input.*/ { 1, 0x00D6, 0,0 },
/*expect*/ { 0, 1,1, "<EFBFBD>" },
/*expect*/ { 0, 1,1, "\xd6" },
},
/* #03 : error case */
{ /*input.*/ { 1, 0xFFA1, 0,0 },

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

@ -26,26 +26,26 @@ TST_WCSRTOMBS tst_wcsrtombs_loc [] = {
},
/* #02 : Only one chars should be stored in s. No null termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 1, 0, 0 },
/*expect*/ { 0,1,1, "ﾄ" },
/*expect*/ { 0,1,1, "\xc4" },
},
/* #03 : Only two chars should be stored in s. No null termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 2, 0, 0 },
/*expect*/ { 0,1,2, "ﾄﾖ" },
/*expect*/ { 0,1,2, "\xc4\xd6" },
},
/* #04 : Only three chars should be stored in s. No null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 3, 0, 0 },
/*expect*/ { 0,1,3, "ﾄﾖﾜ" },
/*expect*/ { 0,1,3, "\xc4\xd6\xdc" },
},
/* #05 : Only three chars should be stored in s with a null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 4, 0, 0 },
/*expect*/ { 0,1,3, "ﾄﾖﾜ" },
/*expect*/ { 0,1,3, "\xc4\xd6\xdc" },
},
/* #06 : Only three chars should be stored in s with a null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 5, 0, 0 },
/*expect*/ { 0,1,3, "ﾄﾖﾜ" },
/*expect*/ { 0,1,3, "\xc4\xd6\xdc" },
},
/* #07 : Invalid mb sequence. No chars should be stored in s. */
{ /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2, 0, 0 },

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

@ -25,26 +25,26 @@ TST_WCSTOMBS tst_wcstombs_loc [] = {
},
/* #02 : Only one chars should be stored in s. No null termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 1 },
/*expect*/ { 0,1,1, "ﾄ" },
/*expect*/ { 0,1,1, "\xc4" },
},
/* #03 : Only two chars should be stored in s. No null termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 2 },
/*expect*/ { 0,1,2, "ﾄﾖ" },
/*expect*/ { 0,1,2, "\xc4\xd6" },
},
/* #04 : Only three chars should be stored in s. No null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 3 },
/*expect*/ { 0,1,3, "ﾄﾖﾜ" },
/*expect*/ { 0,1,3, "\xc4\xd6\xdc" },
},
/* #05 : Only three chars should be stored in s with a null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 4 },
/*expect*/ { 0,1,3, "ﾄﾖﾜ" },
/*expect*/ { 0,1,3, "\xc4\xd6\xdc" },
},
/* #06 : Only three chars should be stored in s with a null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 5 },
/*expect*/ { 0,1,3, "ﾄﾖﾜ" },
/*expect*/ { 0,1,3, "\xc4\xd6\xdc" },
},
/* #07 : Invalid mb sequence. No chars should be stored in s. */
{ /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2 },

4
localedata/tests-mbwc/dat_wctomb.c
View File

@ -59,11 +59,11 @@ TST_WCTOMB tst_wctomb_loc [] = {
{
/* #01 : normal case */
{ /*input.*/ { 1, 0x00C4 },
/*expect*/ { 0,1,1, "ﾄ" },
/*expect*/ { 0,1,1, "\xc4" },
},
/* #02 : normal case */
{ /*input.*/ { 1, 0x00DC },
/*expect*/ { 0,1,1, "ﾜ" },
/*expect*/ { 0,1,1, "\xdc" },
},
/* #03 : normal case */
{ /*input.*/ { 1, 0x0092 },

4
localedata/tst-xlocale1.c
View File

@ -13,9 +13,9 @@ static struct
{
{ "C", "TRANSLIT", "translit", 0 },
{ "de_DE.ISO-8859-1", "TRANSLIT", "translit", 0 },
{ "de_DE.ISO-8859-1", "TRANSLIT", "trÄnslit", -1 },
{ "de_DE.ISO-8859-1", "TRANSLIT", "tr\xc4nslit", -1 },
{ "de_DE.UTF-8", "TRANSLIT", "translit", 0 },
{ "de_DE.ISO-8859-1", "ä", "Ä", 1 }
{ "de_DE.ISO-8859-1", "\xe4", "\xc4", 1 }
};
#define ntests (sizeof (tests) / sizeof (tests[0]))

2
localedata/tst-xlocale2.c
View File

@ -36,7 +36,7 @@ main (void)
}
static const char str[] = "0123456789abcdef ABCDEF ghijklmnopqrstuvwxyzäÄöÖüÜ";
static const char str[] = "0123456789abcdef ABCDEF ghijklmnopqrstuvwxyz\xe4\xc4\xf6\xd6\xfc\xdc";
static const char exd[] = "11111111110000000000000000000000000000000000000000";
static const char exa[] = "00000000001111110111111011111111111111111111111111";
static const char exx[] = "11111111111111110111111000000000000000000000000000";