aboutsummaryrefslogtreecommitdiff
path: root/localedata/tests-mbwc/dat_strcoll.c
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-08-18 09:34:18 +0000
committerAndreas Jaeger <aj@suse.de>2000-08-18 09:34:18 +0000
commitec7956d922c85fc6154062ce5ba58fe40e9d5901 (patch)
tree3a990101ac791acb2841899d63594eb3d34e43e3 /localedata/tests-mbwc/dat_strcoll.c
parenta0c9a28b7cc5d8b85d4e65109729ad9a7a9ebe00 (diff)
downloadglibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar
glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar.gz
glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar.bz2
glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.zip
* tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg.
(TST_DECL_VARS): Don't declare err_flg. (TST_GET_ERRET): Don't set err_flg. (TST_GET_ERRET_SEQ): Likewise. (TST_IF_RETURN): Don't use err_flg, check err_exp directly. * tests-mbwc/dat_swscanf.c: Don't set err_flg. * tests-mbwc/dat_iswalnum.c: Likewise. * tests-mbwc/dat_iswalpha.c: Likewise. * tests-mbwc/dat_iswcntrl.c: Likewise. * tests-mbwc/dat_iswctype.c: Likewise. * tests-mbwc/dat_iswdigit.c: Likewise. * tests-mbwc/dat_iswgraph.c: Likewise. * tests-mbwc/dat_iswlower.c: Likewise. * tests-mbwc/dat_iswprint.c: Likewise. * tests-mbwc/dat_iswpunct.c: Likewise. * tests-mbwc/dat_iswspace.c: Likewise. * tests-mbwc/dat_iswupper.c: Likewise. * tests-mbwc/dat_iswxdigit.c: Likewise. * tests-mbwc/dat_mblen.c: Likewise. * tests-mbwc/dat_mbrlen.c: Likewise. * tests-mbwc/dat_mbrtowc.c: Likewise. * tests-mbwc/dat_mbsrtowcs.c: Likewise. * tests-mbwc/dat_mbstowcs.c: Likewise. * 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/dat_swscanf.c: Likewise. * tests-mbwc/dat_towctrans.c: Likewise. * tests-mbwc/dat_towlower.c: Likewise. * tests-mbwc/dat_towupper.c: Likewise. * tests-mbwc/dat_wcrtomb.c: Likewise. * tests-mbwc/dat_wcscat.c: Likewise. * tests-mbwc/dat_wcschr.c: Likewise. * tests-mbwc/dat_wcscmp.c: Likewise. * tests-mbwc/dat_wcscoll.c: Likewise. * tests-mbwc/dat_wcscpy.c: Likewise. * tests-mbwc/dat_wcscspn.c: Likewise. * tests-mbwc/dat_wcslen.c: Likewise. * tests-mbwc/dat_wcsncat.c: Likewise. * tests-mbwc/dat_wcsncmp.c: Likewise. * tests-mbwc/dat_wcsncpy.c: Likewise. * tests-mbwc/dat_wcspbrk.c: Likewise. * tests-mbwc/dat_wcsrtombs.c: Likewise. * tests-mbwc/dat_wcsspn.c: Likewise. * tests-mbwc/dat_wcsstr.c: Likewise. * tests-mbwc/dat_wcstod.c: Likewise. * tests-mbwc/dat_wcstok.c: Likewise. * tests-mbwc/dat_wcstombs.c: Likewise. * tests-mbwc/dat_wcswidth.c: Likewise. * tests-mbwc/dat_wcsxfrm.c: Likewise. * tests-mbwc/dat_wctob.c: Likewise. * tests-mbwc/dat_wctomb.c: Likewise. * tests-mbwc/dat_wctrans.c: Likewise. * tests-mbwc/dat_wctype.c: Likewise. * tests-mbwc/dat_wcwidth.c: Likewise. * tests-mbwc/dat_isw-funcs.h: Fix comment. 2000-08-18 Andreas Jaeger <aj@suse.de> * tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg. (TST_DECL_VARS): Don't declare err_flg. (TST_GET_ERRET): Don't set err_flg. (TST_GET_ERRET_SEQ): Likewise. (TST_IF_RETURN): Don't use err_flg, check err_exp directly. * tests-mbwc/dat_swscanf.c: Don't set err_flg. * tests-mbwc/dat_iswalnum.c: Likewise. * tests-mbwc/dat_iswalpha.c: Likewise. * tests-mbwc/dat_iswcntrl.c: Likewise. * tests-mbwc/dat_iswctype.c: Likewise. * tests-mbwc/dat_iswdigit.c: Likewise. * tests-mbwc/dat_iswgraph.c: Likewise. * tests-mbwc/dat_iswlower.c: Likewise. * tests-mbwc/dat_iswprint.c: Likewise. * tests-mbwc/dat_iswpunct.c: Likewise. * tests-mbwc/dat_iswspace.c: Likewise. * tests-mbwc/dat_iswupper.c: Likewise. * tests-mbwc/dat_iswxdigit.c: Likewise. * tests-mbwc/dat_mblen.c: Likewise. * tests-mbwc/dat_mbrlen.c: Likewise. * tests-mbwc/dat_mbrtowc.c: Likewise. * tests-mbwc/dat_mbsrtowcs.c: Likewise. * tests-mbwc/dat_mbstowcs.c: Likewise. * 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/dat_swscanf.c: Likewise. * tests-mbwc/dat_towctrans.c: Likewise. * tests-mbwc/dat_towlower.c: Likewise. * tests-mbwc/dat_towupper.c: Likewise. * tests-mbwc/dat_wcrtomb.c: Likewise. * tests-mbwc/dat_wcscat.c: Likewise. * tests-mbwc/dat_wcschr.c: Likewise. * tests-mbwc/dat_wcscmp.c: Likewise. * tests-mbwc/dat_wcscoll.c: Likewise. * tests-mbwc/dat_wcscpy.c: Likewise. * tests-mbwc/dat_wcscspn.c: Likewise. * tests-mbwc/dat_wcslen.c: Likewise. * tests-mbwc/dat_wcsncat.c: Likewise. * tests-mbwc/dat_wcsncmp.c: Likewise. * tests-mbwc/dat_wcsncpy.c: Likewise. * tests-mbwc/dat_wcspbrk.c: Likewise. * tests-mbwc/dat_wcsrtombs.c: Likewise. * tests-mbwc/dat_wcsspn.c: Likewise. * tests-mbwc/dat_wcsstr.c: Likewise. * tests-mbwc/dat_wcstod.c: Likewise. * tests-mbwc/dat_wcstok.c: Likewise. * tests-mbwc/dat_wcstombs.c: Likewise. * tests-mbwc/dat_wcswidth.c: Likewise. * tests-mbwc/dat_wcsxfrm.c: Likewise. * tests-mbwc/dat_wctob.c: Likewise. * tests-mbwc/dat_wctomb.c: Likewise. * tests-mbwc/dat_wctrans.c: Likewise. * tests-mbwc/dat_wctype.c: Likewise. * tests-mbwc/dat_wcwidth.c: Likewise. * tests-mbwc/dat_isw-funcs.h: Fix comment.
Diffstat (limited to 'localedata/tests-mbwc/dat_strcoll.c')
-rw-r--r--localedata/tests-mbwc/dat_strcoll.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/localedata/tests-mbwc/dat_strcoll.c b/localedata/tests-mbwc/dat_strcoll.c
index 8ef92e4fb9..4afd719e29 100644
--- a/localedata/tests-mbwc/dat_strcoll.c
+++ b/localedata/tests-mbwc/dat_strcoll.c
@@ -28,31 +28,31 @@ TST_STRCOLL tst_strcoll_loc [] = {
{ Tstrcoll, TST_LOC_de },
{
{ /*input.*/ { "ÄBCDEFG", "ÄBCDEFG" }, /* #1 */
- /*expect*/ { 1,0,1,0, },
+ /*expect*/ { 0,1,0, },
},
{ /*input.*/ { "XX Ä XX", "XX B XX" }, /* #2 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "XX B XX", "XX Ä XX" }, /* #3 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "B", "a" }, /* #4 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "a", "B" }, /* #5 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "b", "A" }, /* #6 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "A", "b" }, /* #7 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "ä", "B" }, /* #8 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "B", "ä" }, /* #9 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{ is_last: 1 } /* Last element. */
}
@@ -61,39 +61,39 @@ TST_STRCOLL tst_strcoll_loc [] = {
{ Tstrcoll, TST_LOC_enUS },
{
{ /*input.*/ { "ABCDEFG", "ABCDEFG" }, /* #1 */
- /*expect*/ { 1,0,1,0, },
+ /*expect*/ { 0,1,0, },
},
{ /*input.*/ { "XX a XX", "XX B XX" }, /* #2 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "XX B XX", "XX a XX" }, /* #3 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{
/* <WAIVER> */
/*input.*/ { "B", "a" }, /* #4 */
#ifdef SHOJI_IS_RIGHT
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
#else
/* XXX We are not testing the C locale. */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
#endif
},
{
/* <WAIVER> */
/*input.*/ { "a", "B" }, /* #5 */
#ifdef SHOJI_IS_RIGHT
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
#else
/* XXX We are not testing the C locale. */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
#endif
},
{ /*input.*/ { "b", "A" }, /* #6 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "A", "b" }, /* #7 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
#ifdef NO_WAIVER
/* XXX I do not yet know whether strcoll really should reject
@@ -101,12 +101,12 @@ TST_STRCOLL tst_strcoll_loc [] = {
{
/* #8 */ /* <WAIVER> */
/*input.*/ { "\244\242\244\244\244\246\244\250\244\252", "ABCDEFG" },
- /*expect*/ { 1,EINVAL,0,0, },
+ /*expect*/ { EINVAL,0,0, },
},
{
/* #9 */ /* <WAIVER> */
/*input.*/ { "ABCZEFG", "\244\242\244\244\244\246\244\250\244\252" },
- /*expect*/ { 1,EINVAL,0,0, },
+ /*expect*/ { EINVAL,0,0, },
},
#endif
{ is_last: 1 } /* Last element. */
@@ -117,27 +117,27 @@ TST_STRCOLL tst_strcoll_loc [] = {
{
{ /*input.*/ { "\244\242\244\244\244\246\244\250\244\252",
"\244\242\244\244\244\246\244\250\244\252" }, /* #1 */
- /*expect*/ { 1,0,1,0, },
+ /*expect*/ { 0,1,0, },
},
{ /*input.*/ { "\244\242\244\244\244\246\244\250\244\252",
"\244\242\244\244\244\363\244\250\244\252" }, /* #2 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "\244\242\244\244\244\363\244\250\244\252",
"\244\242\244\244\244\246\244\250\244\252" }, /* #3 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "B", "a" }, /* #4 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
{ /*input.*/ { "a", "B" }, /* #5 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "b", "A" }, /* #6 */
- /*expect*/ { 1,0,0,+1, },
+ /*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "A", "b" }, /* #7 */
- /*expect*/ { 1,0,0,-1, },
+ /*expect*/ { 0,0,-1, },
},
#ifdef NO_WAIVER
/* XXX I do not yet know whether strcoll really should reject
@@ -145,12 +145,12 @@ TST_STRCOLL tst_strcoll_loc [] = {
{
/* <WAIVER> */
/*input.*/ { "\200\216\217", "ABCDEFG" }, /* #8 */
- /*expect*/ { 1,EINVAL,0,0, },
+ /*expect*/ { EINVAL,0,0, },
},
{
/* <WAIVER> */
/*input.*/ { "ABCZEFG", "\200\216\217" }, /* #9 */
- /*expect*/ { 1,EINVAL,0,0, },
+ /*expect*/ { EINVAL,0,0, },
},
#endif
{ is_last: 1 } /* Last element. */