include2a.c: Add comments to checks for multiple messages reported for one line of...

	* gcc.dg/cpp/include2a.c: Add comments to checks for multiple
	messages reported for one line of source code.
	* gcc.dg/cpp/pr30786.c: Likewise.
	* gcc.dg/cpp/pr28709.c: Likewise.
	* gcc.dg/cpp/missing-header-MD.c: Likewise.
	* gcc.dg/cpp/macspace2.c: Likewise.
	* gcc.dg/cpp/missing-header-1.c: Likewise.
	* gcc.dg/cpp/missing-header-MMD.c: Likewise.
	* gcc.dg/cpp/missing-sysheader-MD.c: Likewise.
	* gcc.dg/cpp/missing-sysheader-MMD.c: Likewise.

From-SVN: r188476

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 908e25b07fc5510741d9bb6621b6ce8850efba6e..8d54fabe4755f31b4a9f2b0c7654cb5ebdf21e98 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,17 @@
-2012-06-07  Jason Merrill  <jason@redhat.com>
+2012-06-12  Janis Johnson  <janisjo@codesourcery.com>
+
+       * gcc.dg/cpp/include2a.c: Add comments to checks for multiple
+       messages reported for one line of source code.
+       * gcc.dg/cpp/pr30786.c: Likewise.
+       * gcc.dg/cpp/pr28709.c: Likewise.
+       * gcc.dg/cpp/missing-header-MD.c: Likewise.
+       * gcc.dg/cpp/macspace2.c: Likewise.
+       * gcc.dg/cpp/missing-header-1.c: Likewise.
+       * gcc.dg/cpp/missing-header-MMD.c: Likewise.
+       * gcc.dg/cpp/missing-sysheader-MD.c: Likewise.
+       * gcc.dg/cpp/missing-sysheader-MMD.c: Likewise.
+
+2012-06-12  Jason Merrill  <jason@redhat.com>
 
        PR c++/53599
        * g++.dg/template/local7.C: New.

diff --git a/gcc/testsuite/gcc.dg/cpp/include2a.c b/gcc/testsuite/gcc.dg/cpp/include2a.c
index 6a11c92cff262e695ba7c151b011cee5ca78198c..9370d0944e6e664a4f535410089276a29ab2f902 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/include2a.c
+++ b/gcc/testsuite/gcc.dg/cpp/include2a.c
@@ -11,6 +11,6 @@
 
 /* These error is No such file or directory, just once.  However, this
    message is locale-dependent, so don't test for it.  */
-/* { dg-error "silly" "" { target *-*-* } 0 } */
-/* { dg-error "missing" "" { target *-*-* } 0 } */
-/* { dg-message "terminated" "" { target *-*-* } 0 } */
+/* { dg-error "silly" "silly" { target *-*-* } 0 } */
+/* { dg-error "missing" "missing" { target *-*-* } 0 } */
+/* { dg-message "terminated" "terminated" { target *-*-* } 0 } */

diff --git a/gcc/testsuite/gcc.dg/cpp/macspace2.c b/gcc/testsuite/gcc.dg/cpp/macspace2.c
index 1494fed18c3a56daa3fae39c62738194c48cb70b..6e6be96b1ff8bd2e4cb140e0a6cad856347d8872 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/macspace2.c
+++ b/gcc/testsuite/gcc.dg/cpp/macspace2.c
@@ -59,5 +59,5 @@
 #define ag"abc"                /* { dg-error "requires whitespace" } */
 
 int dummy;
-/* { dg-error "missing terminating" "" { target *-*-* } 6 } */
-/* { dg-error "missing terminating" "" { target *-*-* } 10 } */
+/* { dg-error "missing terminating" "missing-terminating" { target *-*-* } 6 } */
+/* { dg-error "missing terminating" "missing-terminating" { target *-*-* } 10 } */

diff --git a/gcc/testsuite/gcc.dg/cpp/missing-header-1.c b/gcc/testsuite/gcc.dg/cpp/missing-header-1.c
index dbcc2b36167030b986a6f9ad85b6ef139359e921..a597a4696170825398f6f00f5d0abe2896c84402 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/missing-header-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/missing-header-1.c
@@ -3,8 +3,8 @@
 /* { dg-options "" } */
 
 #include "nonexistent.h"
-/* { dg-message "nonexistent.h" "" { target *-*-* } 0 } */
-/* { dg-message "terminated" "" { target *-*-* } 0 } */
+/* { dg-message "nonexistent.h" "nonexistent.h" { target *-*-* } 0 } */
+/* { dg-message "terminated" "terminated" { target *-*-* } 0 } */
 
 /* This declaration should not receive any diagnostic.  */
 foo bar;

diff --git a/gcc/testsuite/gcc.dg/cpp/missing-header-MD.c b/gcc/testsuite/gcc.dg/cpp/missing-header-MD.c
index 7ed2e608517cbd3ac83ab29f2f683201a43b1a16..793fb179b891412de6d723298ef15d3961d43907 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/missing-header-MD.c
+++ b/gcc/testsuite/gcc.dg/cpp/missing-header-MD.c
@@ -3,8 +3,8 @@
 /* { dg-options "-MD" } */
 
 #include "nonexistent.h"
-/* { dg-message "nonexistent.h" "" { target *-*-* } 0 } */
-/* { dg-message "terminated" "" { target *-*-* } 0 } */
+/* { dg-message "nonexistent.h" "nonexistent.h" { target *-*-* } 0 } */
+/* { dg-message "terminated" "terminated" { target *-*-* } 0 } */
 
 /* This declaration should not receive any diagnostic.  */
 foo bar;

diff --git a/gcc/testsuite/gcc.dg/cpp/missing-header-MMD.c b/gcc/testsuite/gcc.dg/cpp/missing-header-MMD.c
index 2c1da30ea33ecf5d38407a667257ac2f924a6eaf..bba85ede97fe0f06828e95453e9690793fca2945 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/missing-header-MMD.c
+++ b/gcc/testsuite/gcc.dg/cpp/missing-header-MMD.c
@@ -3,8 +3,8 @@
 /* { dg-options "-MMD" } */
 
 #include "nonexistent.h"
-/* { dg-message "nonexistent.h" "" { target *-*-* } 0 } */
-/* { dg-message "terminated" "" { target *-*-* } 0 } */
+/* { dg-message "nonexistent.h" "nonexistent.h" { target *-*-* } 0 } */
+/* { dg-message "terminated" "terminated" { target *-*-* } 0 } */
 
 /* This declaration should not receive any diagnostic.  */
 foo bar;

diff --git a/gcc/testsuite/gcc.dg/cpp/missing-sysheader-MD.c b/gcc/testsuite/gcc.dg/cpp/missing-sysheader-MD.c
index e1324af25cc5159aae046c2245d57218f2005dc5..2983f2d58518ecdead94c2bb92c0a73a11f237f6 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/missing-sysheader-MD.c
+++ b/gcc/testsuite/gcc.dg/cpp/missing-sysheader-MD.c
@@ -3,8 +3,8 @@
 /* { dg-options "-MD" } */
 
 #include <nonexistent.h>
-/* { dg-message "nonexistent.h" "" { target *-*-* } 0 } */
-/* { dg-message "terminated" "" { target *-*-* } 0 } */
+/* { dg-message "nonexistent.h" "nonexistent.h" { target *-*-* } 0 } */
+/* { dg-message "terminated" "terminated" { target *-*-* } 0 } */
 
 /* This declaration should not receive any diagnostic.  */
 foo bar;

diff --git a/gcc/testsuite/gcc.dg/cpp/missing-sysheader-MMD.c b/gcc/testsuite/gcc.dg/cpp/missing-sysheader-MMD.c
index fb629ae1c3e1ea85d798b05d19ecea011eba08d6..351228661d99d6df4598a4d080c6dbc586a7f775 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/missing-sysheader-MMD.c
+++ b/gcc/testsuite/gcc.dg/cpp/missing-sysheader-MMD.c
@@ -3,8 +3,8 @@
 /* { dg-options "-MMD" } */
 
 #include <nonexistent.h>
-/* { dg-message "nonexistent.h" "" { target *-*-* } 0 } */
-/* { dg-message "terminated" "" { target *-*-* } 0 } */
+/* { dg-message "nonexistent.h" "nonexistent.h" { target *-*-* } 0 } */
+/* { dg-message "terminated" "terminated" { target *-*-* } 0 } */
 
 /* This declaration should not receive any diagnostic.  */
 foo bar;

diff --git a/gcc/testsuite/gcc.dg/cpp/pr28709.c b/gcc/testsuite/gcc.dg/cpp/pr28709.c
index cb1755a34abdc4cb1a221ce382269c5f83ba34a0..25d7cc297c333375e7e91e07c1423cee14a11f6c 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/pr28709.c
+++ b/gcc/testsuite/gcc.dg/cpp/pr28709.c
@@ -6,5 +6,5 @@
 
 #define foo - ## >>
 foo;
-/* { dg-error "expected identifier.*'-'" "" { target *-*-* } 8 } */
-/* { dg-error pasting "" { target *-*-* } 8 } */
+/* { dg-error "expected identifier.*'-'" "expected" { target *-*-* } 8 } */
+/* { dg-error pasting "pasting" { target *-*-* } 8 } */

diff --git a/gcc/testsuite/gcc.dg/cpp/pr30786.c b/gcc/testsuite/gcc.dg/cpp/pr30786.c
index f39f83cc88782a32efcde19614d98ae3690896d9..2c3610847fd46b50e95723e107d264929517824a 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/pr30786.c
+++ b/gcc/testsuite/gcc.dg/cpp/pr30786.c
@@ -1,8 +1,8 @@
 /* PR preprocessor/30786 - _Pragma at end of file should not ICE */
 /* { dg-do compile } */
 
-/* { dg-error "parenthesized" "" { target *-*-* } 9 } */
-/* { dg-error "expected" "" { target *-*-* } 9 } */
+/* { dg-error "parenthesized" "parenthesized" { target *-*-* } 9 } */
+/* { dg-error "expected" "expected" { target *-*-* } 9 } */
 
 int x;