diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-06-29 23:35:35 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-29 23:35:35 +0000 |
commit | 27ffef477cf5c8a7ee463002db538f5654b9ab4d (patch) | |
tree | 8fc0d9a66f7fa2a16a488d72656221d2b915069b /localedata/tests-mbwc/dat_mbtowc.c | |
parent | e0bd78f584887f59a37cae8bd911fdaf8edcc7ad (diff) | |
download | glibc-27ffef477cf5c8a7ee463002db538f5654b9ab4d.tar glibc-27ffef477cf5c8a7ee463002db538f5654b9ab4d.tar.gz glibc-27ffef477cf5c8a7ee463002db538f5654b9ab4d.tar.bz2 glibc-27ffef477cf5c8a7ee463002db538f5654b9ab4d.zip |
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)))):
Diffstat (limited to 'localedata/tests-mbwc/dat_mbtowc.c')
-rw-r--r-- | localedata/tests-mbwc/dat_mbtowc.c | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/localedata/tests-mbwc/dat_mbtowc.c b/localedata/tests-mbwc/dat_mbtowc.c index 1e3359465c..b23653b7d9 100644 --- a/localedata/tests-mbwc/dat_mbtowc.c +++ b/localedata/tests-mbwc/dat_mbtowc.c @@ -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 }, } } |