From 1e0c223f94b886b4d4e54582a1fb4ea9b5feb722 Mon Sep 17 00:00:00 2001 From: Matthew Wahab Date: Fri, 13 Feb 2015 13:42:06 +0000 Subject: [PATCH] isctype.cc (test01): Fix mixed line-endings introduced in last change. * testsuite/28_regex/traits/char/isctype.cc (test01): Fix mixed line-endings introduced in last change. From-SVN: r220682 --- libstdc++-v3/ChangeLog | 5 +++++ .../testsuite/28_regex/traits/char/isctype.cc | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 394017c84a1..63bcfae6192 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2015-02-13 Matthew Wahab + + * testsuite/28_regex/traits/char/isctype.cc (test01): Fix + mixed line-endings introduced in last change. + 2015-02-12 Matthew Wahab * testsuite/28_regex/traits/char/isctype.cc (test01): Replace test diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc index 0a1071c1150..8f71910aef1 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))); -- 2.30.2