diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 22d8fa79b53..1329715a1c6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-10-27 Nathan Sidwell + + * gcc.dg/cpp/direct2.c: Cope with different bison 'parse' or + 'syntax' error messages. + * gcc.dg/cpp/direct2s.c: Likewise. + 2004-10-26 Geoffrey Keating * gcc.c-torture/compile/20041026-1.c: New. diff --git a/gcc/testsuite/gcc.dg/cpp/direct2.c b/gcc/testsuite/gcc.dg/cpp/direct2.c index 433cf934f19..ecf6a5f1d82 100644 --- a/gcc/testsuite/gcc.dg/cpp/direct2.c +++ b/gcc/testsuite/gcc.dg/cpp/direct2.c @@ -12,7 +12,7 @@ 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" "" }*/ +int resync_parser_1; /*{ dg-error "parse|syntax" "" }*/ HASHINCLUDE /*{ dg-error "stray" "non-include 2" }*/ /*{ dg-bogus "No such" "don't execute non-include 2" { target *-*-* } 17 }*/ @@ -20,13 +20,13 @@ int resync_parser_2; void g1 () { -HASH define X 1 /* { dg-error "stray|undeclared|parse|for each" "# from macro" } */ +HASH define X 1 /* { dg-error "stray|undeclared|parse|syntax|for each" "# from macro" } */ int resync_parser_3; } void g2 () { -HASHDEFINE Y 1 /* { dg-error "stray|undeclared|parse|for each" "#define from macro" } */ +HASHDEFINE Y 1 /* { dg-error "stray|undeclared|parse|syntax|for each" "#define from macro" } */ int resync_parser_4; } diff --git a/gcc/testsuite/gcc.dg/cpp/direct2s.c b/gcc/testsuite/gcc.dg/cpp/direct2s.c index 939a213771d..955cda9a658 100644 --- a/gcc/testsuite/gcc.dg/cpp/direct2s.c +++ b/gcc/testsuite/gcc.dg/cpp/direct2s.c @@ -14,7 +14,7 @@ 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" "" }*/ +int resync_parser_1; /*{ dg-error "parse|syntax" "" }*/ HASHINCLUDE /*{ dg-error "stray" "non-include 2" }*/ /*{ dg-bogus "No such" "don't execute non-include 2" { target *-*-* } 18 }*/ @@ -22,13 +22,13 @@ int resync_parser_2; void g1 () { -HASH define X 1 /* { dg-error "stray|undeclared|parse|for each" "# from macro" } */ +HASH define X 1 /* { dg-error "stray|undeclared|parse|syntax|for each" "# from macro" } */ int resync_parser_3; } void g2 () { -HASHDEFINE Y 1 /* { dg-error "stray|undeclared|parse|for each" "#define from macro" } */ +HASHDEFINE Y 1 /* { dg-error "stray|undeclared|parse|syntax|for each" "#define from macro" } */ int resync_parser_4; }