From 58ee14c1ec71f63018db2e8f2d0e3d9cde4f3019 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 24 Jun 2018 16:10:16 +0200 Subject: [PATCH] wchar-single: Fix test failure in wcwidth tests. * tests/test-wcwidth.c (main): If the wchar-single module is present, skip the tests in the C locale. --- ChangeLog | 6 ++++++ tests/test-wcwidth.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3459c88f49..f5ea912415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-06-24 Bruno Haible + + wchar-single: Fix test failure in wcwidth tests. + * tests/test-wcwidth.c (main): If the wchar-single module is present, + skip the tests in the C locale. + 2018-06-23 Pádraig Brady crypto: mention --without-linux-crypto in --with-openssl --help diff --git a/tests/test-wcwidth.c b/tests/test-wcwidth.c index f0eb7ab486..4aa6ab7420 100644 --- a/tests/test-wcwidth.c +++ b/tests/test-wcwidth.c @@ -35,10 +35,12 @@ main () { wchar_t wc; -#ifdef C_CTYPE_ASCII +#if !GNULIB_WCHAR_SINGLE +# ifdef C_CTYPE_ASCII /* Test width of ASCII characters. */ for (wc = 0x20; wc < 0x7F; wc++) ASSERT (wcwidth (wc) == 1); +# endif #endif /* Switch to an UTF-8 locale. */ -- 2.39.5