* gdb.c++/method.exp (print this): Allow "A const".

	* gdb.c++/templates.exp (ptype fvpchar)
	(print Foo<volatile char *>::Foo): Allow consts after type names.

diff --git a/gdb/testsuite/ChangeLog.cplus b/gdb/testsuite/ChangeLog.cplus
index 3436b7340bf5a9600331f39b5a7a8d396abb0355..cd92a3d403ac9a56f757ab568ad7d563f01cd4cd 100644 (file)
--- a/gdb/testsuite/ChangeLog.cplus
+++ b/gdb/testsuite/ChangeLog.cplus
@@ -1,3 +1,9 @@
+2002-10-30  Daniel Jacobowitz  <drow@mvista.com>
+
+       * gdb.c++/method.exp (print this): Allow "A const".
+       * gdb.c++/templates.exp (ptype fvpchar)
+       (print Foo<volatile char *>::Foo): Allow consts after type names.
+
 2002-10-22  David Carlton  <carlton@math.stanford.edu>
 
        * gdb.c++/namespace.exp: Add tests involving namespaces

diff --git a/gdb/testsuite/gdb.c++/method.exp b/gdb/testsuite/gdb.c++/method.exp
index a085b14cdcc8ac92d91432900ef7cfc61fbb8e8d..d6b02a4ac36a1794a93c9bf5ba70487aa53b3094 100644 (file)
--- a/gdb/testsuite/gdb.c++/method.exp
+++ b/gdb/testsuite/gdb.c++/method.exp
@@ -111,7 +111,7 @@ get_debug_format
 
 send_gdb "print this\n"
 gdb_expect {
-  -re "\\$\[0-9\]* = \\(const (class |)A *\\* *(const|)\\) $hex\r\n$gdb_prompt $" {
+  -re "\\$\[0-9\]* = \\((const (class |)A|A const) *\\* *(const|)\\) $hex\r\n$gdb_prompt $" {
     pass "print this in A::bar"
   }
   -re "\\$\[0-9\]* = \\((class |)A *\\* *(const|)\\) $hex\r\n$gdb_prompt $" {

diff --git a/gdb/testsuite/gdb.c++/templates.exp b/gdb/testsuite/gdb.c++/templates.exp
index a6d35fcb116b2d770c71f714d9d57dc94cc2a7ef..75d5b6443291bd3ffc5c0741c5ff871cea042196 100644 (file)
--- a/gdb/testsuite/gdb.c++/templates.exp
+++ b/gdb/testsuite/gdb.c++/templates.exp
@@ -287,7 +287,7 @@ gdb_expect {
 
 send_gdb "ptype fvpchar\n"   
 gdb_expect {   
-   -re "type = (class |)Foo<volatile char ?\\*> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*.*char.*\\*t;\r\n\r\n\[ \t\]*.*char \\* foo\\(int,.*char.*\\*\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype fvpchar" }
+   -re "type = (class |)Foo<volatile char ?\\*> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*.*char.*\\*t;\r\n\r\n\[ \t\]*.*char.* \\* foo\\(int,.*char.*\\*\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype fvpchar" }
    -re "$gdb_prompt $"                     { fail "ptype fvpchar" }
    timeout                             { fail "(timeout) ptype fvpchar" }
 }
@@ -296,7 +296,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 ?\\*> \\*, int, .*char \\*\\)\\} $hex <Foo<.*char.*\\*>::foo\\(int, .*char.*\\*\\)>\r\n$gdb_prompt $" { pass "print Foo<(volatile char|char volatile) *>::foo" }
    -re "$gdb_prompt $"                     { fail "print Foo<volatile char *>::foo" }
    timeout                             { fail "(timeout) print Foo<volatile char *>::foo" }
 }