From patchwork Fri Jun 29 00:56:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 167971 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 50028B7006 for ; Fri, 29 Jun 2012 10:56:02 +1000 (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=1341536162; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version: To:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=u6Iq3hb9WEt00kx5c8f7HsJBldE=; b=AuEikDdQZ0ci7x2 0mf0YMFjuJKXS+UehjKhKJjbSNpGH4WExtF+NSqYYcqRFDoYi0UcGy4k4YjjYLc8 CJZQd5AO4vfZXTaNujtmSsAOfhr38hHwxS3oo2wl4v05YA7pIVTZTcs4B9Fi4zr0 VdJTWlqKMDmNggruY9dNMHR0xOGY= 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:Received:Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=wvWX4NPyU17F9c6WFMvIsPsyjAxjmWblmNg438o6gm1n3aeGOZu+0OcWGukWEm 7Wg5sd4SJ/MX33Xpm7f2ai6AiwXGTw3a//VAAiD2r8PqhMY3LNS1ttSFvCKyPJa+ NBZAPNw3CzBA0a6AiWe+MHD63+Ki+0YYYixagS05F5lyA=; Received: (qmail 19004 invoked by alias); 29 Jun 2012 00:55:57 -0000 Received: (qmail 18993 invoked by uid 22791); 29 Jun 2012 00:55:56 -0000 X-SWARE-Spam-Status: No, hits=-3.7 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 29 Jun 2012 00:55:44 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1SkPUt-0003Oy-HL from Janis_Johnson@mentor.com for gcc-patches@gcc.gnu.org; Thu, 28 Jun 2012 17:55:43 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 28 Jun 2012 17:55:43 -0700 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.1.289.1; Thu, 28 Jun 2012 17:55:42 -0700 Message-ID: <4FECFD4E.3040304@mentor.com> Date: Thu, 28 Jun 2012 17:56:46 -0700 From: Janis Johnson Reply-To: User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [testsuite] add required comments to dg-message directives in g++.dg 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 Several tests in g++.dg use dg-message with a target list and line number but without the comment field, which is required when those additional arguments are used. The local replacement of dg-message silently ignores errors (something I plan to fix), so the checks have been ignored. Unprocessed notes (as opposed to errors and warning) in compiler output are intentionally ignored, so this wasn't noticed before.. This patch adds the required comments, and the tests now pass on i686-pc-linux-gnu. OK for trunk? Janis 2012-06-28 Janis Johnson * g++.dg/template/error46.C: Add missing comment to dg-message. * g++.dg/template/crash107.C: Likewise. * g++.dg/template/error47.C: Likewise. * g++.dg/template/crash108.C: Likewise. * g++.dg/overload/operator5.C: Likewise. Index: g++.dg/template/error46.C =================================================================== --- g++.dg/template/error46.C (revision 189025) +++ g++.dg/template/error46.C (working copy) @@ -8,4 +8,4 @@ { foo(A<0>(), A<1>()); // { dg-error "no matching" } } -// { dg-message "candidate|parameter 'N' ('0' and '1')" { target *-*-* } 9 } +// { dg-message "candidate|parameter 'N' ('0' and '1')" "" { target *-*-* } 9 } Index: g++.dg/template/crash107.C =================================================================== --- g++.dg/template/crash107.C (revision 189025) +++ g++.dg/template/crash107.C (working copy) @@ -14,7 +14,7 @@ } }; Vec v(3,4,12); // { dg-error "no matching" } -// { dg-message "note" { target *-*-* } 16 } +// { dg-message "note" "note" { target *-*-* } 16 } Vec V(12,4,3); // { dg-error "no matching" } -// { dg-message "note" { target *-*-* } 18 } +// { dg-message "note" "note" { target *-*-* } 18 } Vec c = v^V; // { dg-message "required" } Index: g++.dg/template/error47.C =================================================================== --- g++.dg/template/error47.C (revision 189025) +++ g++.dg/template/error47.C (working copy) @@ -6,4 +6,4 @@ { foo(0, p); // { dg-error "no matching" } } -// { dg-message "candidate|parameter 'T' ('int' and 'void*')" { target *-*-* } 7 } +// { dg-message "candidate|parameter 'T' ('int' and 'void*')" "" { target *-*-* } 7 } Index: g++.dg/template/crash108.C =================================================================== --- g++.dg/template/crash108.C (revision 189025) +++ g++.dg/template/crash108.C (working copy) @@ -2,4 +2,4 @@ template struct A {A(int b=k(0));}; // { dg-error "arguments" } void f(int k){A a;} // // { dg-error "parameter|declared" } -// { dg-message "note" { target *-*-* } 3 } +// { dg-message "note" "note" { target *-*-* } 3 } Index: g++.dg/overload/operator5.C =================================================================== --- g++.dg/overload/operator5.C (revision 189025) +++ g++.dg/overload/operator5.C (working copy) @@ -13,4 +13,4 @@ const String& b, bool ignoreCase) { return ignoreCase ? equalIgnoringCase(a, b) : (a == b); } // { dg-error "ambiguous" } -// { dg-message "note" { target *-*-* } 15 } +// { dg-message "note" "note" { target *-*-* } 15 }