From: Bruno Haible <bruno@clisp.org>
Date: Sun, 21 Dec 2008 01:36:06 +0000 (+0100)
Subject: Avoid test failure on AIX.
X-Git-Tag: v0.1~6562
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=6d65e7578f692b2d06574e25a848cef93b02ed25;p=gnulib.git

Avoid test failure on AIX.
---

diff --git a/ChangeLog b/ChangeLog
index 91792f154..b5ee9e7be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-12-20  Bruno Haible  <bruno@clisp.org>
 
+	* tests/test-mbrtowc.c (main): Change sample string in EUC-JP encoding
+	so that there are no conversion errors on AIX.
+	* tests/test-mbsrtowcs.c (main): LIkewise.
+
+2008-12-20  Bruno Haible  <bruno@clisp.org>
+
 	Work around wctob bug on Solaris <= 9.
 	* lib/wchar.in.h (wctob): Redefine if REPLACE_WCTOB is set.
 	* m4/wctob.m4 (gl_FUNC_WCTOB): Test whether wctob works.
diff --git a/tests/test-mbrtowc.c b/tests/test-mbrtowc.c
index ad909999b..8f1f1bec8 100644
--- a/tests/test-mbrtowc.c
+++ b/tests/test-mbrtowc.c
@@ -225,51 +225,50 @@ main (int argc, char *argv[])
       case '3':
 	/* Locale encoding is EUC-JP.  */
 	{
-	  char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+	  char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
 	  memset (&state, '\0', sizeof (mbstate_t));
 
 	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input, 1, &state);
 	  ASSERT (ret == 1);
-	  ASSERT (wc == 'B');
+	  ASSERT (wc == '<');
 	  ASSERT (mbsinit (&state));
 	  input[0] = '\0';
 
 	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 1, 1, &state);
-	  ASSERT (ret == (size_t)(-2));
-	  ASSERT (wc == (wchar_t) 0xBADFACE);
-	  ASSERT (!mbsinit (&state));
-	  input[1] = '\0';
-
-	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 2, 7, &state);
+	  ret = mbrtowc (&wc, input + 1, 2, &state);
 	  ASSERT (ret == 2);
 	  ASSERT (wctob (wc) == EOF);
 	  ASSERT (mbsinit (&state));
+	  input[1] = '\0';
 	  input[2] = '\0';
+
+	  wc = (wchar_t) 0xBADFACE;
+	  ret = mbrtowc (&wc, input + 3, 1, &state);
+	  ASSERT (ret == (size_t)(-2));
+	  ASSERT (wc == (wchar_t) 0xBADFACE);
+	  ASSERT (!mbsinit (&state));
 	  input[3] = '\0';
 
 	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 4, 5, &state);
-	  ASSERT (ret == 3);
+	  ret = mbrtowc (&wc, input + 4, 4, &state);
+	  ASSERT (ret == 1);
 	  ASSERT (wctob (wc) == EOF);
 	  ASSERT (mbsinit (&state));
 	  input[4] = '\0';
-	  input[5] = '\0';
-	  input[6] = '\0';
 
 	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 7, 2, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'e');
+	  ret = mbrtowc (&wc, input + 5, 3, &state);
+	  ASSERT (ret == 2);
+	  ASSERT (wctob (wc) == EOF);
 	  ASSERT (mbsinit (&state));
 	  input[5] = '\0';
+	  input[6] = '\0';
 
 	  wc = (wchar_t) 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 8, 1, &state);
+	  ret = mbrtowc (&wc, input + 7, 1, &state);
 	  ASSERT (ret == 1);
-	  ASSERT (wc == 'r');
+	  ASSERT (wc == '>');
 	  ASSERT (mbsinit (&state));
 	}
 	return 0;
diff --git a/tests/test-mbsrtowcs.c b/tests/test-mbsrtowcs.c
index 9f9c9a322..27fd58ce1 100644
--- a/tests/test-mbsrtowcs.c
+++ b/tests/test-mbsrtowcs.c
@@ -189,41 +189,48 @@ main (int argc, char *argv[])
 	    case '3':
 	      /* Locale encoding is EUC-JP.  */
 	      {
-		char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+		char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
 		memset (&state, '\0', sizeof (mbstate_t));
 
 		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input, 1, &state);
 		ASSERT (ret == 1);
-		ASSERT (wc == 'B');
+		ASSERT (wc == '<');
 		ASSERT (mbsinit (&state));
 		input[0] = '\0';
 
 		wc = (wchar_t) 0xBADFACE;
-		ret = mbrtowc (&wc, input + 1, 1, &state);
+		ret = mbrtowc (&wc, input + 1, 2, &state);
+		ASSERT (ret == 2);
+		ASSERT (wctob (wc) == EOF);
+		ASSERT (mbsinit (&state));
+		input[1] = '\0';
+		input[2] = '\0';
+
+		wc = (wchar_t) 0xBADFACE;
+		ret = mbrtowc (&wc, input + 3, 1, &state);
 		ASSERT (ret == (size_t)(-2));
 		ASSERT (wc == (wchar_t) 0xBADFACE);
 		ASSERT (!mbsinit (&state));
-		input[1] = '\0';
+		input[3] = '\0';
 
-		src = input + 2;
+		src = input + 4;
 		ret = mbsrtowcs (NULL, &src, unlimited ? BUFSIZE : 2, &state);
-		ASSERT (ret == 4);
-		ASSERT (src == input + 2);
+		ASSERT (ret == 3);
+		ASSERT (src == input + 4);
 		ASSERT (!mbsinit (&state));
 
-		src = input + 2;
+		src = input + 4;
 		ret = mbsrtowcs (buf, &src, unlimited ? BUFSIZE : 2, &state);
-		ASSERT (ret == (unlimited ? 4 : 2));
+		ASSERT (ret == (unlimited ? 3 : 2));
 		ASSERT (src == (unlimited ? NULL : input + 7));
 		ASSERT (wctob (buf[0]) == EOF);
 		ASSERT (wctob (buf[1]) == EOF);
 		if (unlimited)
 		  {
-		    ASSERT (buf[2] == 'e');
-		    ASSERT (buf[3] == 'r');
-		    ASSERT (buf[4] == 0);
-		    ASSERT (buf[5] == (wchar_t) 0xBADFACE);
+		    ASSERT (buf[2] == '>');
+		    ASSERT (buf[3] == 0);
+		    ASSERT (buf[4] == (wchar_t) 0xBADFACE);
 		  }
 		else
 		  ASSERT (buf[2] == (wchar_t) 0xBADFACE);