diff options
| author | Jonathan Wakely <redi@gcc.gnu.org> | 2015-03-09 12:47:51 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-03-09 12:47:51 +0000 |
| commit | d2e0c00b8c88ccc32d121839b18963a3657512aa (patch) | |
| tree | 2ed25018137ac6a97f80611e46f26ecd7de475d8 | |
| parent | 802ac282f819054e10ac5dca06881b6dca909cdb (diff) | |
| download | gcc-d2e0c00b8c88ccc32d121839b18963a3657512aa.zip gcc-d2e0c00b8c88ccc32d121839b18963a3657512aa.tar.gz gcc-d2e0c00b8c88ccc32d121839b18963a3657512aa.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/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 4880391..23ee408 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-03-09 Jonathan Wakely <jwakely@redhat.com> + + 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 <jwakely@redhat.com> * include/std/future (future_error(error_code)): Construct base @@ -136,7 +142,7 @@ 2015-02-04 Matthew Wahab <matthew.wahab@arm.com> - 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 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 <stephen.webb@bregmasoft.ca>
+// { dg-do run } +// { dg-options "-std=gnu++11" } +// { dg-additional-options "-DNEWLINE_IN_CLASS_BLANK" { target newlib } } + +// +// 2010-06-23 Stephen M. Webb <stephen.webb@bregmasoft.ca> // // 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))); |