From patchwork Fri Jun 29 00:57:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 167972 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 1A0E1B700C for ; Fri, 29 Jun 2012 10:56:48 +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=1341536209; 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=DUov4N0jv24RwAxvv0gVNVU4Rz4=; b=fyXvo4V0atbf2KF ZhtZuLKWc1aW7PIPxYvu+sOgjQ46Wzhaf0WGZD7b4HugqcW2aOV1vBSLYqNunoDv Ej+lPsPM921gEiq8Xu2D8KLKYuxCJ7qT4Q3ojChQpl3jVZxz5X5QyWDmi3SD3ziq vogYx9073ZZzXQr4qZahjDkKROTE= 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=xMcN9Uo1LaMSdYz3bAzt6gRtTMw4BI6WECWvC4gYnXAM5nzYnR/aHsllmjk9bE TM1ziNC0sOAtH57LzVZtdfCYeY2bfDwbSd+FBfif4G7jpU9Wp5GstqJIupWEaBQZ LnXaFddTNx9iJM1fa0lP8NEmuTgryPo5msWv6CXEKdhNg=; Received: (qmail 19746 invoked by alias); 29 Jun 2012 00:56:43 -0000 Received: (qmail 19736 invoked by uid 22791); 29 Jun 2012 00:56:42 -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:56:29 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1SkPVd-0003Rs-BC from Janis_Johnson@mentor.com for gcc-patches@gcc.gnu.org; Thu, 28 Jun 2012 17:56:29 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com 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:56:28 -0700 Message-ID: <4FECFD7C.2000202@mentor.com> Date: Thu, 28 Jun 2012 17:57:32 -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] g++.dg/cpp0x/nullptr19.c: remove duplicate dg-message 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 Test g++.dg/cpp0x/nullptr19.c contains the following: char* k( char* ); /* { dg-message "note" } { dg-message "note" } */ nullptr_t k( nullptr_t ); /* { dg-message "note" } { dg-message "note" } */ Having two test directives on a line should have resulted in an ERROR but the local replacement of dg-warning silently ignores errors (something I plan to fix). There are two notes for each of these lines, identical but after different candidate lists. Since they are identical DejaGnu removes both of them after one has been processed, and there is apparently no way to check for both of them. At least with this patch we'll correctly check for one for each line. Tested on i686-pc-linux-gnu; OK for trunk? Janis 2012-06-28 Janis Johnson * g++.dg/cpp0x/nullptr19.c: Remove exta directives on same line. Index: g++.dg/cpp0x/nullptr19.C =================================================================== --- g++.dg/cpp0x/nullptr19.C (revision 189025) +++ g++.dg/cpp0x/nullptr19.C (working copy) @@ -5,8 +5,8 @@ typedef decltype(nullptr) nullptr_t; -char* k( char* ); /* { dg-message "note" } { dg-message "note" } */ -nullptr_t k( nullptr_t ); /* { dg-message "note" } { dg-message "note" } */ +char* k( char* ); /* { dg-message "note" } */ +nullptr_t k( nullptr_t ); /* { dg-message "note" } */ void test_k() {