commit 923ba4238cc715051fa97441c0cca23245289f23 Author: Jonathan Wakely Date: Mon Mar 9 10:26:03 2015 +0000 PR libstdc++/64467 * testsuite/28_regex/traits/char/isctype.cc: Don't test newline for newlib targets. Really fix mixed line-endings this time. diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc index 8f71910..62d3740 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)));