]> Savannah Git Hosting - gnulib.git/commitdiff
iswdigit tests: Avoid test failure on Cygwin.
authorBruno Haible <bruno@clisp.org>
Sat, 25 Jan 2020 19:45:03 +0000 (20:45 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 25 Jan 2020 19:45:03 +0000 (20:45 +0100)
* tests/test-iswdigit.c (for_character): If mbrtowc cannot convert the
byte sequence, return 0.

ChangeLog
tests/test-iswdigit.c

index a541c4480b9ab2d83f42a8afa47008e5d68e87c8..2a1fdd684273f0589a11d9843ad4c773bdf1dea4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-01-25  Bruno Haible  <bruno@clisp.org>
 
+       iswdigit tests: Avoid test failure on Cygwin.
+       * tests/test-iswdigit.c (for_character): If mbrtowc cannot convert the
+       byte sequence, return 0.
+
        iswdigit: Fix test failure on native Windows.
        * lib/wctype.in.h (rpl_iswdigit): Rely on ISO C compliant definition.
 
index 5bfe2a4327ce703afac11b678ffda8102c6b1709..a7f8ef58135a36b58b95641d4bd8403a771a81bb 100644 (file)
@@ -39,9 +39,10 @@ for_character (const char *s, size_t n)
   memset (&state, '\0', sizeof (mbstate_t));
   wc = (wchar_t) 0xBADFACE;
   ret = mbrtowc (&wc, s, n, &state);
-  ASSERT (ret == n);
-
-  return iswdigit (wc);
+  if (ret == n)
+    return iswdigit (wc);
+  else
+    return 0;
 }
 
 int