From 34b620bbddef3fbcdc1d5d9b441cd520c25e7987 Mon Sep 17 00:00:00 2001 From: mwahab Date: Thu, 12 Feb 2015 14:55:23 +0000 Subject: [PATCH] * testsuite/28_regex/traits/char/isctype.cc (test01): Replace test for __NEWLIB__ macro with a dejagnu set macro. * testsuite/28_regex/traits/wchar_t/isctype.cc (test01): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220648 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 6 +++++ .../testsuite/28_regex/traits/char/isctype.cc | 27 +++++++++++---------- .../testsuite/28_regex/traits/wchar_t/isctype.cc | 28 +++++++++++----------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1661caf572a..394017c84a1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-02-12 Matthew Wahab + + * testsuite/28_regex/traits/char/isctype.cc (test01): Replace test + for __NEWLIB__ macro with a dejagnu set macro. + * testsuite/28_regex/traits/wchar_t/isctype.cc (test01): Likewise. + 2015-02-04 Matthew Wahab PR libstdc++/64467 diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc index 7c470450550..0a1071c1150 100644 --- a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc +++ b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc @@ -1,8 +1,9 @@ -// { dg-do run } -// { dg-options "-std=gnu++11" } - -// -// 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. // @@ -50,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 (__NEWLIB__) - /* newlib includes '\n' 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))); diff --git a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc index 1b3d69a758c..6ca5550b8f3 100644 --- a/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc +++ b/libstdc++-v3/testsuite/28_regex/traits/wchar_t/isctype.cc @@ -1,8 +1,9 @@ -// { dg-do run } -// { dg-options "-std=gnu++11" } - -// Copyright (C) 2010-2015 Free Software Foundation, Inc. -// +// { dg-do run } +// { dg-options "-std=gnu++11" } +// { dg-additional-options "-DNEWLINE_IN_CLASS_BLANK" { target newlib } } + +// Copyright (C) 2010-2015 Free Software Foundation, Inc. +// // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the @@ -47,15 +48,14 @@ test01() VERIFY(!t.isctype(L'e', t.lookup_classname(range(upper)))); VERIFY( t.isctype(L'e', t.lookup_classname(range(lower)))); VERIFY(!t.isctype(L'e', t.lookup_classname(range(nothing)))); - VERIFY(!t.isctype(L'_', t.lookup_classname(range(digit)))); - VERIFY( t.isctype(L' ', t.lookup_classname(range(blank)))); - VERIFY( t.isctype(L'\t', t.lookup_classname(range(blank)))); -#if defined (__NEWLIB__) - /* newlib includes '\n' in class 'blank'. - See https://gcc.gnu.org/ml/gcc-patches/2015-02/msg00059.html. */ - VERIFY( t.isctype(L'\n', t.lookup_classname(range(blank)))); -#else - VERIFY(!t.isctype(L'\n', t.lookup_classname(range(blank)))); + VERIFY(!t.isctype(L'_', t.lookup_classname(range(digit)))); + VERIFY( t.isctype(L' ', t.lookup_classname(range(blank)))); + VERIFY( t.isctype(L'\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(L'\n', t.lookup_classname(range(blank)))); +#else VERIFY(!t.isctype(L'\n', t.lookup_classname(range(blank)))); #endif VERIFY( t.isctype(L't', t.lookup_classname(range(upper), true))); VERIFY( t.isctype(L'T', t.lookup_classname(range(lower), true))); -- 2.11.4.GIT