* gdb.base/gdb1250.exp: Remove perror.

	* lib/mi-support.exp (mi_delete_breakpoints): Match the prompt.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 680d783be18a33cec55c102136848754f1f3f618..ff2cbbb4f1b51d0939490a76e645f993a1f5dff3 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-30  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gdb.base/gdb1250.exp: Remove perror.
+       * lib/mi-support.exp (mi_delete_breakpoints): Match the prompt.
+
 2008-04-30  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.dwarf2/dw2-strp.S: Replace .long by .4byte and .value by

diff --git a/gdb/testsuite/gdb.base/gdb1250.exp b/gdb/testsuite/gdb.base/gdb1250.exp
index 48c159e90ab2134b5826576d5aad067073af0c02..744c2773dcce06c82e96fbfcf991bb5bd15f73d7 100644 (file)
--- a/gdb/testsuite/gdb.base/gdb1250.exp
+++ b/gdb/testsuite/gdb.base/gdb1250.exp
@@ -43,7 +43,6 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 if ![runto abort {allow-pending}] then {
-    perror "couldn't run to breakpoint"
     continue
 }
 

diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 1f4c3dddbbbfc07be2be071247f450dd515d4739..9372dfc328e0b2948da9b9e924aa4b562dec01fe 100644 (file)
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -265,7 +265,7 @@ proc mi_delete_breakpoints {} {
     send_gdb "103-break-list\n"
     gdb_expect 30 {
         -re "103-break-list\r\n103\\\^done,BreakpointTable=\{\}\r\n$mi_gdb_prompt$" {}
-        -re "103-break-list\r\n103\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[\\\]\}" {}
+        -re "103-break-list\r\n103\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[\\\]\}\r\n$mi_gdb_prompt$" {}
         -re "103-break-list\r\n103\\\^doneNo breakpoints or watchpoints.\r\n\r\n$mi_gdb_prompt$" {warning "Unexpected console text received"}
         -re "$mi_gdb_prompt$" { perror "Breakpoints not deleted" ; return }
         -re "Delete all breakpoints.*or n.*$" {