From 5e1617b13f13c2de52e23a947ef85bcdb99a5b05 Mon Sep 17 00:00:00 2001
From: Daniel Jacobowitz <drow@false.org>
Date: Wed, 8 Sep 2010 23:41:40 +0000
Subject: [PATCH] 	* gdb.cp/templates.exp (test_template_args): Allow
 "struct".

---
 gdb/testsuite/ChangeLog            | 4 ++++
 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 3868b97bb81..c09c0210c6d 100644
--- 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 c5313070e0e..c17cf3df504 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 {} {
-- 
2.30.2