about summary refs log tree commit diff
path: root/localedata/tests-mbwc/dat_mbrlen.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-05-23 00:08:46 +0000
committerUlrich Drepper <drepper@redhat.com>2001-05-23 00:08:46 +0000
commite017830580990842266a5a4f61aca189b56723bb (patch)
treec1e6462018f73569a6db55d21e997629f7f2c94c /localedata/tests-mbwc/dat_mbrlen.c
parent1826d7933b56601f98be8740b5a3c5c07ad00e65 (diff)
downloadglibc-e017830580990842266a5a4f61aca189b56723bb.tar.gz
glibc-e017830580990842266a5a4f61aca189b56723bb.tar.xz
glibc-e017830580990842266a5a4f61aca189b56723bb.zip
Update.
2001-05-21  Bruno Haible  <haible@clisp.cons.org>

	* wcsmbs/mbrtowc.c (mbrtowc): Remove local variable 'flush', always
	use 0 instead, and rely on the converter to do the flush.
	* wcsmbs/tst-mbrtowc.c (utf8_test_1): New function, taken from
	utf8_test.
	(utf8_test_2, utf8_test_3): New function.
	(utf8_test): Call utf8_test_1, utf8_test_2, utf8_test_3.
Diffstat (limited to 'localedata/tests-mbwc/dat_mbrlen.c')
-rw-r--r--localedata/tests-mbwc/dat_mbrlen.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/localedata/tests-mbwc/dat_mbrlen.c b/localedata/tests-mbwc/dat_mbrlen.c
index 4a69833754..3d396c9ea5 100644
--- a/localedata/tests-mbwc/dat_mbrlen.c
+++ b/localedata/tests-mbwc/dat_mbrlen.c
@@ -99,21 +99,15 @@ TST_MBRLEN tst_mbrlen_loc [] = {
       { /*----------------- #01 -----------------*/
 	{
 	  {
-	    { 1, "\317\302",   1,		   0, 0 },
-#ifdef SHOJI_IS_RIGHT
-	    { 0, "",	   0,		   0, 0 },
-#else
-	    /* XXX This test depends on the internal state being empty.
-	       XXX Therefore we must explicitly clean it.  */
-	    { 0, "",	   0,		   0, 1 },
-#endif
-	    { 1, "\317\302",   USE_MBCURMAX,   0, 0 },
+	    { 1, "\317\302",   1,		   1, 1 },
+	    { 0, "",	       0,		   1, 0 },
+	    { 1, "\317\302",   USE_MBCURMAX,	   1, 1 },
 	  }
 	},
 	{
 	  {
 	    { 0,		1, -2,		     },
-	    { 0,		1,  0,		     },
+	    { 0,		1, -1,		     },
 	    { 0,		1,  2,		     },
 	  }
 	}