aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/lib
diff options
context:
space:
mode:
authorKeith Seitz <keiths@redhat.com>2002-09-10 22:07:58 +0000
committerKeith Seitz <keiths@redhat.com>2002-09-10 22:07:58 +0000
commitdc360f582a4fa2f21c5a847ccece58de75b0e2f7 (patch)
tree99921b8a9d03e23c6cfd84cdba8dbeb9e18ed6bf /gdb/testsuite/lib
parent77d8f2b47ef858ba7534d08097decc6826a53e65 (diff)
downloadgdb-dc360f582a4fa2f21c5a847ccece58de75b0e2f7.zip
gdb-dc360f582a4fa2f21c5a847ccece58de75b0e2f7.tar.gz
gdb-dc360f582a4fa2f21c5a847ccece58de75b0e2f7.tar.bz2
* 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.
Diffstat (limited to 'gdb/testsuite/lib')
-rw-r--r--gdb/testsuite/lib/mi-support.exp40
1 files changed, 6 insertions, 34 deletions
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 451dcea..650401a 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -656,46 +656,18 @@ proc mi_run_to_main { } {
# Next to the next statement
+# For return values, see mi_run_to_helper
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
- }
- }
+ return [mi_next_to {.*} {.*} {.*} {.*} $test]
}
# Step to the next statement
+# For return values, see mi_run_to_helper
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
- }
- }
+ return [mi_step_to {.*} {.*} {.*} {.*} $test]
}
# cmd should not include the number or newline (i.e. "exec-step 3", not
@@ -714,11 +686,11 @@ proc mi_run_to_helper { cmd reason func args file line extra test } {
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$" {
+ -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$" {
+ -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
}