diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/templates.exp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3868b97..c09c021 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2010-09-08 Daniel Jacobowitz <dan@codesourcery.com> + * gdb.cp/templates.exp (test_template_args): Allow "struct". + +2010-09-08 Daniel Jacobowitz <dan@codesourcery.com> + * gdb.cp/templates.cc (Empty, FunctionArg): New classes. (FunctionArg::method): New function. (empty, arg): New variables. diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp index c531307..c17cf3d 100644 --- a/gdb/testsuite/gdb.cp/templates.exp +++ b/gdb/testsuite/gdb.cp/templates.exp @@ -200,10 +200,10 @@ proc test_template_args {} { set empty_re "Empty *<void *\\(FunctionArg *<int>\\)>" gdb_test "ptype empty" \ - "type = class $empty_re {.*<no data fields>.*}" + "type = (struct|class) $empty_re {.*<no data fields>.*}" gdb_test "ptype arg" \ - "type = class FunctionArg<int> {.*int method\\($empty_re \\&\\);.*}" + "type = (struct|class) FunctionArg<int> {.*int method\\($empty_re \\&\\);.*}" } proc do_tests {} { |