From c203e0ca367bb25bb0d3a3bd64aea495bebc3d7a Mon Sep 17 00:00:00 2001 From: Michael Chastain Date: Sun, 1 Aug 2004 01:03:47 +0000 Subject: [PATCH] 2004-07-31 Michael Chastain * gdb.cp/namespace.exp: Accept more varieties of ptype output. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.cp/namespace.exp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index cd61f71642..a011af11c1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-07-31 Michael Chastain + + * gdb.cp/namespace.exp: Accept more varieties of ptype output. + 2004-07-31 Michael Chastain * gdb.cp/virtfunc.exp: Accept more varieties of ptype output. diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp index 4b3f1e255c..4d29589498 100644 --- a/gdb/testsuite/gdb.cp/namespace.exp +++ b/gdb/testsuite/gdb.cp/namespace.exp @@ -254,8 +254,8 @@ gdb_test "print E::ce" "No symbol \"ce\" in namespace \"C::D::E\"." gdb_test "ptype C" "type = namespace C::C" gdb_test "ptype E" "type = namespace C::D::E" -gdb_test "ptype CClass" "type = class C::CClass \{\r\n public:\r\n int x;\r\n\}" -gdb_test "ptype CClass::NestedClass" "type = class C::CClass::NestedClass \{\r\n public:\r\n int y;\r\n\}" +gdb_test "ptype CClass" "type = (class C::CClass \{\r\n public:|struct C::CClass \{)\r\n int x;\r\n\}" +gdb_test "ptype CClass::NestedClass" "type = (class C::CClass::NestedClass \{\r\n public:|struct C::CClass::NestedClass \{)\r\n int y;\r\n\}" gdb_test "ptype NestedClass" "No symbol \"NestedClass\" in current context." setup_kfail "gdb/1448" "*-*-*" gdb_test "ptype ::C::CClass" "type = class C::CClass \{\r\n public:\r\n int x;\r\n\}" @@ -270,7 +270,7 @@ gdb_test "ptype C::NestedClass" "No symbol \"NestedClass\" in namespace \"C::C\" # Tests involving multiple files gdb_test "print cOtherFile" "\\$\[0-9\].* = 316" -gdb_test "ptype OtherFileClass" "type = class C::OtherFileClass \{\r\n public:\r\n int z;\r\n\}" +gdb_test "ptype OtherFileClass" "type = (class C::OtherFileClass \{\r\n public:|struct C::OtherFileClass \{)\r\n int z;\r\n\}" setup_kfail "gdb/1448" "*-*-*" gdb_test "ptype ::C::OtherFileClass" "type = class C::OtherFileClass \{\r\n public:\r\n int z;\r\n\}" gdb_test "ptype C::OtherFileClass" "No symbol \"OtherFileClass\" in namespace \"C::C\"."