From 27ffef477cf5c8a7ee463002db538f5654b9ab4d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 29 Jun 2000 23:35:35 +0000 Subject: Update. 2000-06-29 Ulrich Drepper * 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)))): --- localedata/tests-mbwc/dat_strfmon.c | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'localedata/tests-mbwc/dat_strfmon.c') diff --git a/localedata/tests-mbwc/dat_strfmon.c b/localedata/tests-mbwc/dat_strfmon.c index 1252ecfe4e..ada8c47b0a 100644 --- a/localedata/tests-mbwc/dat_strfmon.c +++ b/localedata/tests-mbwc/dat_strfmon.c @@ -20,13 +20,23 @@ TST_STRFMON tst_strfmon_loc [] = { { { /* #01 */ +#ifdef NO_WAIVER /*inp*/ { 23, "%n %% %i", 123.00 }, /*exp*/ { 1,0,1,22, "123,00 DM % 123,00 DEM" }, +#else + /*inp*/ { 24, "%n %% %i", 123.00 }, + /*exp*/ { 1,0,1,23, "123,00 DM % 123,00 DEM " }, +#endif }, { /* #02 */ +#ifdef NO_WAIVER /*inp*/ { 23, "%n %% %i", 123.00 }, /*exp*/ { 1,0,1,22, "123,00 DM % 123,00 DEM" }, +#else + /*inp*/ { 24, "%n %% %i", 123.00 }, + /*exp*/ { 1,0,1,23, "123,00 DM % 123,00 DEM " }, +#endif }, { /* #03 */ @@ -36,57 +46,101 @@ TST_STRFMON tst_strfmon_loc [] = { { /* #04 */ /*inp*/ { 30, "%n|%i", 1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,24, "1.234,56 DM|1.234,56 DEM" }, +#else + /*exp*/ { 1,0,1,25, "1.234,56 DM|1.234,56 DEM " }, +#endif }, { /* #05 */ /*inp*/ { 32, "%n|%i", -1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,26, "-1.234,56 DM|-1.234,56 DEM"}, +#else + /*exp*/ { 1,0,1,27, "-1.234,56 DM|-1.234,56 DEM "}, +#endif }, { /* #06 */ /*inp*/ { 32, "%12n|%12i", 1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,25, " 1.234,56 DM|1.234,56 DEM"}, +#else + /*exp*/ { 1,0,1,26, " 1.234,56 DM|1.234,56 DEM "}, +#endif }, { /* #07 */ /*inp*/ { 32, "%12n|%12i", -1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,26, "-1.234,56 DM|-1.234,56 DEM"}, +#else + /*exp*/ { 1,0,1,27, "-1.234,56 DM|-1.234,56 DEM "}, +#endif }, { /* #08 */ /*inp*/ { 32, "%#5n|%#5i", 1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,28, " 1.234,56 DM| 1.234,56 DEM"}, +#else + /*exp*/ { 1,0,1,29, " 1.234,56 DM| 1.234,56 DEM "}, +#endif }, { /* #09 */ /*inp*/ { 32, "%#5n|%#5i", -1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,28, "- 1.234,56 DM|- 1.234,56 DEM"}, +#else + /*exp*/ { 1,0,1,29, "- 1.234,56 DM|- 1.234,56 DEM "}, +#endif }, { /* #10 */ /*inp*/ { 32, "%=*#5n|%=*#5i", 1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,28, " *1.234,56 DM| *1.234,56 DEM"}, +#else + /*exp*/ { 1,0,1,29, " *1.234,56 DM| *1.234,56 DEM "}, +#endif }, { /* #11 */ /*inp*/ { 32, "%=0#5n|%=0#5i", -1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,28, "-01.234,56 DM|-01.234,56 DEM"}, +#else + /*exp*/ { 1,0,1,29, "-01.234,56 DM|-01.234,56 DEM "}, +#endif }, { /* #12 */ /*inp*/ { 32, "%^#5n|%^#5i", -1234.561 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,26, "- 1234,56 DM|- 1234,56 DEM"}, +#else + /*exp*/ { 1,0,1,27, "- 1234,56 DM|- 1234,56 DEM "}, +#endif }, { /* #13 */ /*inp*/ { 32, "%#5.0n|%#5.0i", 1234.444 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,22, " 1.234 DM| 1.234 DEM" }, +#else + /*exp*/ { 1,0,1,23, " 1.234 DM| 1.234 DEM " }, +#endif }, { /* #14 */ /*inp*/ { 32, "%#5.0n|%#5.4i", -1234.555 }, +#ifdef NO_WAIVER /*exp*/ { 1,0,1,27, "- 1.235 DM|- 1.234,5550 DEM"}, +#else + /*exp*/ { 1,0,1,28, "- 1.235 DM|- 1.234,5550 DEM "}, +#endif }, { /* #15 */ -- cgit 1.4.1