diff options
Diffstat (limited to 'gdb/testsuite/gdb.cp')
| -rw-r--r-- | gdb/testsuite/gdb.cp/cp-relocate.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp index 172f24e..2981228 100644 --- a/gdb/testsuite/gdb.cp/cp-relocate.exp +++ b/gdb/testsuite/gdb.cp/cp-relocate.exp @@ -31,11 +31,11 @@ proc get_func_address { func } { set rfunc [string_to_regexp $func] gdb_test_multiple "print ${func}" "get address of ${func}" { - -re "\\\$\[0-9\]+ = \\{.*\\} (0|($hex) <${rfunc}>)\[\r\n\]+${gdb_prompt} $" { + -re "\\\$\[0-9\]+ = \\{.*\\} (($hex) <${rfunc}.*>)\[\r\n\]+${gdb_prompt} $" { # $1 = {int ()} 0x24 <function_bar> # But if the function is at zero, the name may be omitted. pass "get address of ${func}" - if { $expect_out(1,string) == "0" } { + if { $expect_out(1,string) == "0x0" } { return "0x0" } else { return $expect_out(2,string) diff --git a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp index 226d0b8..2614fb7 100644 --- a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp +++ b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp @@ -32,6 +32,9 @@ gdb_test_no_output "set language c++" # FAIL was: # $1 = {<text variable, no debug info>} 0 -gdb_test "p 'method(long)'" { = {void \(long\)} 0} "before expand" -gdb_test "p method" { = {void \(long\)} 0} "force expand" -gdb_test "p 'method(long)'" { = {void \(long\)} 0} "after expand" +gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 <method.long.>} \ + "before expand" +gdb_test "p method" { = {void \(long\)} 0x0 <method.long.>} \ + "force expand" +gdb_test "p 'method(long)'" { = {void \(long\)} 0x0 <method.long.>} \ + "after expand" |