From: Keith Seitz <keiths@redhat.com>
Date: Mon, 22 Jul 2002 22:01:56 +0000 (+0000)
Subject:         * lib/mi-support.exp (mi_delete_breakpoints): Allow for breakpoint
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcd162a5be3083da5db5f391196a50be97bc8007;p=thirdparty%2Fbinutils-gdb.git

    * lib/mi-support.exp (mi_delete_breakpoints): Allow for breakpoint
        delete events in output of -break-delete.
        (mi_run_to_main): Don't assume that breakpoint at main is first
        breakpoint installed.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c7c7fe72b9a..3ebfe1dc5ab 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-22  Keith Seitz  <keiths@redhat.com>
+
+	* lib/mi-support.exp (mi_delete_breakpoints): Allow for breakpoint
+	delete events in output of -break-delete.
+	(mi_run_to_main): Don't assume that breakpoint at main is first
+	breakpoint installed.
+
 2002-06-24  Keith Seitz  <keiths@redhat.com>
 
 	* lib/mi-support.exp (mi_gdb_test): Move expected pattern higher
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index c413f4a17c8..113c8b7d5ee 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -190,7 +190,7 @@ proc mi_delete_breakpoints {} {
 	    send_gdb "y\n";
 	    exp_continue
          }
-	 -re ".*102-break-delete\r\n102\\\^done\r\n$mi_gdb_prompt$" {
+	 -re ".*102-break-delete\r\n(=.*)*102\\\^done\r\n$mi_gdb_prompt$" {
             # This happens if there were no breakpoints
 	 }
 	 timeout { perror "Delete all breakpoints in delete_breakpoints (timeout)" ; return }
@@ -639,10 +639,10 @@ proc mi_run_to_main { } {
     scan $MIFLAGS "\-i=mi%d" version
     if {$version < 2} {
       # MI0 or MI1
-      set bp_result "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*\",line=\"\[0-9\]*\",times=\"0\"\}"
+	set bp_result "200\\^done,bkpt=\{number=\"\[0-9\]+\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*\",line=\"\[0-9\]*\",times=\"0\"\}"
     } else {
       # MI2+
-      set bp_result "=breakpoint-create,number=\"1\"\r\n200\\^done"
+	set bp_result "=breakpoint-create,number=\"\[0-9\]\"\r\n200\\^done"
     }
     mi_gdb_test "200-break-insert main" \
 	$bp_result \
@@ -650,7 +650,7 @@ proc mi_run_to_main { } {
 
     mi_run_cmd
     gdb_expect {
-	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"main\",args=\(\\\[\\\]\|\{\}\),file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
+	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"\[0-9\]+\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"main\",args=\(\\\[\\\]\|\{\}\),file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
 	    pass "$test"
 	    return 0
 	}