This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: [RFA/MI testsuite] mi_run_to_main/mi_next/mi_step
- From: Keith Seitz <keiths at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Tue, 10 Sep 2002 15:11:15 -0700 (PDT)
- Subject: Re: [RFA/MI testsuite] mi_run_to_main/mi_next/mi_step
On Tue, 10 Sep 2002, Elena Zannoni wrote:
> Yes. Thanks!
Committed. Thank you for reviewing this.
Keith
> > ChangeLog
> > 2002-09-10 Keith Seitz <keiths@redhat.com>
> >
> > * lib/mi-support.exp: (mi_run_to_main): Allow anything to precede
> > regexp for stopping at main. Could have multiple event notifications.
> > Don't assume that main was declared with no parameters.
> > (mi_next): Use mi_step_to.
> > (mi_step): Use mi_next_to.
> >
> > Index: testsuite/lib/mi-support.exp
> > ===================================================================
> > RCS file: /cvs/src/src/gdb/testsuite/lib/mi-support.exp,v
> > retrieving revision 1.15
> > diff -p -r1.15 mi-support.exp
> > *** testsuite/lib/mi-support.exp 4 Sep 2002 21:05:07 -0000 1.15
> > --- testsuite/lib/mi-support.exp 10 Sep 2002 14:54:55 -0000
> > *************** proc mi_run_to_main { } {
> > *** 656,701 ****
> >
> >
> > # Next to the next statement
> >
> > proc mi_next { test } {
> > ! global suppress_flag
> > ! if { $suppress_flag } {
> > ! return -1
> > ! }
> > ! global mi_gdb_prompt
> > ! send_gdb "220-exec-next\n"
> > ! gdb_expect {
> > ! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"end-stepping-range\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{].*[\\\]\}\],file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
> > ! pass "$test"
> > ! return 0
> > ! }
> > ! timeout {
> > ! fail "$test"
> > ! return -1
> > ! }
> > ! }
> > }
> >
> >
> > # Step to the next statement
> >
> > proc mi_step { test } {
> > ! global suppress_flag
> > ! if { $suppress_flag } {
> > ! return -1
> > ! }
> > ! global mi_gdb_prompt
> > ! send_gdb "220-exec-step\n"
> > ! gdb_expect {
> > ! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"end-stepping-range\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{\].*\[\\\]\}\],file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
> > ! pass "$test"
> > ! return 0
> > ! }
> > ! timeout {
> > ! fail "$test"
> > ! return -1
> > ! }
> > ! }
> > }
> >
> > # cmd should not include the number or newline (i.e. "exec-step 3", not
> > --- 656,673 ----
> >
> >
> > # Next to the next statement
> > + # For return values, see mi_run_to_helper
> >
> > proc mi_next { test } {
> > ! return [mi_next_to {.*} {.*} {.*} {.*} $test]
> > }
> >
> >
> > # Step to the next statement
> > + # For return values, see mi_run_to_helper
> >
> > proc mi_step { test } {
> > ! return [mi_step_to {.*} {.*} {.*} {.*} $test]
> > }
> >
> > # cmd should not include the number or newline (i.e. "exec-step 3", not
> > *************** proc mi_run_to_helper { cmd reason func
> > *** 714,724 ****
> > global decimal
> > send_gdb "220-$cmd\n"
> > gdb_expect {
> > ! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"$reason\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=$args,file=\".*$file\",line=\"$line\"\}$extra\r\n$mi_gdb_prompt$" {
> > pass "$test"
> > return 0
> > }
> > ! -re "220\\^running\r\n${mi_gdb_prompt}220\\*stopped,reason=\"$reason\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{\].*\[\\\]\}\],file=\".*\",line=\"\[0-9\]*\"\}.*\r\n$mi_gdb_prompt$" {
> > fail "$test (stopped at wrong place)"
> > return -1
> > }
> > --- 686,696 ----
> > global decimal
> > send_gdb "220-$cmd\n"
> > gdb_expect {
> > ! -re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=\"$reason\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=$args,file=\".*$file\",line=\"$line\"\}$extra\r\n$mi_gdb_prompt$" {
> > pass "$test"
> > return 0
> > }
> > ! -re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=\"$reason\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{\].*\[\\\]\}\],file=\".*\",line=\"\[0-9\]*\"\}.*\r\n$mi_gdb_prompt$" {
> > fail "$test (stopped at wrong place)"
> > return -1
> > }
>