2003-02-28 David Carlton <carlton@math.stanford.edu>

	* gdb.c++/templates.exp (do_tests): Allow const in the two
	Foo<volatile char *>::foo tests.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6d0ed5bc659b69e14cc1788651ab05987309396b..a778aa14e67fae8695d2dc1b15e75cec4f654c6c 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-28  David Carlton  <carlton@math.stanford.edu>
+
+       * gdb.c++/templates.exp (do_tests): Allow const in the two
+       Foo<volatile char *>::foo tests.
+
 2003-02-27  Michael Snyder  <msnyder@redhat.com>
 
        * gdb.base/restore.c (main): Return zero, so exit code 

diff --git a/gdb/testsuite/gdb.c++/templates.exp b/gdb/testsuite/gdb.c++/templates.exp
index a7763a2a52fd4e83c141f0d0faaeb0476bf4d717..3ae9891942e386d0495cc626c2662f1c0cd59a3c 100644 (file)
--- a/gdb/testsuite/gdb.c++/templates.exp
+++ b/gdb/testsuite/gdb.c++/templates.exp
@@ -301,7 +301,7 @@ gdb_expect {
 
 send_gdb "print Foo<volatile char *>::foo\n"   
 gdb_expect {   
-    -re "\\$\[0-9\]* = \\{.*char \\*\\((class |)Foo<volatile char ?\\*> \\*, int, .*char \\*\\)\\} $hex <Foo<.*char.*\\*>::foo\\(int, .*char.*\\*\\)>\r\n$gdb_prompt $" { pass "print Foo<volatile char *>::foo" }
+    -re "\\$\[0-9\]* = \\{.*char \\*\\((class |)Foo<volatile char ?\\*> \\*(| const), int, .*char \\*\\)\\} $hex <Foo<.*char.*\\*>::foo\\(int, .*char.*\\*\\)>\r\n$gdb_prompt $" { pass "print Foo<volatile char *>::foo" }
     -re "No symbol \"Foo<volatile char \\*>\" in current context.\r\n$gdb_prompt $"
     { kfail "gdb/33" "print Foo<volatile char *>::foo" }
     -re "$gdb_prompt $"                     { fail "print Foo<volatile char *>::foo" }
@@ -310,7 +310,7 @@ gdb_expect {
 
 send_gdb "print Foo<volatile char*>::foo\n"   
 gdb_expect {   
-    -re "\\$\[0-9\]* = \\{.*char \\*\\((class |)Foo<volatile char ?\\*> \\*, int, .*char \\*\\)\\} $hex <Foo<.*char.*\\*>::foo\\(int, .*char.*\\*\\)>\r\n$gdb_prompt $" { pass "print Foo<volatile char*>::foo" }
+    -re "\\$\[0-9\]* = \\{.*char \\*\\((class |)Foo<volatile char ?\\*> \\*(| const), int, .*char \\*\\)\\} $hex <Foo<.*char.*\\*>::foo\\(int, .*char.*\\*\\)>\r\n$gdb_prompt $" { pass "print Foo<volatile char*>::foo" }
     -re "No symbol \"Foo<volatile char\\*>\" in current context.\r\n$gdb_prompt $"
     { kfail "gdb/33" "print Foo<volatile char*>::foo" }
     -re "$gdb_prompt $"                     { fail "print Foo<volatile char*>::foo" }