From 7aebcc2d9db10d1611a611ea44f51c003c867f03 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Jan 2020 20:45:03 +0100 Subject: [PATCH] iswdigit tests: Avoid test failure on Cygwin. * tests/test-iswdigit.c (for_character): If mbrtowc cannot convert the byte sequence, return 0. --- ChangeLog | 4 ++++ tests/test-iswdigit.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a541c4480b..2a1fdd6842 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2020-01-25 Bruno Haible + 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. diff --git a/tests/test-iswdigit.c b/tests/test-iswdigit.c index 5bfe2a4327..a7f8ef5813 100644 --- a/tests/test-iswdigit.c +++ b/tests/test-iswdigit.c @@ -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 -- 2.39.5