From 613ab49eb43a5961b948041ca3c51d968b22067e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 25 Feb 2018 01:56:35 +0100 Subject: [PATCH] mbrtowc tests: Fix regression on glibc. Reported by Bernhard Voelker. * tests/test-mbrtowc.c (main): Fix expected value of wc. --- ChangeLog | 6 ++++++ tests/test-mbrtowc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 266b41b4bf..2f2f06ead7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-02-24 Bruno Haible + + mbrtowc tests: Fix regression on glibc. + Reported by Bernhard Voelker. + * tests/test-mbrtowc.c (main): Fix expected value of wc. + 2018-02-24 Bruno Haible striconveha, uniconv/*: Avoid test failures on musl libc. diff --git a/tests/test-mbrtowc.c b/tests/test-mbrtowc.c index 54d52f8070..44da295373 100644 --- a/tests/test-mbrtowc.c +++ b/tests/test-mbrtowc.c @@ -111,7 +111,7 @@ main (int argc, char *argv[]) locale. On most platforms, the bytes 0x80..0xFF map to U+0080..U+00FF. But on musl libc, the bytes 0x80..0xFF map to U+DF80..U+DFFF. */ - ASSERT (wc == btowc (c)); + ASSERT (wc == (btowc (c) == WEOF ? c : btowc (c))); ASSERT (mbsinit (&state)); ret = mbrtowc (NULL, buf, 1, &state); ASSERT (ret == 1); -- 2.39.5