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_strcoll.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_strcoll.c')
| -rw-r--r-- | localedata/tests-mbwc/dat_strcoll.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/localedata/tests-mbwc/dat_strcoll.c b/localedata/tests-mbwc/dat_strcoll.c index 6d7e7e5ee2..8ef92e4fb9 100644 --- a/localedata/tests-mbwc/dat_strcoll.c +++ b/localedata/tests-mbwc/dat_strcoll.c @@ -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. */ } }, |