* gdb.cp/templates.exp (test_template_args): Allow "struct".

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3868b97bb8196b72fdd71f563a4b773ba23023ed..c09c0210c6d28c62a8df288400b98f3265ae3569 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
index c5313070e0e54340fd0595c27fe9566b1c576740..c17cf3df504c860acd6e66c1fa82175b1375aa98 100644 (file)
--- 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 {} {