From 4569eed2ceb9ca011d1a3c5e53286ce9150d7042 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 9 Sep 2010 20:00:49 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.base/break-interp.exp (reach): Permit leading . for ppc64. (test_ld) : New. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/break-interp.exp | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c09c021..2c1e8ef 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-09-09 Jan Kratochvil + + * gdb.base/break-interp.exp (reach): Permit leading . for ppc64. + (test_ld) : New. + 2010-09-08 Daniel Jacobowitz * gdb.cp/templates.exp (test_template_args): Allow "struct". diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index 5039bcb..d3dd248 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -136,10 +136,10 @@ proc reach {func command displacement} { } exp_continue } - -re "Breakpoint \[0-9\]+, $func \\(.*\\) at .*:\[0-9\]+\r\n.*$gdb_prompt $" { + -re "Breakpoint \[0-9\]+, \\.?$func \\(.*\\) at .*:\[0-9\]+\r\n.*$gdb_prompt $" { pass $test } - -re "Breakpoint \[0-9\]+, \[0-9xa-f\]+ in $func \\(\\).*\r\n$gdb_prompt $" { + -re "Breakpoint \[0-9\]+, \[0-9xa-f\]+ in \\.?$func \\(\\).*\r\n$gdb_prompt $" { pass $test } } @@ -399,6 +399,17 @@ proc test_ld {file ifmain trynosym displacement} { pass $test } } + # `info sym' cannot be tested for .opd as the binary may not have + # symbols. + if [istarget powerpc64-*] { + set test "convert entry point" + gdb_test_multiple "p *(void(*)(void) *) 0x$entrynohex" $test { + -re " =( \\(\[^0-9\]*\\))? 0x(\[0-9a-f\]+)( < \[^\r\n\]*)?\r\n$gdb_prompt $" { + set entrynohex $expect_out(2,string) + pass $test + } + } + } if {$entrynohex != ""} { gdb_test "break *0x$entrynohex" "" "break at entry point" gdb_test "continue" "\r\nBreakpoint \[0-9\]+, 0x0*$entrynohex in .*" "entry point reached" -- 2.7.4