From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103388 invoked by alias); 9 Mar 2015 12:47:56 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 103361 invoked by uid 89); 9 Mar 2015 12:47:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 09 Mar 2015 12:47:54 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t29ClmOb013403 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 9 Mar 2015 08:47:48 -0400 Received: from localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t29Cllm3032262; Mon, 9 Mar 2015 08:47:47 -0400 Date: Mon, 09 Mar 2015 12:47:00 -0000 From: Jonathan Wakely To: Matthew Wahab Cc: "gcc-patches@gcc.gnu.org" , libstdc++ , Hans-Peter Nilsson Subject: Re: [PATCH][libstdc++][Testsuite] isctype test fails for newlib. Message-ID: <20150309124746.GD21227@redhat.com> References: <54D0A5B1.2000806@arm.com> <54D8992B.6060707@arm.com> <54D8F2F6.7030406@arm.com> <54D9C694.7050102@arm.com> <54DB3993.7020000@arm.com> <20150211154356.GT3360@redhat.com> <54DE00B5.6010003@arm.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="EeQfGwPcQSOJBaQU" Content-Disposition: inline In-Reply-To: <54DE00B5.6010003@arm.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-03/txt/msg00462.txt.bz2 --EeQfGwPcQSOJBaQU Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 1041 On 13/02/15 13:48 +0000, Matthew Wahab wrote: >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. That patch still left DOS line-endings in the file. The test also now fails for newlib targets not using --enable-clocale=newlib so I'm just going to disable the check for '\n' entirely, since it doesn't have consistent behaviour on newlib. Tested x86_64-linux, committed to trunk. Hopefully we can finally close this one for good! --EeQfGwPcQSOJBaQU Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 1662 commit 923ba4238cc715051fa97441c0cca23245289f23 Author: Jonathan Wakely Date: Mon Mar 9 10:26:03 2015 +0000 PR libstdc++/64467 * testsuite/28_regex/traits/char/isctype.cc: Don't test newline for newlib targets. Really fix mixed line-endings this time. diff --git a/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc b/libstdc++-v3/testsuite/28_regex/traits/char/isctype.cc index 8f71910..62d3740 100644 --- 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 } -// { dg-options "-std=gnu++11" } -// { dg-additional-options "-DNEWLINE_IN_CLASS_BLANK" { target newlib } } - -// -// 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. // @@ -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))); --EeQfGwPcQSOJBaQU--