2003-11-25 Michael Chastain <mec.gnu@mindspring.com>

	* gdb.cp/method.exp: Accept output of new demangler.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f1658ac79233cf47f974cb799bb95ef3c4b82aca..bfe501f6f1837edecd27eb9095b22ef00a0aea1c 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-25  Michael Chastain  <mec.gnu@mindspring.com>
+
+       * gdb.cp/method.exp: Accept output of new demangler.
+
 2003-11-25  Michael Chastain  <mec.gnu@mindspring.com>
 
        * gdb/class2.exp: New file.

diff --git a/gdb/testsuite/gdb.cp/method.exp b/gdb/testsuite/gdb.cp/method.exp
index a085b14cdcc8ac92d91432900ef7cfc61fbb8e8d..729b930768be860c9ccee45b3883cba67b4565f9 100644 (file)
--- a/gdb/testsuite/gdb.cp/method.exp
+++ b/gdb/testsuite/gdb.cp/method.exp
@@ -1,4 +1,4 @@
-# Copyright 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@ gdb_test "break A::bar" \
   "Breakpoint \[0-9\]* at $hex.*file .*method.cc, line 44\\."
 
 gdb_test "continue" \
-  "Continuing\\.\r\n\r\nBreakpoint \[0-9\]*, A::bar(\\(int\\) const|) \\(this=$hex, arg=15\\) at .*method\\.cc:44\r\n44\[\t \]*return arg \\+ 2 \\* x;" \
+  "Continuing\\.\r\n\r\nBreakpoint \[0-9\]*, A::bar(|\\(int\\) const| const) \\(this=$hex, arg=15\\) at .*method\\.cc:44\r\n44\[\t \]*return arg \\+ 2 \\* x;" \
   "continue to A::bar"
 
 # Check ability to access this-relative stuff.