From 0852fee32a07e27b3d02e8a44770d8ad08a05a37 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 2 Jan 2012 18:04:26 +0000 Subject: [PATCH] * gdb.cell/fork.exp: Delete breakpoints after reaching main. * gdb.cell/gcore.exp: Likewise. * gdb.cell/solib-symbol.exp: Use "info symbol" instead of "break" to verify the correct instance of main is selected. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.cell/fork.exp | 2 ++ gdb/testsuite/gdb.cell/gcore.exp | 2 ++ gdb/testsuite/gdb.cell/solib-symbol.exp | 17 ++++++++--------- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 751aa66d8ab..40bedc5d12e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-01-02 Ulrich Weigand + + * gdb.cell/fork.exp: Delete breakpoints after reaching main. + * gdb.cell/gcore.exp: Likewise. + * gdb.cell/solib-symbol.exp: Use "info symbol" instead of "break" + to verify the correct instance of main is selected. + 2012-01-02 Joel Brobecker * dg-extract-results.sh, gdb.arch/gcore.c, gdb.arch/gdb1558.c, diff --git a/gdb/testsuite/gdb.cell/fork.exp b/gdb/testsuite/gdb.cell/fork.exp index b8c603dddc2..0e713e8f40f 100644 --- a/gdb/testsuite/gdb.cell/fork.exp +++ b/gdb/testsuite/gdb.cell/fork.exp @@ -61,6 +61,8 @@ if ![runto_main] then { return 0 } +delete_breakpoints + gdb_test_no_output "set spu stop-on-load" "set spu stop-on-load" gdb_test "continue" "Continuing\\..*Temporary breakpoint \[0-9\]+, main \\(speid=.*, argp=.*, envp=.*\\) at .*$spu_file\\.c:.*spu_write_out_intr_mbox.*" \ diff --git a/gdb/testsuite/gdb.cell/gcore.exp b/gdb/testsuite/gdb.cell/gcore.exp index 304657ebb9c..7986e56b0b7 100644 --- a/gdb/testsuite/gdb.cell/gcore.exp +++ b/gdb/testsuite/gdb.cell/gcore.exp @@ -65,6 +65,8 @@ if ![runto_main] then { return 0 } +delete_breakpoints + gdb_test "continue" ".*Aborted.*" set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test] diff --git a/gdb/testsuite/gdb.cell/solib-symbol.exp b/gdb/testsuite/gdb.cell/solib-symbol.exp index 274f7769f5e..dc262c82a7a 100644 --- a/gdb/testsuite/gdb.cell/solib-symbol.exp +++ b/gdb/testsuite/gdb.cell/solib-symbol.exp @@ -61,20 +61,19 @@ if ![runto_main] then { return 0 } -# Breakpoint resolved in PPU thread. -gdb_test "break foo" \ - "Breakpoint.*file.*$ppu_file.c.*" \ - "br foo in break" +# Symbol resolved in PPU thread. +gdb_test "info symbol foo" \ + "foo in section \.text of .*$ppu_file\[\r\n\]+.*" \ + "info symbol foo in break" # Continue to SPU cont_spu_main check_spu_arch "" -# Breakpoint resolved in SPU thread. -delete_breakpoints -gdb_test "break foo" \ - "Breakpoint.*file.*$spu_file.c.*" \ - "br foo in $spu_file.c" +# Symbol resolved in SPU thread. +gdb_test "info symbol foo" \ + "foo in section \.text of .*$spu_file@.*" \ + "info symbol foo in break-spu" gdb_exit return 0 -- 2.30.2