Mercurial > hg > octave-kai > gnulib-hg

changeset 10915:f4d48672847f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid test failure on platforms where sizeof (wchar_t) < sizeof (int).
author Bruno Haible <bruno@clisp.org>
date Sat, 20 Dec 2008 04:21:20 +0100
parents 4200847287e8
children 1ac461103142
files tests/test-mbrtowc.c tests/test-mbsrtowcs.c
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-mbrtowc.c
+++ b/tests/test-mbrtowc.c
@@ -120,7 +120,7 @@
     wc = 0xBADFACE;
     ret = mbrtowc (&wc, NULL, 5, &state);
     ASSERT (ret == 0);
-    ASSERT (wc == 0xBADFACE);
+    ASSERT (wc == (wchar_t) 0xBADFACE);
     ASSERT (mbsinit (&state));
   }
 
@@ -185,7 +185,7 @@
 	  wc = 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 1, 1, &state);
 	  ASSERT (ret == (size_t)(-2));
-	  ASSERT (wc == 0xBADFACE);
+	  ASSERT (wc == (wchar_t) 0xBADFACE);
 	  ASSERT (!mbsinit (&state));
 	  input[1] = '\0';
 
@@ -235,7 +235,7 @@
 	  wc = 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 1, 1, &state);
 	  ASSERT (ret == (size_t)(-2));
-	  ASSERT (wc == 0xBADFACE);
+	  ASSERT (wc == (wchar_t) 0xBADFACE);
 	  ASSERT (!mbsinit (&state));
 	  input[1] = '\0';
 
@@ -287,7 +287,7 @@
 	  wc = 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 1, 1, &state);
 	  ASSERT (ret == (size_t)(-2));
-	  ASSERT (wc == 0xBADFACE);
+	  ASSERT (wc == (wchar_t) 0xBADFACE);
 	  ASSERT (!mbsinit (&state));
 	  input[1] = '\0';
 
--- a/tests/test-mbsrtowcs.c
+++ b/tests/test-mbsrtowcs.c
@@ -68,7 +68,7 @@
     src = "";
     ret = mbsrtowcs (&wc, &src, 0, &state);
     ASSERT (ret == 0);
-    ASSERT (wc == 0xBADFACE);
+    ASSERT (wc == (wchar_t) 0xBADFACE);
     ASSERT (mbsinit (&state));
 
     wc = 0xBADFACE;
@@ -133,10 +133,10 @@
 		    ASSERT (buf[1] == 'e');
 		    ASSERT (buf[2] == 'r');
 		    ASSERT (buf[3] == 0);
-		    ASSERT (buf[4] == 0xBADFACE);
+		    ASSERT (buf[4] == (wchar_t) 0xBADFACE);
 		  }
 		else
-		  ASSERT (buf[1] == 0xBADFACE);
+		  ASSERT (buf[1] == (wchar_t) 0xBADFACE);
 		ASSERT (mbsinit (&state));
 	      }
 	      return 0;
@@ -157,7 +157,7 @@
 		wc = 0xBADFACE;
 		ret = mbrtowc (&wc, input + 1, 1, &state);
 		ASSERT (ret == (size_t)(-2));
-		ASSERT (wc == 0xBADFACE);
+		ASSERT (wc == (wchar_t) 0xBADFACE);
 		ASSERT (!mbsinit (&state));
 		input[1] = '\0';
 
@@ -178,10 +178,10 @@
 		    ASSERT (buf[2] == 'e');
 		    ASSERT (buf[3] == 'r');
 		    ASSERT (buf[4] == 0);
-		    ASSERT (buf[5] == 0xBADFACE);
+		    ASSERT (buf[5] == (wchar_t) 0xBADFACE);
 		  }
 		else
-		  ASSERT (buf[2] == 0xBADFACE);
+		  ASSERT (buf[2] == (wchar_t) 0xBADFACE);
 		ASSERT (mbsinit (&state));
 	      }
 	      return 0;
@@ -202,7 +202,7 @@
 		wc = 0xBADFACE;
 		ret = mbrtowc (&wc, input + 1, 1, &state);
 		ASSERT (ret == (size_t)(-2));
-		ASSERT (wc == 0xBADFACE);
+		ASSERT (wc == (wchar_t) 0xBADFACE);
 		ASSERT (!mbsinit (&state));
 		input[1] = '\0';
 
@@ -223,10 +223,10 @@
 		    ASSERT (buf[2] == 'e');
 		    ASSERT (buf[3] == 'r');
 		    ASSERT (buf[4] == 0);
-		    ASSERT (buf[5] == 0xBADFACE);
+		    ASSERT (buf[5] == (wchar_t) 0xBADFACE);
 		  }
 		else
-		  ASSERT (buf[2] == 0xBADFACE);
+		  ASSERT (buf[2] == (wchar_t) 0xBADFACE);
 		ASSERT (mbsinit (&state));
 	      }
 	      return 0;
@@ -247,7 +247,7 @@
 		wc = 0xBADFACE;
 		ret = mbrtowc (&wc, input + 1, 1, &state);
 		ASSERT (ret == (size_t)(-2));
-		ASSERT (wc == 0xBADFACE);
+		ASSERT (wc == (wchar_t) 0xBADFACE);
 		ASSERT (!mbsinit (&state));
 		input[1] = '\0';
 
@@ -268,10 +268,10 @@
 		    ASSERT (buf[2] == 'e');
 		    ASSERT (buf[3] == 'r');
 		    ASSERT (buf[4] == 0);
-		    ASSERT (buf[5] == 0xBADFACE);
+		    ASSERT (buf[5] == (wchar_t) 0xBADFACE);
 		  }
 		else
-		  ASSERT (buf[2] == 0xBADFACE);
+		  ASSERT (buf[2] == (wchar_t) 0xBADFACE);
 		ASSERT (mbsinit (&state));
 	      }
 	      return 0;