* 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

@@ -1,3 +1,10 @@
+2011-01-02  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* 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  <brobecker@adacore.com>
 
 	* dg-extract-results.sh, gdb.arch/gcore.c, gdb.arch/gdb1558.c,

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.*" \

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]

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