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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4880391798f260163a57f2eeec1e6c966417cc5b..23ee40886d6cd0dd09715276979c8156de0ea142 100644 (file)
--- 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 8f71910aef162b8a11374f049006b19f8ea30ca7..62d37405d374f2f8c3f4d9d5ad31725ed32a1e2a 100644 (file)
--- 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 }\r
-// { dg-options "-std=gnu++11" }\r
-// { dg-additional-options "-DNEWLINE_IN_CLASS_BLANK" { target newlib } }\r
-\r
-//\r
-// 2010-06-23  Stephen M. Webb <stephen.webb@bregmasoft.ca>\r
+// { 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)));