From ff9eac296535655185dfe0de26d14376cd258dfe Mon Sep 17 00:00:00 2001 From: Matthew Wahab Date: Wed, 4 Feb 2015 09:24:56 +0000 Subject: [PATCH] [PATCH][libstdc++][Testsuite] isctype test fails for newlib. libstdc++-v3/ 2015-02-02 Matthew Wahab PR libstdc++/64467 * testsuite/28_regex/testsuiteraits/char/isctype.cc (test01): Add newlib special case for '\n'. * test01estsuite/28_regex/traits/wchar_t/isctype.cc (test01): Likewise. From-SVN: r220392 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc | 6 ++++++ libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index dbcf81dc554..1661caf572a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2015-02-04 Matthew Wahab + + PR libstdc++/64467 + * testsuite/28_regex/traits/char/isctype.cc (test01): Add newlib + special case for '\n'. + * testsuite/28_regex/traits/wchar_t/isctype.cc (test01): Likewise. + 2015-02-01 Jonathan Wakely * src/c++11/futex.cc: Do not define for gthr-single.h targets. diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc index a7b1396da0c..7c470450550 100644 --- a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc +++ b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc @@ -53,7 +53,13 @@ test01() VERIFY(!t.isctype('_', t.lookup_classname(range(digit)))); VERIFY( t.isctype(' ', t.lookup_classname(range(blank)))); VERIFY( t.isctype('\t', t.lookup_classname(range(blank)))); +#if defined (__NEWLIB__) + /* newlib includes '\n' in class 'blank'. + See https://gcc.gnu.org/ml/gcc-patches/2015-02/msg00059.html. */ + VERIFY( t.isctype('\n', t.lookup_classname(range(blank)))); +#else VERIFY(!t.isctype('\n', t.lookup_classname(range(blank)))); +#endif VERIFY( t.isctype('t', t.lookup_classname(range(upper), true))); VERIFY( t.isctype('T', t.lookup_classname(range(lower), true))); #undef range diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc index e450f6d78d1..1b3d69a758c 100644 --- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc +++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc @@ -50,7 +50,13 @@ test01() VERIFY(!t.isctype(L'_', t.lookup_classname(range(digit)))); VERIFY( t.isctype(L' ', t.lookup_classname(range(blank)))); VERIFY( t.isctype(L'\t', t.lookup_classname(range(blank)))); +#if defined (__NEWLIB__) + /* newlib includes '\n' in class 'blank'. + See https://gcc.gnu.org/ml/gcc-patches/2015-02/msg00059.html. */ + VERIFY( t.isctype(L'\n', t.lookup_classname(range(blank)))); +#else VERIFY(!t.isctype(L'\n', t.lookup_classname(range(blank)))); +#endif VERIFY( t.isctype(L't', t.lookup_classname(range(upper), true))); VERIFY( t.isctype(L'T', t.lookup_classname(range(lower), true))); #undef range -- 2.30.2