diff mbox

[libstdc++,Testsuite] isctype test fails for newlib.

Message ID 54DE00B5.6010003@arm.com
State New
Headers show

Commit Message

Matthew Wahab Feb. 13, 2015, 1:48 p.m. UTC 
On 11/02/15 15:43, Jonathan Wakely wrote:
> On 11/02/15 11:14 +0000, Matthew Wahab wrote:
>> Attached the fixed patch.
>> Tested by running check-target-libstdc++-v3, with the modified tests,
>> for arm-none-eabi and aarch64-none-linux-gnu.
>>
>> Ok to commit?
>
> OK, thanks.

Some DOS line endings were introduced into the char/isctype.cc file when 
I committed this change These aren't visible in a terminal or with svn 
diff but do show up in emacs. This is causing the test to fail in local 
runs. The wchar_t/isctype.cc file isn't affected.

I've committed the attached patch as obvious, it just removes the DOS 
line endings from the file.

Tested with check-target-libstdc++-v3/conformance.exp for arm-none-eabi 
and aarch64-none-linux-gnu; checked the patched file in emacs.

Matthew

2015-02-13  Matthew Wahab  <matthew.wahab@arm.com>

	* testsuite/28_regex/traits/char/isctype.cc (test01): Fix
	mixed line-endings introduced in last change.
diff mbox

Patch

diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
index 0a1071c..8f71910 100644
--- a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
+++ b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc
@@ -51,14 +51,14 @@  test01()
   VERIFY(!t.isctype('e', t.lookup_classname(range(upper))));
   VERIFY( t.isctype('e', t.lookup_classname(range(lower))));
   VERIFY(!t.isctype('e', t.lookup_classname(range(nothing))));
-  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
+  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
   VERIFY(!t.isctype('\n', t.lookup_classname(range(blank))));
 #endif
   VERIFY( t.isctype('t', t.lookup_classname(range(upper), true)));