From d2e0c00b8c88ccc32d121839b18963a3657512aa Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 9 Mar 2015 12:47:51 +0000 Subject: [PATCH] re PR libstdc++/64467 (28_regex/traits/char/isctype.cc and wchar_t/isctype.cc) PR libstdc++/64467 * testsuite/28_regex/traits/char/isctype.cc: Don't test newline for newlib targets. Really fix mixed line-endings this time. From-SVN: r221279 --- libstdc++-v3/ChangeLog | 8 +++++++- .../testsuite/28_regex/traits/char/isctype.cc | 18 +++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4880391798f..23ee40886d6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-03-09 Jonathan Wakely + + PR libstdc++/64467 + * testsuite/28_regex/traits/char/isctype.cc: Don't test newline + for newlib targets. Really fix mixed line-endings this time. + 2015-03-06 Jonathan Wakely * include/std/future (future_error(error_code)): Construct base @@ -136,7 +142,7 @@ 2015-02-04 Matthew Wahab - PR libstdc++/64467 + 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. diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc index 8f71910aef1..62d37405d37 100644 --- a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc +++ b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc @@ -1,9 +1,9 @@ -// { dg-do run } -// { dg-options "-std=gnu++11" } -// { dg-additional-options "-DNEWLINE_IN_CLASS_BLANK" { target newlib } } - -// -// 2010-06-23 Stephen M. Webb +// { dg-do run } +// { dg-options "-std=gnu++11" } +// { dg-additional-options "-DNEWLINE_IN_CLASS_BLANK" { target newlib } } + +// +// 2010-06-23 Stephen M. Webb // // Copyright (C) 2010-2015 Free Software Foundation, Inc. // @@ -54,11 +54,7 @@ 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 (NEWLINE_IN_CLASS_BLANK) - /* On some targets, '\n' is 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 +#if !defined (NEWLINE_IN_CLASS_BLANK) VERIFY(!t.isctype('\n', t.lookup_classname(range(blank)))); #endif VERIFY( t.isctype('t', t.lookup_classname(range(upper), true))); -- 2.30.2