From 1d51a733d5f20fe7ad6e89103f50742da2991586 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 18 May 2012 15:28:24 +0000 Subject: * printcmd.c (print_address_demangle): Remove special case for 0. testsuite * gdb.mi/mi2-var-display.exp: Update. * gdb.mi/mi-var-display.exp: Update. * gdb.mi/mi-var-child.exp: Update. * gdb.cp/expand-psymtabs-cxx.exp: Update. * gdb.cp/cp-relocate.exp (get_func_address): Update. --- gdb/testsuite/gdb.cp/cp-relocate.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/testsuite/gdb.cp/cp-relocate.exp') diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp index 172f24e11db..2981228ac83 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 # 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) -- cgit v1.2.1