aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2008-04-30 18:25:53 +0000
committerDaniel Jacobowitz <drow@false.org>2008-04-30 18:25:53 +0000
commit6f3f3097b9cb8c986c4bbdd0eca212ff47945e9d (patch)
treefc34affaad785fe03e40d6b88a16d6cc072307a0 /gdb
parent939643d727a6988e89a4b521aa9b8bb898696eb6 (diff)
downloadgdb-6f3f3097b9cb8c986c4bbdd0eca212ff47945e9d.zip
gdb-6f3f3097b9cb8c986c4bbdd0eca212ff47945e9d.tar.gz
gdb-6f3f3097b9cb8c986c4bbdd0eca212ff47945e9d.tar.bz2
* gdb.base/gdb1250.exp: Remove perror.
* lib/mi-support.exp (mi_delete_breakpoints): Match the prompt.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/gdb1250.exp1
-rw-r--r--gdb/testsuite/lib/mi-support.exp2
3 files changed, 6 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 680d783..ff2cbbb 100644
--- 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 48c159e..744c277 100644
--- 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 1f4c3dd..9372dfc 100644
--- 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.*$" {