diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-10-01 18:47:09 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-10-01 18:47:09 +0000 |
| commit | d6040f178121e25478673ba0668acb7e54a299b8 (patch) | |
| tree | 71fd6bb7971c55a5c64be749e4336f11a25b4c7d /localedata | |
| parent | aaca11d8a11e4c04c7a5ed1db0adaf4a4c192853 (diff) | |
| download | glibc-d6040f178121e25478673ba0668acb7e54a299b8.tar.gz glibc-d6040f178121e25478673ba0668acb7e54a299b8.tar.xz glibc-d6040f178121e25478673ba0668acb7e54a299b8.zip | |
Update.
2000-09-30 Bruno Haible <haible@clisp.cons.org> * tests-mbwc/tst_wcscmp.c (tst_wcscmp): Take the sign of ret. * tests-mbwc/dat_wcscmp.c (tst_wcscmp_loc): Don't expect precise return values. Only the sign matters.
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 6 | ||||
| -rw-r--r-- | localedata/tests-mbwc/dat_wcscmp.c | 36 | ||||
| -rw-r--r-- | localedata/tests-mbwc/tst_wcscmp.c | 1 |
3 files changed, 25 insertions, 18 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 705414c903..b8899b3687 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2000-09-30 Bruno Haible <haible@clisp.cons.org> + + * tests-mbwc/tst_wcscmp.c (tst_wcscmp): Take the sign of ret. + * tests-mbwc/dat_wcscmp.c (tst_wcscmp_loc): Don't expect precise + return values. Only the sign matters. + 2000-09-28 Ulrich Drepper <drepper@redhat.com> * locales/ar_SA: Last non <Uxxxx> entries removed. diff --git a/localedata/tests-mbwc/dat_wcscmp.c b/localedata/tests-mbwc/dat_wcscmp.c index fba0283ddf..d479ab49f3 100644 --- a/localedata/tests-mbwc/dat_wcscmp.c +++ b/localedata/tests-mbwc/dat_wcscmp.c @@ -26,27 +26,27 @@ TST_WCSCMP tst_wcscmp_loc [] = { }, { /*input.*/ { { 0x00D1,0x00D1,0x00D3,0x0000 }, { 0x0000,0x00D2,0x00D3,0x0000 }, }, /* #3 */ - /*expect*/ { 0,1,0x00D1, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x0000,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D1,0x00D3,0x0000 }, }, /* #4 */ - /*expect*/ { 0,1,-0x00D1, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x00D1,0x00D5,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D3,0x0000 }, }, /* #5 */ - /*expect*/ { 0,1,3, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D3,0x0000 }, { 0x00D1,0x00D2,0x00D9,0x0000 }, }, /* #6 */ - /*expect*/ { 0,1,-6, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x0000 }, { 0x00D1,0x00D2,0x00D9,0x0000 }, }, /* #7 */ - /*expect*/ { 0,1,-0x00D9, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x00D1,0x00D2,0x00D9,0x0000 }, { 0x00D1,0x00D2,0x0000 }, }, /* #8 */ - /*expect*/ { 0,1,0x00D9, }, + /*expect*/ { 0,1,1, }, }, { is_last: 1 } } @@ -64,27 +64,27 @@ TST_WCSCMP tst_wcscmp_loc [] = { }, { /*input.*/ { { 0x0041,0x0041,0x0043,0x0000 }, { 0x0000,0x0042,0x0043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,1,0x0041, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x0000,0x0042,0x0043,0x0000 }, { 0x0041,0x0041,0x0043,0x0000 }, }, /* #4 */ - /*expect*/ { 0,1,-0x0041, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x0041,0x0045,0x0043,0x0000 }, { 0x0041,0x0042,0x0043,0x0000 }, }, /* #5 */ - /*expect*/ { 0,1,3, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 }, { 0x0041,0x0042,0x0049,0x0000 }, }, /* #6 */ - /*expect*/ { 0,1,-6, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x0041,0x0042,0x0000 }, { 0x0041,0x0042,0x0049,0x0000 }, }, /* #7 */ - /*expect*/ { 0,1,-0x0049, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x0041,0x0042,0x0049,0x0000 }, { 0x0041,0x0042,0x0000 }, }, /* #8 */ - /*expect*/ { 0,1,0x0049, }, + /*expect*/ { 0,1,1, }, }, { is_last: 1 } } @@ -102,27 +102,27 @@ TST_WCSCMP tst_wcscmp_loc [] = { }, { /*input.*/ { { 0x3041,0x3041,0x3043,0x0000 }, { 0x0000,0x3042,0x3043,0x0000 }, }, /* #3 */ - /*expect*/ { 0,1,0x3041, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x0000,0x3042,0x3043,0x0000 }, { 0x3041,0x3041,0x3043,0x0000 }, }, /* #4 */ - /*expect*/ { 0,1,-0x3041, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x3041,0x3045,0x3043,0x0000 }, { 0x3041,0x3042,0x3043,0x0000 }, }, /* #5 */ - /*expect*/ { 0,1,3, }, + /*expect*/ { 0,1,1, }, }, { /*input.*/ { { 0x3041,0x3042,0x3043,0x0000 }, { 0x3041,0x3042,0x3049,0x0000 }, }, /* #6 */ - /*expect*/ { 0,1,-6, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x3041,0x3042,0x0000 }, { 0x3041,0x3042,0x3049,0x0000 }, }, /* #7 */ - /*expect*/ { 0,1,-0x3049, }, + /*expect*/ { 0,1,-1, }, }, { /*input.*/ { { 0x3041,0x3042,0x3049,0x0000 }, { 0x3041,0x3042,0x0000 }, }, /* #8 */ - /*expect*/ { 0,1,0x3049, }, + /*expect*/ { 0,1,1, }, }, { is_last: 1 } } diff --git a/localedata/tests-mbwc/tst_wcscmp.c b/localedata/tests-mbwc/tst_wcscmp.c index ecd825c228..594682ce9d 100644 --- a/localedata/tests-mbwc/tst_wcscmp.c +++ b/localedata/tests-mbwc/tst_wcscmp.c @@ -23,6 +23,7 @@ tst_wcscmp (FILE * fp, int debug_flg) ws1 = TST_INPUT (wcscmp).ws1; ws2 = TST_INPUT (wcscmp).ws2; ret = wcscmp (ws1, ws2); + ret = (ret > 0 ? 1 : ret < 0 ? -1 : 0); if (debug_flg) { |