aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2004-10-27 10:20:55 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2004-10-27 10:20:55 +0000
commit028aa3894687d694bf44cea1c218b81abcdbb525 (patch)
tree556f4ada485d2030c6b8a579a3d9ef8310618569
parente2cb732fcb9b68a34d7113c246e2e9e3abbd5b66 (diff)
downloadgcc-028aa3894687d694bf44cea1c218b81abcdbb525.zip
gcc-028aa3894687d694bf44cea1c218b81abcdbb525.tar.gz
gcc-028aa3894687d694bf44cea1c218b81abcdbb525.tar.bz2
direct2.c: Cope with different bison 'parse' or 'syntax' error messages.
* gcc.dg/cpp/direct2.c: Cope with different bison 'parse' or 'syntax' error messages. * gcc.dg/cpp/direct2s.c: Likewise. From-SVN: r89635
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gcc.dg/cpp/direct2.c6
-rw-r--r--gcc/testsuite/gcc.dg/cpp/direct2s.c6
3 files changed, 12 insertions, 6 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 22d8fa7..1329715 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-27 Nathan Sidwell <nathan@codesourcery.com>
+
+ * 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 <geoffk@apple.com>
* 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 433cf93..ecf6a5f 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 <somerandomfile> /*{ 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 939a213..955cda9 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 <somerandomfile> /*{ 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;
}