From patchwork Mon Mar 26 17:33:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Novillo X-Patchwork-Id: 148785 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 42FA1B6EE8 for ; Tue, 27 Mar 2012 04:34:05 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1333388046; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Received:Received:To:Subject:Message-Id:Date: From:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=GJx602T 7fm6f1X2Vj/oABKez5+4=; b=AAevQDZM1+PLY/GVNr5tMqxDn/78YQyukaa4F6i ZXwJ4bghleVvqjrXn07miLH2c2fd89BS4dFvuQH4rmxLiiQf6A4KoNvtnOJt7CLP NuHKcsTg25t0poaAVQVZeKUft5CDIpUbSFmHqBjNb7sUIX4BIzoO6y7sqGHsb7xz 7zvU= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:Received:Received:Received:Received:To:Subject:Message-Id:Date:From:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=pEOG9b/+CAEytXYL6wLj37jxbDYdXTmwSIWuY3pfFvBy4ZPmcYy8CKDg990her 1EafHHrryDKmpNAsSgo58mI78dcmKuiTd5fd6MRlzcBS2EP6WbVYnjBONHfv4GLo yTAejuHfE5YtzmUL5Tky05hXgDRhIul7hR6pGVusSU/pw=; Received: (qmail 26869 invoked by alias); 26 Mar 2012 17:33:56 -0000 Received: (qmail 26858 invoked by uid 22791); 26 Mar 2012 17:33:54 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, TW_SV, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail-bk0-f73.google.com (HELO mail-bk0-f73.google.com) (209.85.214.73) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 26 Mar 2012 17:33:39 +0000 Received: by bkcjg15 with SMTP id jg15so294746bkc.2 for ; Mon, 26 Mar 2012 10:33:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=to:subject:message-id:date:from:x-gm-message-state; bh=FVReSvTE9BKFPCfWfanbT+9YeeQJtfVFCjznoQlyAsM=; b=ms1FAKVS1vaGAM90yY+zld4XUiAHfr7FST5DkYP9Qo4mohrJ7SDe56b4EyWN/IDiUI q9x/aZG23ILGtCzSVO9aj9ij75UCPBUOXDIrRJrL82hyuyE1buGJ+VvVW9BGjzGrZuAd vUds+EwyBmtP/8yeWhgHvK8zR5B1D8qUlkQFFRMvvq3Tn6rMEbx97dgvv2nPz8Fg5ThU jmyx1d2aeEn2VxxJC3U2sQB2HFsBeSQepDJJgyo5PmDpYNFErbZ767AG+Zncy6nTyd2m zf8Jch7VtraRv7FD1vjf9nKA/NB8KAm4O7V2BZpcLUhXwuToI3z7+nEclMuyum/wKj8Z 90PQ== Received: by 10.213.14.146 with SMTP id g18mr1800135eba.0.1332783218214; Mon, 26 Mar 2012 10:33:38 -0700 (PDT) Received: by 10.213.14.146 with SMTP id g18mr1800127eba.0.1332783218083; Mon, 26 Mar 2012 10:33:38 -0700 (PDT) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id a14si12668321een.0.2012.03.26.10.33.38 (version=TLSv1/SSLv3 cipher=AES128-SHA); Mon, 26 Mar 2012 10:33:38 -0700 (PDT) Received: from torture.tor.corp.google.com (torture.tor.corp.google.com [172.29.41.4]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id BD1A5200057; Mon, 26 Mar 2012 10:33:37 -0700 (PDT) Received: by torture.tor.corp.google.com (Postfix, from userid 54752) id BB44E10307C; Mon, 26 Mar 2012 13:33:36 -0400 (EDT) To: reply@codereview.appspotmail.com, crowl@google.com, gcc-patches@gcc.gnu.org Subject: [pph] Adjust expected patterns in some tests (issue5905068) Message-Id: <20120326173336.BB44E10307C@torture.tor.corp.google.com> Date: Mon, 26 Mar 2012 13:33:36 -0400 (EDT) From: dnovillo@google.com (Diego Novillo) X-Gm-Message-State: ALoCoQmQyEZ+hSY9Ni3I94DVVhtgHpmcZHwHhIJmSc0EPPxUJiXZwMeEhdq7WgOXnNSx6dY/60vcwDQTpzNGXh9IOwUUX+9j6Ihc1kkz7ZTF2S0PUdtVGh9E/cGdTduzxWj1vvaancVFeL9Tu/bF2tSfHNMoayvIqKqNthpHRFVOLzQlYOAMffs= 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 Adjust expected patterns in some tests. After the mangling adjustments I made earlier, these tests are now passing and or failing in a different way. Adjusted. 2012-03-26 Diego Novillo * g++.dg/pph/x6dynarray4.cc: Adjust expected patterns. * g++.dg/pph/x6dynarray5.h: Likewise. * g++.dg/pph/x7dynarray5.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/pph@185814 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog.pph | 6 ++++++ gcc/testsuite/g++.dg/pph/x6dynarray4.cc | 10 ++++++++-- gcc/testsuite/g++.dg/pph/x6dynarray5.h | 9 --------- gcc/testsuite/g++.dg/pph/x7dynarray5.cc | 19 +++++++++++++++++-- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/gcc/testsuite/ChangeLog.pph b/gcc/testsuite/ChangeLog.pph index b510b55..ded2ef9 100644 --- a/gcc/testsuite/ChangeLog.pph +++ b/gcc/testsuite/ChangeLog.pph @@ -1,3 +1,9 @@ +2012-03-26 Diego Novillo + + * g++.dg/pph/x6dynarray4.cc: Adjust expected patterns. + * g++.dg/pph/x6dynarray5.h: Likewise. + * g++.dg/pph/x7dynarray5.cc: Likewise. + 2012-03-23 Diego Novillo * g++.dg/pph/x1mbstate_t.h: Mark fixed. diff --git a/gcc/testsuite/g++.dg/pph/x6dynarray4.cc b/gcc/testsuite/g++.dg/pph/x6dynarray4.cc index 74fb0d9..6e43954 100644 --- a/gcc/testsuite/g++.dg/pph/x6dynarray4.cc +++ b/gcc/testsuite/g++.dg/pph/x6dynarray4.cc @@ -1,6 +1,12 @@ -// { xfail-if "DEPENDENT" { "*-*-*" } { "-fpph-map=pph.map" } } +// { xfail-if "DEPENDENT" { "*-*-*" } { "-fpph-map=pph.map" } } +// { dg-bogus "a0dynarray-dcl3.hi:11:60: error: call of overloaded .operator new ...sizetype.. is ambiguous" "" { xfail *-*-* } 0 } +// { dg-bogus "stl_algobase.h:625:18: error: .__value. is not a member of .std::__is_move_iterator" "" { xfail *-*-* } 0 } +// { dg-bogus "stl_algobase.h:276:12: error: .__value. is not a member of .std::__is_move_iterator" "" { xfail *-*-* } 0 } +// { dg-bogus "stl_algobase.h:625:18: error: no matching function for call to .__miter_base" "" { xfail *-*-* } 0 } +// { dg-bogus "stl_algobase.h:282:5: error: no type named .iterator_type. in .struct std::_Miter_base." "" { xfail *-*-* } 0 } +// { dg-bogus "stl_algobase.h:139:7: error: .__value. is not a member of .std::__are_same" "" { xfail *-*-* } 0 } -#include "x6dynarray5.h" // { dg-bogus "cannot open PPH file x6dynarray5.pph" "" { xfail *-*-* } } +#include "x6dynarray5.h" #include diff --git a/gcc/testsuite/g++.dg/pph/x6dynarray5.h b/gcc/testsuite/g++.dg/pph/x6dynarray5.h index 05634c1..69dbcb8 100644 --- a/gcc/testsuite/g++.dg/pph/x6dynarray5.h +++ b/gcc/testsuite/g++.dg/pph/x6dynarray5.h @@ -1,12 +1,3 @@ -// { dg-xfail-if "UNIMPL TRAIT MANGLING" { "*-*-*" } { "-fpph-map=pph.map" } } -// { dg-bogus "bits/stl_uninitialized.h:66:12: sorry, unimplemented: mangling trait_expr" "" { xfail *-*-* } 0 } -// { dg-bogus "bits/stl_uninitialized.h:124:12: sorry, unimplemented: mangling trait_expr" "" { xfail *-*-* } 0 } -// { dg-bogus "bits/stl_uninitialized.h:178:12: sorry, unimplemented: mangling trait_expr" "" { xfail *-*-* } 0 } -// { dg-bogus "bits/allocator.h:153:12: sorry, unimplemented: mangling trait_expr" "" { xfail *-*-* } 0 } -// { dg-bogus "bits/stl_construct.h:98:12: sorry, unimplemented: mangling trait_expr" "" { xfail *-*-* } 0 } -// { dg-bogus "bits/stl_tempbuf.h:183:12: sorry, unimplemented: mangling trait_expr" "" { xfail *-*-* } 0 } -// { dg-bogus "bits/cpp_type_traits.h:87:12: internal compiler error: tree check: expected integer_cst, have const_decl in tree_int_cst_sgn" "" { xfail *-*-* } 0 } - #ifndef X6DYNARRAY5_H #define X6DYNARRAY5_H diff --git a/gcc/testsuite/g++.dg/pph/x7dynarray5.cc b/gcc/testsuite/g++.dg/pph/x7dynarray5.cc index cd55eab..628ea7c 100644 --- a/gcc/testsuite/g++.dg/pph/x7dynarray5.cc +++ b/gcc/testsuite/g++.dg/pph/x7dynarray5.cc @@ -1,8 +1,23 @@ -// { xfail-if "DEPENDENT" { "*-*-*" } { "-fpph-map=pph.map" } } +// { dg-xfail-if "DEPENDENT" { "*-*-*" } { "-fpph-map=pph.map" } } +// { dg-bogus "streambuf_iterator.h:372:58: internal compiler error: canonical types differ for identical types.*" "" { xfail *-*-* } 0 } // { dg-bogus "ext/atomicity.h:48:61: error: void value not ignored as it ought to be" "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:111:63: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:111:63: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:124:68: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:124:68: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:126:61: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:126:61: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:127:53: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:127:53: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:128:52: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:128:52: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:155:56: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "basic_string.h:155:56: error: no class template named .rebind. in .class std::allocator." "" { xfail *-*-* } 0 } +// { dg-bogus "locale_classes.tcc:47:46: error: call of overloaded .operator new.sizetype.. is ambiguous" "" { xfail *-*-* } 0 } +// { dg-bogus "locale_classes.tcc:65:43: error: call of overloaded .operator new.sizetype.. is ambiguous" "" { xfail *-*-* } 0 } #include "x0dynarray4.h" -#include "x6dynarray5.h" // { dg-bogus "warning: cannot open PPH file x6dynarray5.pph" "" { xfail *-*-* } } +#include "x6dynarray5.h" #include #include