This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Re: [PATCH][libstdc++][Testsuite] isctype test fails for newlib.
- From: Matthew Wahab <matthew dot wahab at arm dot com>
- To: "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>
- Cc: libstdc++ <libstdc++ at gcc dot gnu dot org>, Jonathan Wakely <jwakely dot gcc at gmail dot com>, Hans-Peter Nilsson <hp at bitrange dot com>
- Date: Fri, 13 Feb 2015 13:48:37 +0000
- Subject: Re: [PATCH][libstdc++][Testsuite] isctype test fails for newlib.
- Authentication-results: sourceware.org; auth=none
- References: <54D0A034 dot 1040306 at arm dot com> <54D0A291 dot 4010702 at oracle dot com> <54D0A5B1 dot 2000806 at arm dot com> <CAH6eHdT2O7rqKPG+auYPPeRmEZsorteub3vgazHpnti3DVdapQ at mail dot gmail dot com> <54D8992B dot 6060707 at arm dot com> <alpine dot BSF dot 2 dot 02 dot 1502090812040 dot 67721 at arjuna dot pair dot com> <54D8F2F6 dot 7030406 at arm dot com> <alpine dot BSF dot 2 dot 02 dot 1502091814490 dot 19399 at arjuna dot pair dot com> <54D9C694 dot 7050102 at arm dot com> <54DB3993 dot 7020000 at arm dot com> <20150211154356 dot GT3360 at redhat dot com>
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 --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)));