From patchwork Thu Oct 6 14:43:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 118105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 43568B6F89 for ; Fri, 7 Oct 2011 01:45:44 +1100 (EST) Received: (qmail 9915 invoked by alias); 6 Oct 2011 14:45:40 -0000 Received: (qmail 9689 invoked by uid 22791); 6 Oct 2011 14:45:35 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 06 Oct 2011 14:45:20 +0000 Received: from rtcsinet22.oracle.com (rtcsinet22.oracle.com [66.248.204.30]) by rcsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id p96EjGHp026552 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 6 Oct 2011 14:45:18 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by rtcsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id p96EjFJa010248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 6 Oct 2011 14:45:16 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id p96EjArY030272; Thu, 6 Oct 2011 09:45:10 -0500 Received: from [192.168.1.4] (/79.53.235.1) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 06 Oct 2011 07:45:09 -0700 Message-ID: <4E8DBE98.1060703@oracle.com> Date: Thu, 06 Oct 2011 16:43:36 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110922 Thunderbird/7.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Avoid spurious fails when running the testsuite with -std=gnu++0x X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi, tested x86_64-linux, committed. Paolo. //////////////// 2011-10-06 Paolo Carlini * testsuite/27_io/ios_base/cons/assign_neg.cc: Tidy dg- directives, for C++0x testing too. * testsuite/27_io/ios_base/cons/copy_neg.cc: Likewise. * testsuite/ext/pb_ds/example/hash_resize_neg.cc: Likewise. * testsuite/24_iterators/istreambuf_iterator/requirements/ base_classes.cc: Adjust for C++0x testing. * testsuite/ext/codecvt/char-1.cc: Avoid warnings in C++0x mode. * testsuite/ext/codecvt/char-2.cc: Likewise. * testsuite/ext/codecvt/wchar_t.cc: Likewise. Index: testsuite/27_io/ios_base/cons/assign_neg.cc =================================================================== --- testsuite/27_io/ios_base/cons/assign_neg.cc (revision 179595) +++ testsuite/27_io/ios_base/cons/assign_neg.cc (working copy) @@ -18,21 +18,18 @@ // with this library; see the file COPYING3. If not see // . - #include // Library defect report //50. Copy constructor and assignment operator of ios_base -class test_base : public std::ios_base { }; +class test_base : public std::ios_base { }; // { dg-error "within this context|deleted" } void test01() { // assign test_base io1; test_base io2; - io1 = io2; + io1 = io2; // { dg-error "synthesized|deleted" } } -// { dg-error "synthesized" "" { target *-*-* } 33 } -// { dg-error "within this context" "" { target *-*-* } 26 } -// { dg-error "is private" "" { target *-*-* } 791 } -// { dg-error "operator=" "" { target *-*-* } 0 } + +// { dg-prune-output "include" } Index: testsuite/27_io/ios_base/cons/copy_neg.cc =================================================================== --- testsuite/27_io/ios_base/cons/copy_neg.cc (revision 179595) +++ testsuite/27_io/ios_base/cons/copy_neg.cc (working copy) @@ -18,21 +18,18 @@ // with this library; see the file COPYING3. If not see // . - #include // Library defect report //50. Copy constructor and assignment operator of ios_base -struct test_base : public std::ios_base +struct test_base : public std::ios_base // { dg-error "within this context|deleted" } { }; void test02() { // copy ctor test_base io1; - test_base io2 = io1; + test_base io2 = io1; // { dg-error "synthesized|deleted" } } -// { dg-error "within this context" "" { target *-*-* } 26 } -// { dg-error "synthesized" "" { target *-*-* } 33 } -// { dg-error "is private" "" { target *-*-* } 788 } -// { dg-error "copy constructor" "" { target *-*-* } 0 } + +// { dg-prune-output "include" } Index: testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc =================================================================== --- testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc (revision 179595) +++ testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc (working copy) @@ -1,7 +1,8 @@ // { dg-do compile } // 1999-06-28 bkoz -// Copyright (C) 1999, 2001, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 1999, 2001, 2003, 2009, 2010, 2011 +// 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 @@ -31,8 +32,15 @@ // Check for required base class. typedef istreambuf_iterator test_iterator; typedef char_traits::off_type off_type; - typedef iterator base_iterator; + typedef iterator +#else + char&> +#endif + base_iterator; + istringstream isstream("this tag"); test_iterator r_it(isstream); base_iterator* base __attribute__((unused)) = &r_it; Index: testsuite/ext/pb_ds/example/hash_resize_neg.cc =================================================================== --- testsuite/ext/pb_ds/example/hash_resize_neg.cc (revision 179595) +++ testsuite/ext/pb_ds/example/hash_resize_neg.cc (working copy) @@ -1,7 +1,8 @@ // { dg-do compile } // -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 +// 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 @@ -60,4 +61,4 @@ h.resize(20); // { dg-error "required from" } } -// { dg-error "invalid" "" { target *-*-* } 187 } +// { dg-prune-output "include" } Index: testsuite/ext/codecvt/char-1.cc =================================================================== --- testsuite/ext/codecvt/char-1.cc (revision 179595) +++ testsuite/ext/codecvt/char-1.cc (working copy) @@ -4,6 +4,7 @@ // 2000-08-22 Benjamin Kosnik // Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// 2010, 2011 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -69,10 +70,14 @@ char i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = { - 0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0 + char(0x00), char(0x62), char(0x00), char(0x6c), char(0x00), char(0x61), + char(0x00), char(0x63), char(0x00), char(0x6b), char(0x00), char(0x20), + char(0x00), char(0x70), char(0x00), char(0x65), char(0x00), char(0x61), + char(0x00), char(0x72), char(0x00), char(0x6c), char(0x00), char(0x20), + char(0x00), char(0x6a), char(0x00), char(0x61), char(0x00), char(0x73), + char(0x00), char(0x6d), char(0x00), char(0x69), char(0x00), char(0x6e), + char(0x00), char(0x65), char(0x00), char(0x20), char(0x00), char(0x74), + char(0x00), char(0x65), char(0x00), char(0x61), char(0x00), char(0xa0) }; const int_type* i_lit = reinterpret_cast(i_lit_base); Index: testsuite/ext/codecvt/char-2.cc =================================================================== --- testsuite/ext/codecvt/char-2.cc (revision 179595) +++ testsuite/ext/codecvt/char-2.cc (working copy) @@ -4,6 +4,7 @@ // 2000-08-22 Benjamin Kosnik // Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// 2010, 2011 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -69,10 +70,14 @@ char i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = { - 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, 0x00, - 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, 0x00, - 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, 0x00, - 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0, 0x00 + char(0x62), char(0x00), char(0x6c), char(0x00), char(0x61), char(0x00), + char(0x63), char(0x00), char(0x6b), char(0x00), char(0x20), char(0x00), + char(0x70), char(0x00), char(0x65), char(0x00), char(0x61), char(0x00), + char(0x72), char(0x00), char(0x6c), char(0x00), char(0x20), char(0x00), + char(0x6a), char(0x00), char(0x61), char(0x00), char(0x73), char(0x00), + char(0x6d), char(0x00), char(0x69), char(0x00), char(0x6e), char(0x00), + char(0x65), char(0x00), char(0x20), char(0x00), char(0x74), char(0x00), + char(0x65), char(0x00), char(0x61), char(0x00), char(0xa0), char(0x00) }; const int_type* i_lit = reinterpret_cast(i_lit_base); Index: testsuite/ext/codecvt/wchar_t.cc =================================================================== --- testsuite/ext/codecvt/wchar_t.cc (revision 179595) +++ testsuite/ext/codecvt/wchar_t.cc (working copy) @@ -3,7 +3,8 @@ // 2000-08-23 Benjamin Kosnik -// Copyright (C) 2000, 2001, 2002, 2003, 2007, 2009 Free Software Foundation +// Copyright (C) 2000, 2001, 2002, 2003, 2007, 2009, 2010, 2011 +// Free Software Foundation // // 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 @@ -43,23 +44,35 @@ int size = 23; char e_lit_base[96] __attribute__((aligned(__alignof__(ext_type)))) = { - 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x61, - 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x20, - 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x61, - 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x20, - 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x73, - 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x6e, - 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x74, - 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0xa0 + char(0x00), char(0x00), char(0x00), char(0x62), char(0x00), char(0x00), + char(0x00), char(0x6c), char(0x00), char(0x00), char(0x00), char(0x61), + char(0x00), char(0x00), char(0x00), char(0x63), char(0x00), char(0x00), + char(0x00), char(0x6b), char(0x00), char(0x00), char(0x00), char(0x20), + char(0x00), char(0x00), char(0x00), char(0x70), char(0x00), char(0x00), + char(0x00), char(0x65), char(0x00), char(0x00), char(0x00), char(0x61), + char(0x00), char(0x00), char(0x00), char(0x72), char(0x00), char(0x00), + char(0x00), char(0x6c), char(0x00), char(0x00), char(0x00), char(0x20), + char(0x00), char(0x00), char(0x00), char(0x6a), char(0x00), char(0x00), + char(0x00), char(0x61), char(0x00), char(0x00), char(0x00), char(0x73), + char(0x00), char(0x00), char(0x00), char(0x6d), char(0x00), char(0x00), + char(0x00), char(0x69), char(0x00), char(0x00), char(0x00), char(0x6e), + char(0x00), char(0x00), char(0x00), char(0x65), char(0x00), char(0x00), + char(0x00), char(0x20), char(0x00), char(0x00), char(0x00), char(0x74), + char(0x00), char(0x00), char(0x00), char(0x65), char(0x00), char(0x00), + char(0x00), char(0x61), char(0x00), char(0x00), char(0x00), char(0xa0) }; const ext_type* e_lit = reinterpret_cast(e_lit_base); char i_lit_base[48] __attribute__((aligned(__alignof__(int_type)))) = { - 0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, - 0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, - 0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, - 0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0 + char(0x00), char(0x62), char(0x00), char(0x6c), char(0x00), char(0x61), + char(0x00), char(0x63), char(0x00), char(0x6b), char(0x00), char(0x20), + char(0x00), char(0x70), char(0x00), char(0x65), char(0x00), char(0x61), + char(0x00), char(0x72), char(0x00), char(0x6c), char(0x00), char(0x20), + char(0x00), char(0x6a), char(0x00), char(0x61), char(0x00), char(0x73), + char(0x00), char(0x6d), char(0x00), char(0x69), char(0x00), char(0x6e), + char(0x00), char(0x65), char(0x00), char(0x20), char(0x00), char(0x74), + char(0x00), char(0x65), char(0x00), char(0x61), char(0x00), char(0xa0) }; const int_type* i_lit = reinterpret_cast(i_lit_base);