[haiku-commits] r43091 - haiku/trunk/src/tests/system/libroot/posix

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 2 Nov 2011 01:10:55 +0100 (CET)

Author: zooey
Date: 2011-11-02 01:10:54 +0100 (Wed, 02 Nov 2011)
New Revision: 43091
Changeset: https://dev.haiku-os.org/changeset/43091

Added:
   haiku/trunk/src/tests/system/libroot/posix/gnulib-test-btowc.c
   haiku/trunk/src/tests/system/libroot/posix/gnulib-test-mbrtowc.c
   haiku/trunk/src/tests/system/libroot/posix/gnulib-test-wcrtomb.c
Modified:
   haiku/trunk/src/tests/system/libroot/posix/Jamfile
   haiku/trunk/src/tests/system/libroot/posix/tst-mbrtowc.c
Log:
Add more tests for wchar/multibyte converter functions.

Modified: haiku/trunk/src/tests/system/libroot/posix/Jamfile
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/Jamfile  2011-11-02 00:09:52 UTC 
(rev 43090)
+++ haiku/trunk/src/tests/system/libroot/posix/Jamfile  2011-11-02 00:10:54 UTC 
(rev 43091)
@@ -37,6 +37,9 @@
 SimpleTest xsi_sem_test1 : xsi_sem_test1.cpp ;
 
 # wide character tests
+SimpleTest gnulib-test-btowc : gnulib-test-btowc.c ;
+SimpleTest gnulib-test-mbrtowc : gnulib-test-mbrtowc.c ;
+SimpleTest gnulib-test-wcrtomb : gnulib-test-wcrtomb.c ;
 SimpleTest mbtest : mbtest.c ;
 SimpleTest testmb : testmb.c ;
 SimpleTest tst-btowc : tst-btowc.c ;

Added: haiku/trunk/src/tests/system/libroot/posix/gnulib-test-btowc.c
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/gnulib-test-btowc.c              
                (rev 0)
+++ haiku/trunk/src/tests/system/libroot/posix/gnulib-test-btowc.c      
2011-11-02 00:10:54 UTC (rev 43091)
@@ -0,0 +1,76 @@
+/* Test of conversion of unibyte character to wide character.
+   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@xxxxxxxxx>, 2008.  */
+
+#include <assert.h>
+#include <locale.h>
+#include <stdio.h>
+#include <wchar.h>
+
+int
+main (int argc, char *argv[])
+{
+  int c, i;
+
+  /* configure should already have checked that the locale is supported.  */
+  if (setlocale (LC_ALL, "") == NULL) {
+       fprintf(stderr, "unable to set standard locale\n");
+    return 1;
+  }
+
+  assert (btowc (EOF) == WEOF);
+
+  for (i = '1'; i <= '2'; ++i) {
+    switch (i)
+      {
+      case '1':
+        /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
+       printf("ISO8859-1 ...\n");
+
+               if (setlocale (LC_ALL, "en_US.ISO8859-1") == NULL) {
+                 fprintf(stderr, "unable to set ISO8859-1 locale, skipping\n");
+                 break;
+               }
+
+               for (c = 0; c < 0x80; c++)
+          assert (btowc (c) == (wint_t)c);
+        for (c = 0xA0; c < 0x100; c++)
+          assert (btowc (c) != WEOF);
+        break;
+
+      case '2':
+        /* Locale encoding is UTF-8.  */
+       printf("UTF-8 ...\n");
+
+               if (setlocale (LC_ALL, "en_US.ISO8859-1") == NULL) {
+                 fprintf(stderr, "unable to set ISO8859-1 locale, skipping\n");
+                 break;
+               }
+
+       for (c = 0; c < 0x80; c++)
+          assert (btowc (c) == (wint_t)c);
+        for (c = 0x80; c < 0x100; c++)
+{
+printf("btowc(%d) = %x\n", c, btowc(c));
+               assert (btowc (c) == WEOF);
+}
+        break;
+      }
+  }
+
+  return 0;
+}

Added: haiku/trunk/src/tests/system/libroot/posix/gnulib-test-mbrtowc.c
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/gnulib-test-mbrtowc.c            
                (rev 0)
+++ haiku/trunk/src/tests/system/libroot/posix/gnulib-test-mbrtowc.c    
2011-11-02 00:10:54 UTC (rev 43091)
@@ -0,0 +1,370 @@
+/* Test of conversion of multibyte character to wide character.
+   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@xxxxxxxxx>, 2008.  */
+
+#undef NDEBUG
+#include <assert.h>
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+
+#include <Debug.h>
+
+int
+main (int argc, char *argv[])
+{
+  mbstate_t state;
+  wchar_t wc;
+  size_t ret;
+  int i;
+
+  /* configure should already have checked that the locale is supported.  */
+  if (setlocale (LC_ALL, "") == NULL) {
+       fprintf(stderr, "unable to set standard locale\n");
+    return 1;
+  }
+
+  /* Test zero-length input.  */
+  printf("zero-length input ...\n");
+  {
+    memset (&state, '\0', sizeof (mbstate_t));
+    wc = (wchar_t) 0xBADFACE;
+    ret = mbrtowc (&wc, "x", 0, &state);
+    /* gnulib's implementation returns (size_t)(-2).
+       The AIX 5.1 implementation returns (size_t)(-1).
+       glibc's implementation returns 0.  */
+    assert (ret == (size_t)(-2) || ret == (size_t)(-1) || ret == 0);
+    assert (mbsinit (&state));
+  }
+
+  /* Test NUL byte input.  */
+  printf("NUL byte input ...\n");
+  {
+    memset (&state, '\0', sizeof (mbstate_t));
+    wc = (wchar_t) 0xBADFACE;
+    ret = mbrtowc (&wc, "", 1, &state);
+    assert (ret == 0);
+    assert (wc == 0);
+    assert (mbsinit (&state));
+    ret = mbrtowc (NULL, "", 1, &state);
+    assert (ret == 0);
+    assert (mbsinit (&state));
+  }
+
+  /* Test single-byte input.  */
+  printf("single-byte input ...\n");
+  {
+    char buf[1];
+    int c;
+
+    memset (&state, '\0', sizeof (mbstate_t));
+    for (c = 0; c < 0x100; c++)
+      switch (c)
+        {
+        case '\t': case '\v': case '\f':
+        case ' ': case '!': case '"': case '#': case '%':
+        case '&': case '\'': case '(': case ')': case '*':
+        case '+': case ',': case '-': case '.': case '/':
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+        case ':': case ';': case '<': case '=': case '>':
+        case '?':
+        case 'A': case 'B': case 'C': case 'D': case 'E':
+        case 'F': case 'G': case 'H': case 'I': case 'J':
+        case 'K': case 'L': case 'M': case 'N': case 'O':
+        case 'P': case 'Q': case 'R': case 'S': case 'T':
+        case 'U': case 'V': case 'W': case 'X': case 'Y':
+        case 'Z':
+        case '[': case '\\': case ']': case '^': case '_':
+        case 'a': case 'b': case 'c': case 'd': case 'e':
+        case 'f': case 'g': case 'h': case 'i': case 'j':
+        case 'k': case 'l': case 'm': case 'n': case 'o':
+        case 'p': case 'q': case 'r': case 's': case 't':
+        case 'u': case 'v': case 'w': case 'x': case 'y':
+        case 'z': case '{': case '|': case '}': case '~':
+          /* c is in the ISO C "basic character set".  */
+          buf[0] = c;
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, buf, 1, &state);
+          assert (ret == 1);
+          assert (wc == c);
+          assert (mbsinit (&state));
+          ret = mbrtowc (NULL, buf, 1, &state);
+          assert (ret == 1);
+          assert (mbsinit (&state));
+          break;
+        }
+  }
+
+  /* Test special calling convention, passing a NULL pointer.  */
+  printf("special calling convention, passing NULL ...\n");
+  {
+    memset (&state, '\0', sizeof (mbstate_t));
+    wc = (wchar_t) 0xBADFACE;
+    ret = mbrtowc (&wc, NULL, 5, &state);
+    assert (ret == 0);
+    assert (wc == (wchar_t) 0xBADFACE);
+    assert (mbsinit (&state));
+  }
+
+  for (i = '1'; i <= '4'; ++i) {
+    switch (i)
+      {
+      case '1':
+        /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
+       printf("ISO8859-1 ...\n");
+        {
+          char input[] = "B\374\337er"; /* "Büßer" */
+          memset (&state, '\0', sizeof (mbstate_t));
+
+                 if (setlocale (LC_ALL, "en_US.ISO8859-1") == NULL) {
+                         fprintf(stderr, "unable to set ISO8859-1 locale, 
skipping\n");
+                         break;
+                 }
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input, 1, &state);
+          assert (ret == 1);
+          assert (wc == 'B');
+          assert (mbsinit (&state));
+          input[0] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 1, 1, &state);
+          assert (ret == 1);
+          assert (wctob (wc) == (unsigned char) '\374');
+          assert (mbsinit (&state));
+          input[1] = '\0';
+
+          /* Test support of NULL first argument.  */
+          ret = mbrtowc (NULL, input + 2, 3, &state);
+          assert (ret == 1);
+          assert (mbsinit (&state));
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 2, 3, &state);
+          assert (ret == 1);
+          assert (wctob (wc) == (unsigned char) '\337');
+          assert (mbsinit (&state));
+          input[2] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 3, 2, &state);
+          assert (ret == 1);
+          assert (wc == 'e');
+          assert (mbsinit (&state));
+          input[3] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 4, 1, &state);
+          assert (ret == 1);
+          assert (wc == 'r');
+          assert (mbsinit (&state));
+        }
+        break;
+
+      case '2':
+        /* Locale encoding is UTF-8.  */
+       printf("UTF-8 ...\n");
+        {
+          char input[] = "B\303\274\303\237er"; /* "Büßer" */
+          memset (&state, '\0', sizeof (mbstate_t));
+
+                 if (setlocale (LC_ALL, "en_US.UTF-8") == NULL) {
+                         fprintf(stderr, "unable to set UTF-8 locale, 
skipping\n");
+                         break;
+                 }
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input, 1, &state);
+          assert (ret == 1);
+          assert (wc == 'B');
+          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, 5, &state);
+          assert (ret == 1);
+          assert (wctob (wc) == EOF);
+          assert (mbsinit (&state));
+          input[2] = '\0';
+
+          /* Test support of NULL first argument.  */
+          ret = mbrtowc (NULL, input + 3, 4, &state);
+          assert (ret == 2);
+          assert (mbsinit (&state));
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 3, 4, &state);
+          assert (ret == 2);
+          assert (wctob (wc) == EOF);
+          assert (mbsinit (&state));
+          input[3] = '\0';
+          input[4] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 5, 2, &state);
+          assert (ret == 1);
+          assert (wc == 'e');
+          assert (mbsinit (&state));
+          input[5] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 6, 1, &state);
+          assert (ret == 1);
+          assert (wc == 'r');
+          assert (mbsinit (&state));
+        }
+        break;
+
+      case '3':
+        /* Locale encoding is EUC-JP.  */
+               printf("EUC-JP ...\n");
+        {
+          char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
+          memset (&state, '\0', sizeof (mbstate_t));
+
+                 if (setlocale (LC_ALL, "en_US.EUC-JP") == NULL) {
+                         fprintf(stderr, "unable to set EUC-JP locale, 
skipping\n");
+                         break;
+                 }
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input, 1, &state);
+          assert (ret == 1);
+          assert (wc == '<');
+          assert (mbsinit (&state));
+          input[0] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          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, 4, &state);
+          assert (ret == 1);
+          assert (wctob (wc) == EOF);
+          assert (mbsinit (&state));
+          input[4] = '\0';
+
+          /* Test support of NULL first argument.  */
+          ret = mbrtowc (NULL, input + 5, 3, &state);
+          assert (ret == 2);
+          assert (mbsinit (&state));
+
+          wc = (wchar_t) 0xBADFACE;
+          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 + 7, 1, &state);
+          assert (ret == 1);
+          assert (wc == '>');
+          assert (mbsinit (&state));
+        }
+        break;
+
+      case '4':
+        /* Locale encoding is GB18030.  */
+               printf("GB18030 ...\n");
+        {
+          char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
+          memset (&state, '\0', sizeof (mbstate_t));
+
+                 if (setlocale (LC_ALL, "en_US.GB18030") == NULL) {
+                         fprintf(stderr, "unable to set GB18030 locale, 
skipping\n");
+                         break;
+                 }
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input, 1, &state);
+          assert (ret == 1);
+          assert (wc == 'B');
+          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);
+          assert (ret == 1);
+          assert (wctob (wc) == EOF);
+          assert (mbsinit (&state));
+          input[2] = '\0';
+
+          /* Test support of NULL first argument.  */
+          ret = mbrtowc (NULL, input + 3, 6, &state);
+          assert (ret == 4);
+          assert (mbsinit (&state));
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 3, 6, &state);
+          assert (ret == 4);
+          assert (wctob (wc) == EOF);
+          assert (mbsinit (&state));
+          input[3] = '\0';
+          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');
+          assert (mbsinit (&state));
+          input[5] = '\0';
+
+          wc = (wchar_t) 0xBADFACE;
+          ret = mbrtowc (&wc, input + 8, 1, &state);
+          assert (ret == 1);
+          assert (wc == 'r');
+          assert (mbsinit (&state));
+        }
+        break;
+      }
+  }
+
+  return 0;
+}

Added: haiku/trunk/src/tests/system/libroot/posix/gnulib-test-wcrtomb.c
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/gnulib-test-wcrtomb.c            
                (rev 0)
+++ haiku/trunk/src/tests/system/libroot/posix/gnulib-test-wcrtomb.c    
2011-11-02 00:10:54 UTC (rev 43091)
@@ -0,0 +1,187 @@
+/* Test of conversion of wide character to multibyte character.
+   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@xxxxxxxxx>, 2008.  */
+
+#include <assert.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+/* Check the multibyte character s[0..n-1].  */
+static void
+check_character (const char *s, size_t n)
+{
+  wchar_t wc;
+  char buf[64];
+  int iret;
+  size_t ret;
+
+  wc = (wchar_t) 0xBADFACE;
+  iret = mbtowc (&wc, s, n);
+  assert (iret == (int)n);
+
+  ret = wcrtomb (buf, wc, NULL);
+  assert (ret == n);
+  assert (memcmp (buf, s, n) == 0);
+
+  /* Test special calling convention, passing a NULL pointer.  */
+  ret = wcrtomb (NULL, wc, NULL);
+
+  assert (ret == 1);
+}
+
+int
+main (int argc, char *argv[])
+{
+  char buf[64];
+  size_t ret;
+  int i;
+
+  /* configure should already have checked that the locale is supported.  */
+  if (setlocale (LC_ALL, "") == NULL) {
+       fprintf(stderr, "unable to set standard locale\n");
+    return 1;
+  }
+
+  /* Test NUL character.  */
+  printf("NUL character ...\n");
+  {
+    buf[0] = 'x';
+    ret = wcrtomb (buf, 0, NULL);
+    assert (ret == 1);
+    assert (buf[0] == '\0');
+  }
+
+  /* Test single bytes.  */
+  printf("single bytes ...\n");
+  {
+    int c;
+
+    for (c = 0; c < 0x100; c++)
+      switch (c)
+        {
+        case '\t': case '\v': case '\f':
+        case ' ': case '!': case '"': case '#': case '%':
+        case '&': case '\'': case '(': case ')': case '*':
+        case '+': case ',': case '-': case '.': case '/':
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+        case ':': case ';': case '<': case '=': case '>':
+        case '?':
+        case 'A': case 'B': case 'C': case 'D': case 'E':
+        case 'F': case 'G': case 'H': case 'I': case 'J':
+        case 'K': case 'L': case 'M': case 'N': case 'O':
+        case 'P': case 'Q': case 'R': case 'S': case 'T':
+        case 'U': case 'V': case 'W': case 'X': case 'Y':
+        case 'Z':
+        case '[': case '\\': case ']': case '^': case '_':
+        case 'a': case 'b': case 'c': case 'd': case 'e':
+        case 'f': case 'g': case 'h': case 'i': case 'j':
+        case 'k': case 'l': case 'm': case 'n': case 'o':
+        case 'p': case 'q': case 'r': case 's': case 't':
+        case 'u': case 'v': case 'w': case 'x': case 'y':
+        case 'z': case '{': case '|': case '}': case '~':
+          /* c is in the ISO C "basic character set".  */
+          ret = wcrtomb (buf, btowc (c), NULL);
+          assert (ret == 1);
+          assert (buf[0] == (char) c);
+          break;
+        }
+  }
+
+  /* Test special calling convention, passing a NULL pointer.  */
+  printf("special calling convention with NULL pointer ...\n");
+  {
+    ret = wcrtomb (NULL, '\0', NULL);
+    assert (ret == 1);
+    ret = wcrtomb (NULL, btowc ('x'), NULL);
+    assert (ret == 1);
+  }
+
+  for (i = '1'; i <= '4'; ++i) {
+    switch (i)
+      {
+      case '1':
+        /* Locale encoding is ISO-8859-1 or ISO-8859-15.  */
+       printf("ISO8859-1 ...\n");
+        {
+          const char input[] = "B\374\337er"; /* "Büßer" */
+
+                 if (setlocale (LC_ALL, "en_US.ISO8859-1") == NULL) {
+                         fprintf(stderr, "unable to set ISO8859-1 locale, 
skipping\n");
+                         break;
+                 }
+
+          check_character (input + 1, 1);
+          check_character (input + 2, 1);
+        }
+        break;
+
+      case '2':
+        /* Locale encoding is UTF-8.  */
+       printf("UTF-8 ...\n");
+        {
+          const char input[] = "B\303\274\303\237er"; /* "Büßer" */
+
+                 if (setlocale (LC_ALL, "en_US.UTF-8") == NULL) {
+                         fprintf(stderr, "unable to set UTF-8 locale, 
skipping\n");
+                         break;
+                 }
+
+          check_character (input + 1, 2);
+          check_character (input + 3, 2);
+        }
+        break;
+
+      case '3':
+        /* Locale encoding is EUC-JP.  */
+       printf("EUC-JP ...\n");
+        {
+          const char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
+
+                 if (setlocale (LC_ALL, "en_US.EUC-JP") == NULL) {
+                         fprintf(stderr, "unable to set EUC-JP locale, 
skipping\n");
+                         break;
+                 }
+
+          check_character (input + 1, 2);
+          check_character (input + 3, 2);
+          check_character (input + 5, 2);
+        }
+        break;
+
+      case '4':
+        /* Locale encoding is GB18030.  */
+       printf("GB18030 ...\n");
+        {
+          const char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
+
+                 if (setlocale (LC_ALL, "en_US.GB18030") == NULL) {
+                         fprintf(stderr, "unable to set GB18030 locale, 
skipping\n");
+                         break;
+                 }
+
+                 check_character (input + 1, 2);
+          check_character (input + 3, 4);
+        }
+        break;
+      }
+  }
+
+  return 0;
+}

Modified: haiku/trunk/src/tests/system/libroot/posix/tst-mbrtowc.c
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/tst-mbrtowc.c    2011-11-02 
00:09:52 UTC (rev 43090)
+++ haiku/trunk/src/tests/system/libroot/posix/tst-mbrtowc.c    2011-11-02 
00:10:54 UTC (rev 43091)
@@ -212,7 +212,7 @@
                        printf("%s: '\\x%x': not 1 returned\n", locname, c);
                        ++res;
                } else if (wc != (wchar_t) c) {
-                       printf("%s: '\\x%x': wc != L'\\x%x'\n", locname, c, c);
+                       printf("%s: '\\x%x' != wc != L'\\x%x'\n", locname, c, 
wc);
                        ++res;
                }
        }


Other related posts:

  • » [haiku-commits] r43091 - haiku/trunk/src/tests/system/libroot/posix - zooey