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  <jani...@codesourcery.com>

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

Reply via email to