From f993f39ec979dd26e024663a59f481e6d9334bf6 Mon Sep 17 00:00:00 2001 From: Luis Machado Date: Wed, 5 Jun 2013 20:38:37 +0000 Subject: [PATCH] * gdb.cp/virtfunc.exp (make_one_vtable_result): Handle extra output from targets that use function descriptors in the virtual tables. Handle presence of dot symbols. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.cp/virtfunc.exp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1aca3ce7cc0..beeab23a7ff 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-06-05 Luis Machado + + * gdb.cp/virtfunc.exp (make_one_vtable_result): Handle extra output + from targets that use function descriptors in the virtual tables. + Handle presence of dot symbols. + 2013-06-04 Gary Benson * gdb.base/break-probes.exp: New file. diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp index 2509cc70c58..1c2268ab91e 100644 --- a/gdb/testsuite/gdb.cp/virtfunc.exp +++ b/gdb/testsuite/gdb.cp/virtfunc.exp @@ -234,7 +234,7 @@ proc make_one_vtable_result {name args} { set result "vtable for '${name}' @ $hex .subobject @ $hex.:$nls" set count 0 foreach func $args { - append result ".${count}.: $hex <$func..>${nls}" + append result ".${count}.:( @$hex:)? $hex <(\.)?$func..>${nls}" incr count } -- 2.30.2