aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2004-11-05 16:43:49 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2004-11-05 16:43:49 +0000
commit88876c7cb434ed34d2293f1251769bfc3b4e7488 (patch)
tree542f1c51fd6a5013d637085ee2507d1a755a8281 /gcc
parent54f88091c57f2457752c7d3236bf9f2a9f0c7cd4 (diff)
downloadgcc-88876c7cb434ed34d2293f1251769bfc3b4e7488.zip
gcc-88876c7cb434ed34d2293f1251769bfc3b4e7488.tar.gz
gcc-88876c7cb434ed34d2293f1251769bfc3b4e7488.tar.bz2
20040910-1.c, [...]: Adjust expected messages for new parser.
* gcc.dg/20040910-1.c, gcc.dg/cpp/digraph2.c, gcc.dg/cpp/direct2.c, gcc.dg/cpp/direct2s.c, gcc.dg/cpp/separate-1.c, gcc.dg/noncompile/951123-1.c, gcc.dg/noncompile/971104-1.c, gcc.dg/noncompile/990416-1.c: Adjust expected messages for new parser. From-SVN: r90128
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog8
-rw-r--r--gcc/testsuite/gcc.dg/20040910-1.c2
-rw-r--r--gcc/testsuite/gcc.dg/cpp/digraph2.c2
-rw-r--r--gcc/testsuite/gcc.dg/cpp/direct2.c10
-rw-r--r--gcc/testsuite/gcc.dg/cpp/direct2s.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/separate-1.c4
-rw-r--r--gcc/testsuite/gcc.dg/noncompile/951123-1.c2
-rw-r--r--gcc/testsuite/gcc.dg/noncompile/971104-1.c2
-rw-r--r--gcc/testsuite/gcc.dg/noncompile/990416-1.c2
9 files changed, 24 insertions, 16 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 69f4038..f27f80b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-05 Joseph S. Myers <joseph@codesourcery.com>
+
+ * gcc.dg/20040910-1.c, gcc.dg/cpp/digraph2.c,
+ gcc.dg/cpp/direct2.c, gcc.dg/cpp/direct2s.c,
+ gcc.dg/cpp/separate-1.c, gcc.dg/noncompile/951123-1.c,
+ gcc.dg/noncompile/971104-1.c, gcc.dg/noncompile/990416-1.c: Adjust
+ expected messages for new parser.
+
2004-11-04 Mark Mitchell <mark@codesourcery.com>
* testsuite/g++.dg/ext/visibility/symbian1.C: New test.
diff --git a/gcc/testsuite/gcc.dg/20040910-1.c b/gcc/testsuite/gcc.dg/20040910-1.c
index 10f5fb3..ff772ab 100644
--- a/gcc/testsuite/gcc.dg/20040910-1.c
+++ b/gcc/testsuite/gcc.dg/20040910-1.c
@@ -1,2 +1,2 @@
/* Tests error recovery for invalid code. */
-__attribute__((foo) int f (){} /* { dg-error "(parse|syntax) error before 'int'" } */
+__attribute__((foo) int f (){} /* { dg-error "(parse error|syntax error|expected '\\)') before 'int'" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/digraph2.c b/gcc/testsuite/gcc.dg/cpp/digraph2.c
index cac4e25..16fcbae 100644
--- a/gcc/testsuite/gcc.dg/cpp/digraph2.c
+++ b/gcc/testsuite/gcc.dg/cpp/digraph2.c
@@ -9,7 +9,7 @@
int main (int argc, char *argv[])
{
return 0;
-%> /* { dg-error "(parse|syntax) error" } */
+%> /* { dg-error "parse error|syntax error|expected" } */
/* Place this after main () so we get to test both the compiler above
and the preprocessor below. */
diff --git a/gcc/testsuite/gcc.dg/cpp/direct2.c b/gcc/testsuite/gcc.dg/cpp/direct2.c
index ecf6a5f..51309e9 100644
--- a/gcc/testsuite/gcc.dg/cpp/direct2.c
+++ b/gcc/testsuite/gcc.dg/cpp/direct2.c
@@ -12,21 +12,21 @@
HASH include "somerandomfile" /*{ dg-error "stray" "non-include" }*/
/*{ dg-bogus "No such" "don't execute non-include" { target *-*-* } 13 }*/
-int resync_parser_1; /*{ dg-error "parse|syntax" "" }*/
+int resync_parser_1; /*{ dg-error "parse|syntax|expected" "" }*/
-HASHINCLUDE <somerandomfile> /*{ dg-error "stray" "non-include 2" }*/
+HASHINCLUDE <somerandomfile> /*{ dg-error "stray|expected" "non-include 2" }*/
/*{ dg-bogus "No such" "don't execute non-include 2" { target *-*-* } 17 }*/
int resync_parser_2;
void g1 ()
{
-HASH define X 1 /* { dg-error "stray|undeclared|parse|syntax|for each" "# from macro" } */
+HASH define X 1 /* { dg-error "stray|undeclared|parse|syntax|expected|for each" "# from macro" } */
int resync_parser_3;
}
void g2 ()
{
-HASHDEFINE Y 1 /* { dg-error "stray|undeclared|parse|syntax|for each" "#define from macro" } */
+HASHDEFINE Y 1 /* { dg-error "stray|undeclared|parse|syntax|expected|for each" "#define from macro" } */
int resync_parser_4;
}
@@ -42,5 +42,5 @@ void f ()
#define slashstar /##*
#define starslash *##/
-slashstar starslash /* { dg-error "(parse|syntax) error" "not a comment" } */
+slashstar starslash /* { dg-error "parse error|syntax error|expected" "not a comment" } */
/* { dg-warning "does not give" "paste warning(s)" { target *-*-* } 45 } */
diff --git a/gcc/testsuite/gcc.dg/cpp/direct2s.c b/gcc/testsuite/gcc.dg/cpp/direct2s.c
index 955cda9..b2d00cf 100644
--- a/gcc/testsuite/gcc.dg/cpp/direct2s.c
+++ b/gcc/testsuite/gcc.dg/cpp/direct2s.c
@@ -14,21 +14,21 @@
HASH include "somerandomfile" /*{ dg-error "stray" "non-include" }*/
/*{ dg-bogus "No such" "don't execute non-include" { target *-*-* } 15 }*/
-int resync_parser_1; /*{ dg-error "parse|syntax" "" }*/
+int resync_parser_1; /*{ dg-error "parse|syntax|expected" "" }*/
-HASHINCLUDE <somerandomfile> /*{ dg-error "stray" "non-include 2" }*/
+HASHINCLUDE <somerandomfile> /*{ dg-error "stray|expected" "non-include 2" }*/
/*{ dg-bogus "No such" "don't execute non-include 2" { target *-*-* } 18 }*/
int resync_parser_2;
void g1 ()
{
-HASH define X 1 /* { dg-error "stray|undeclared|parse|syntax|for each" "# from macro" } */
+HASH define X 1 /* { dg-error "stray|undeclared|parse|syntax|expected|for each" "# from macro" } */
int resync_parser_3;
}
void g2 ()
{
-HASHDEFINE Y 1 /* { dg-error "stray|undeclared|parse|syntax|for each" "#define from macro" } */
+HASHDEFINE Y 1 /* { dg-error "stray|undeclared|parse|syntax|expected|for each" "#define from macro" } */
int resync_parser_4;
}
diff --git a/gcc/testsuite/gcc.dg/cpp/separate-1.c b/gcc/testsuite/gcc.dg/cpp/separate-1.c
index a80e001..71dcfef 100644
--- a/gcc/testsuite/gcc.dg/cpp/separate-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/separate-1.c
@@ -8,8 +8,8 @@
#define FOO()
-int FOO( /* { dg-error "(parse|syntax) error" "error on this line" } */
+int FOO( /* { dg-error "parse error|syntax error|expected" "error on this line" } */
), bar;
-int baz FOO /* { dg-error "(parse|syntax) error" "error on this line" } */
+int baz FOO /* { dg-error "parse error|syntax error|expected" "error on this line" } */
; /* { dg-warning "no type or storage class" "warning on this line" } */
diff --git a/gcc/testsuite/gcc.dg/noncompile/951123-1.c b/gcc/testsuite/gcc.dg/noncompile/951123-1.c
index 787cf1e..009d02b 100644
--- a/gcc/testsuite/gcc.dg/noncompile/951123-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/951123-1.c
@@ -1,2 +1,2 @@
struct S { int a; int b[2]; };
-struct S x = { 0, [0]; }; /* { dg-error "array index|near|(parse|syntax)" } */
+struct S x = { 0, [0]; }; /* { dg-error "array index|near|parse|syntax|expected" } */
diff --git a/gcc/testsuite/gcc.dg/noncompile/971104-1.c b/gcc/testsuite/gcc.dg/noncompile/971104-1.c
index 54337b2..4b02d71 100644
--- a/gcc/testsuite/gcc.dg/noncompile/971104-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/971104-1.c
@@ -24,6 +24,6 @@ static void up(int sem){
printf("%s had processes sleeping on it!\n",
({ "MUTEX ", "BARB_SEM 1", "BARB_SEM 2", "CUST_SEM 1",
"CUST_SEM 2", "WAIT_SEM 1", "WAIT_SEM 2", "WAIT_SEM 3",
- "WAIT_SEM 4"} /* { dg-error "(parse|syntax) error" } */
+ "WAIT_SEM 4"} /* { dg-error "parse error|syntax error|expected" } */
[( sb.sem_num )]) );
}
diff --git a/gcc/testsuite/gcc.dg/noncompile/990416-1.c b/gcc/testsuite/gcc.dg/noncompile/990416-1.c
index 72aa3cd..a0e02e2 100644
--- a/gcc/testsuite/gcc.dg/noncompile/990416-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/990416-1.c
@@ -2,7 +2,7 @@ extern void *memcpy (void *, const void *, __SIZE_TYPE__);
typedef int word_type;
static void
-copy_reg (unsigned int reg, frame_state *udata, /* { dg-error "parse|syntax" } */
+copy_reg (unsigned int reg, frame_state *udata, /* { dg-error "parse|syntax|expected" } */
frame_state *target_udata)
{
word_type *preg = get_reg_addr (reg, udata, 0); /* { dg-error "undeclared|function|without a cast" } */
generated by cgit v1.1 at 2025-08-17 00:38:52 +0000