2002-05-27 Michael Chastain <mec@shout.net>

	* gdb.c++/local.exp: Accept more nested types in output.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4081971c9dbde7a9a62883b95c505805620ef8f8..762fe072bd74a8adf54b779c7a8a106c20ce79a4 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-27  Michael Chastain  <mec@shout.net>
+
+       * gdb.c++/local.exp: Accept more nested types in output.
+
 2002-05-26  Michael Chastain  <mec@shout.net>
 
        * gdb.base/call-rt-st.exp: Fix typo in brace quoting.

diff --git a/gdb/testsuite/gdb.c++/local.exp b/gdb/testsuite/gdb.c++/local.exp
index 091d643f0d4394f89bcd76bf082476c05ecc05b8..3ec2d5ef8b5d473903270285c50df58df7d95f86 100644 (file)
--- a/gdb/testsuite/gdb.c++/local.exp
+++ b/gdb/testsuite/gdb.c++/local.exp
@@ -124,12 +124,12 @@ gdb_expect {
 # Pattern 1:
 # PASS
 #   dwarf-2
-#     2.95.3, 2.96-rh, 3.0.4, gcc-3_1-branch, HEAD
+#     2.95.3, 2.96-rh, 3.0.4, 3.1, gcc-3_1-branch, HEAD
 #
 # Pattern 2:
 # PASS
 #   stabs+
-#     2.95.3, 2.96-rh, 3.0.4, gcc-3_1-branch, HEAD
+#     2.95.3, 2.96-rh, 3.0.4, 3.1, gcc-3_1-branch, HEAD
 #
 # Pattern 3:
 # Old hppa pattern.
@@ -137,12 +137,12 @@ gdb_expect {
 # Pattern 4:
 # Old hppa pattern.
 #
-# chastain 2002-04-08
+# chastain 2002-05-27
 
 send_gdb "ptype InnerLocal\n"
 gdb_expect {
-  -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*NestedInnerLocal nest1;\[\r\n\t \]*int il_foo\\((unsigned char const|const unsigned char) *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal" }
-  -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*NestedInnerLocal nest1;\[\r\n\t \]*InnerLocal *& operator *=\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((void|)\\);\[\r\n\t \]*int il_foo\\(unsigned char const *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal" }
+  -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]*int il_foo\\((unsigned char const|const unsigned char) *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal (pattern 1)" }
+  -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]*InnerLocal *& operator *=\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((void|)\\);\[\r\n\t \]*int il_foo\\(unsigned char const *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal (pattern 2)" }
   -re "type = class InnerLocal \{\r\n\[\t \]*public:\r\n\[\t \]*char ilc;\r\n\[\t \]*int \\*ip;\r\n\[\t \]*InnerLocal::NestedInnerLocal nest1;\r\n\r\n\[\t \]*.int il_foo\\(unsigned char const &\\);\r\n\[\t \]*\}\[\t \]*\\(Local at.*local\\.cc:36\\).*$gdb_prompt $" { pass "ptype InnerLocal (old HP aCC)" }
   -re "type = class InnerLocal \{\r\n\[\t \]*public:\r\n\[\t \]*char ilc;\r\n\[\t \]*int \\*ip;\r\n\[\t \]*class InnerLocal4::NestedInnerLocal nest1;\r\n\r\n\[\t \]*int il_foo\\(unsigned char const &\\);\r\n\[\t \]*\\(Local at.*local\.cc:\[0-9\]+\\)\r\n\}.*$gdb_prompt $" { pass "ptype InnerLocal (old HP aCC)" }
   -re ".*$gdb_prompt $"   {  fail "ptype InnerLocal" }