Patchwork [testsuite] g++.dg/cpp0x/nullptr19.c: remove duplicate dg-message

login
register
mail settings
Submitter Janis Johnson
Date June 29, 2012, 12:57 a.m.
Message ID <4FECFD7C.2000202@mentor.com>
Download mbox | patch
Permalink /patch/167972/
State New
Headers show

Comments

Janis Johnson - June 29, 2012, 12:57 a.m.
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  <janisjo@codesourcery.com>

	* g++.dg/cpp0x/nullptr19.c: Remove exta directives on same line.
Mike Stump - June 29, 2012, 2:49 a.m.
On Jun 28, 2012, at 5:57 PM, Janis Johnson wrote:
> Test g++.dg/cpp0x/nullptr19.c contains the following:

> OK for trunk?

Ok.

Patch

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()
 {