diff options
| author | Michael Chastain <mec@google.com> | 2002-05-27 18:00:14 +0000 |
|---|---|---|
| committer | Michael Chastain <mec@google.com> | 2002-05-27 18:00:14 +0000 |
| commit | def1b996f9b96338df5b4b8172cc98c09f7c453c (patch) | |
| tree | 2310cb705aa5c2afbf95cb08d96b3f81f96a111a /gdb/testsuite | |
| parent | b4477fa895b6aff727a5fd3b3d6d13342dfe57a9 (diff) | |
| download | gdb-def1b996f9b96338df5b4b8172cc98c09f7c453c.zip gdb-def1b996f9b96338df5b4b8172cc98c09f7c453c.tar.gz gdb-def1b996f9b96338df5b4b8172cc98c09f7c453c.tar.bz2 | |
2002-05-27 Michael Chastain <mec@shout.net>
* gdb.c++/local.exp: Accept more nested types in output.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.c++/local.exp | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4081971..762fe07 100644 --- 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 091d643..3ec2d5e 100644 --- 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" } |