From patchwork Wed Aug 10 17:17:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gab Charette X-Patchwork-Id: 109413 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 53988B7210 for ; Thu, 11 Aug 2011 03:18:16 +1000 (EST) Received: (qmail 28648 invoked by alias); 10 Aug 2011 17:18:13 -0000 Received: (qmail 28640 invoked by uid 22791); 10 Aug 2011 17:18:12 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (74.125.121.67) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 10 Aug 2011 17:17:56 +0000 Received: from wpaz21.hot.corp.google.com (wpaz21.hot.corp.google.com [172.24.198.85]) by smtp-out.google.com with ESMTP id p7AHHsQb000394; Wed, 10 Aug 2011 10:17:54 -0700 Received: from gchare.mtv.corp.google.com (gchare.mtv.corp.google.com [172.18.111.122]) by wpaz21.hot.corp.google.com with ESMTP id p7AHHqYF002705; Wed, 10 Aug 2011 10:17:53 -0700 Received: by gchare.mtv.corp.google.com (Postfix, from userid 138564) id 81F6A1C0F8B; Wed, 10 Aug 2011 10:17:52 -0700 (PDT) To: reply@codereview.appspotmail.com, crowl@google.com, dnovillo@google.com, gcc-patches@gcc.gnu.org Subject: [pph] Version 2: Clear test commit conflicts (issue4844060) Message-Id: <20110810171752.81F6A1C0F8B@gchare.mtv.corp.google.com> Date: Wed, 10 Aug 2011 10:17:52 -0700 (PDT) From: gchare@google.com (Gabriel Charette) X-System-Of-Record: true 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 Here is what it takes, on top of Lawrence's first patch, to clear new test errors on my end. Not sure what fixed the common removal of // { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } // { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } maybe the trunk merge?? Seems like x6dynarray6 now has the same errors x6dynarray5 already had, don't know why this only shows up now...? Also, since the trunk merge, `make check-c++ RUNTESTFLAGS=pph.exp` ran from bld/ now also runs c++0x tests it seems. Diego said we don't care about those yet, so I changed my test run to be `make check-g++ RUNTESTFLAGS=pph.exp` ran from bld/gcc/ Gab 2011-08-10 Gabriel Charette * g++.dg/pph/x5dynarray7.h: Remove 2 bogus errors. * g++.dg/pph/x6dynarray6.h: Remove 2 bogus errors. Add 2 bogus errors. * g++.dg/pph/x7dynarray5.cc: Remove 2 bogus errors. * g++.dg/pph/x7dynarray6.cc: Remove 2 bogus errors. * g++.dg/pph/x7dynarray7.cc: Remove 2 bogus errors. --- This patch is available for review at http://codereview.appspot.com/4844060 diff --git a/gcc/testsuite/g++.dg/pph/x5dynarray7.h b/gcc/testsuite/g++.dg/pph/x5dynarray7.h index 7aae396..5ee5d8c 100644 --- a/gcc/testsuite/g++.dg/pph/x5dynarray7.h +++ b/gcc/testsuite/g++.dg/pph/x5dynarray7.h @@ -1,7 +1,5 @@ // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } #ifndef X5DYNARRAY7_H #define X5DYNARRAY7_H diff --git a/gcc/testsuite/g++.dg/pph/x6dynarray6.h b/gcc/testsuite/g++.dg/pph/x6dynarray6.h index a8e48c1..497eb46 100644 --- a/gcc/testsuite/g++.dg/pph/x6dynarray6.h +++ b/gcc/testsuite/g++.dg/pph/x6dynarray6.h @@ -1,7 +1,7 @@ // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } +// { dg-bogus "a0dynarray-dfn1b.hi:3:19: error: there are no arguments to .alloc. that depend on a template parameter, so a declaration of .alloc. must be available" "" { xfail *-*-* } 0 } +// { dg-bogus "a0dynarray-dfn3c.hi:2:36: error: no .void tst::dynarray::check.tst::dynarray::size_type.. member function declared in class .tst::dynarray." "" { xfail *-*-* } 0 } #ifndef X6DYNARRAY6_H #define X6DYNARRAY6_H diff --git a/gcc/testsuite/g++.dg/pph/x7dynarray5.cc b/gcc/testsuite/g++.dg/pph/x7dynarray5.cc index f512bad..d7b17a3 100644 --- a/gcc/testsuite/g++.dg/pph/x7dynarray5.cc +++ b/gcc/testsuite/g++.dg/pph/x7dynarray5.cc @@ -1,7 +1,5 @@ // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } #include "x0dynarray4.h" #include "x6dynarray5.h" diff --git a/gcc/testsuite/g++.dg/pph/x7dynarray6.cc b/gcc/testsuite/g++.dg/pph/x7dynarray6.cc index 1585be0..0292890 100644 --- a/gcc/testsuite/g++.dg/pph/x7dynarray6.cc +++ b/gcc/testsuite/g++.dg/pph/x7dynarray6.cc @@ -1,7 +1,5 @@ // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } #include #include diff --git a/gcc/testsuite/g++.dg/pph/x7dynarray7.cc b/gcc/testsuite/g++.dg/pph/x7dynarray7.cc index bf0a047..08398be 100644 --- a/gcc/testsuite/g++.dg/pph/x7dynarray7.cc +++ b/gcc/testsuite/g++.dg/pph/x7dynarray7.cc @@ -1,7 +1,5 @@ // { dg-xfail-if "BOGUS" { "*-*-*" } { "-fpph-map=pph.map" } } // { dg-bogus "wchar.h:1:0: error: PPH file stdio.pph fails macro validation, _WCHAR_H" "" { xfail *-*-* } 0 } -// { dg-bogus "unistd.h:1144:34: error: declaration of .* ctermid.* has a different exception specifier" "" { xfail *-*-* } 0 } -// { dg-bogus "stdio.h:858:14: error: from previous declaration .* ctermid.*" "" { xfail *-*-* } 0 } #include #include