2003-09-07 Michael Chastain <mec@shout.net>

	* gdb.cp/classes.exp: Accommodate both 'syntax error' and
	'parse error'.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5919e73b68d6459205dbb593719ce437bde75e7a..21d4cd257af1de950f65adbade52e8390fc9b671 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-07  Michael Chastain  <mec@shout.net>
+
+       * gdb.cp/classes.exp: Accommodate both 'syntax error' and
+       'parse error'.
+
 2003-09-07  Mark Kettenis  <m.kettenis@osp.nl>
 
        * gdb.arch/i386-prologue.exp: Add checks for saved registers.

diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
index 3f398acc5ecedef0e7aaf049d1fff67d74773a2f..60f5ab75dc4d949e0798aeebc1b184819e7439a7 100644 (file)
--- a/gdb/testsuite/gdb.cp/classes.exp
+++ b/gdb/testsuite/gdb.cp/classes.exp
@@ -682,8 +682,14 @@ proc test_enums {} {
     send_gdb "print (ClassWithEnum::PrivEnum) 42\n"
     gdb_expect {
        -re "\\$\[0-9\]* = yellow.*$gdb_prompt $" { pass "print (ClassWithEnum::PrivEnum) 42" }
-       -re "A parse error in expression, near `42'.\r\n$gdb_prompt $"
-       { kfail "gdb/826" "print (ClassWithEnum::PrivEnum) 42" }
+       -re "A parse error in expression, near `42'.\r\n$gdb_prompt $" {
+           # bison 1.35
+           kfail "gdb/826" "print (ClassWithEnum::PrivEnum) 42"
+       }
+       -re "A syntax error in expression, near `42'.\r\n$gdb_prompt $" {
+           # bison 1.875
+           kfail "gdb/826" "print (ClassWithEnum::PrivEnum) 42"
+       }
        -re "$gdb_prompt $"                     { fail "print (ClassWithEnum::PrivEnum) 42" }
        timeout                             { fail "(timeout) print (ClassWithEnum::PrivEnum) 42" }
     }