From: Michael Chastain <mec@google.com>
Date: Mon, 8 Sep 2003 02:00:11 +0000 (+0000)
Subject: 2003-09-07  Michael Chastain  <mec@shout.net>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8a2d9e7ba999f27a6116a72291a7e1603cd321d;p=binutils-gdb.git

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 5919e73b68d..21d4cd257af 100644
--- 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 3f398acc5ec..60f5ab75dc4 100644
--- 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" }
     }