From 6f3f3097b9cb8c986c4bbdd0eca212ff47945e9d Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Wed, 30 Apr 2008 18:25:53 +0000 Subject: [PATCH] * gdb.base/gdb1250.exp: Remove perror. * lib/mi-support.exp (mi_delete_breakpoints): Match the prompt. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/gdb1250.exp | 1 - gdb/testsuite/lib/mi-support.exp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 680d783be18..ff2cbbb4f1b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-04-30 Daniel Jacobowitz + + * gdb.base/gdb1250.exp: Remove perror. + * lib/mi-support.exp (mi_delete_breakpoints): Match the prompt. + 2008-04-30 Pedro Alves * 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 48c159e90ab..744c2773dcc 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 1f4c3dddbbb..9372dfc328e 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.*$" { -- 2.39.2