From 9a3edfd46b0b40b1c048c56c468ff5219995f330 Mon Sep 17 00:00:00 2001 From: Janis Johnson Date: Tue, 12 Jun 2012 20:23:36 +0000 Subject: [PATCH] include2a.c: Add comments to checks for multiple messages reported for one line of source code. * 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 --- gcc/testsuite/ChangeLog | 15 ++++++++++++++- gcc/testsuite/gcc.dg/cpp/include2a.c | 6 +++--- gcc/testsuite/gcc.dg/cpp/macspace2.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/missing-header-1.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/missing-header-MD.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/missing-header-MMD.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/missing-sysheader-MD.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/missing-sysheader-MMD.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/pr28709.c | 4 ++-- gcc/testsuite/gcc.dg/cpp/pr30786.c | 4 ++-- 10 files changed, 33 insertions(+), 20 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 908e25b07fc..8d54fabe475 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,17 @@ -2012-06-07 Jason Merrill +2012-06-12 Janis Johnson + + * 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 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 6a11c92cff2..9370d0944e6 100644 --- 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 1494fed18c3..6e6be96b1ff 100644 --- 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 dbcc2b36167..a597a469617 100644 --- 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 7ed2e608517..793fb179b89 100644 --- 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 2c1da30ea33..bba85ede97f 100644 --- 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 e1324af25cc..2983f2d5851 100644 --- 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 -/* { 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 fb629ae1c3e..351228661d9 100644 --- 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 -/* { 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 cb1755a34ab..25d7cc297c3 100644 --- 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 f39f83cc887..2c3610847fd 100644 --- 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; -- 2.30.2