aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.mi/mi2-cli.exp
diff options
context:
space:
mode:
authorMichael Chastain <mec@google.com>2004-08-15 10:15:58 +0000
committerMichael Chastain <mec@google.com>2004-08-15 10:15:58 +0000
commit45f07fef904eaea82751dab3fca4fd15fc4b1302 (patch)
tree75f8e12d5d1e278ef1c332f986c4be7887fd5e87 /gdb/testsuite/gdb.mi/mi2-cli.exp
parenta6ed5501f78250d70d1ced106927e4fcc2eb95c9 (diff)
downloadgdb-45f07fef904eaea82751dab3fca4fd15fc4b1302.zip
gdb-45f07fef904eaea82751dab3fca4fd15fc4b1302.tar.gz
gdb-45f07fef904eaea82751dab3fca4fd15fc4b1302.tar.bz2
2004-08-15 Michael Chastain <mec.gnu@mindspring.com>
* gdb.mi/mi-cli.exp: Use gdb_get_line_number. Remove reference to bug-gnu@prep.ai.mit.edu. * gdb.mi/mi-disassemble.exp: Likewise. * gdb.mi/mi-eval.exp: Likewise. * gdb.mi/mi-file.exp: Likewise. Also, add comment about the default line number. * gdb.mi/mi-return.exp: Likewise. * gdb.mi/mi-simplerun.exp: Likewise. * gdb.mi/mi-stack.exp: Likewise. * gdb.mi/mi-stepi.exp: Likewise. Also, replace wildcarded line number with explicit range test. * gdb.mi/mi-watch.exp: Likewise. * gdb.mi/mi2-break.exp: Likewise. * gdb.mi/mi2-cli.exp: Likewise. * gdb.mi/mi2-disassemble.exp: Likewise. * gdb.mi/mi2-eval.exp: Likewise. * gdb.mi/mi2-file.exp: Likewise. Also, add comment about the default line number. * gdb.mi/mi2-return.exp: Likewise. * gdb.mi/mi2-simplerun.exp: Likewise. * gdb.mi/mi2-stack.exp: Likewise. * gdb.mi/mi2-stepi.exp: Likewise. Also, replace wildcarded line number with explicit range test. * gdb.mi/mi2-watch.exp: Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.mi/mi2-cli.exp')
-rw-r--r--gdb/testsuite/gdb.mi/mi2-cli.exp45
1 files changed, 24 insertions, 21 deletions
diff --git a/gdb/testsuite/gdb.mi/mi2-cli.exp b/gdb/testsuite/gdb.mi/mi2-cli.exp
index 10295a9..3a0793d 100644
--- a/gdb/testsuite/gdb.mi/mi2-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi2-cli.exp
@@ -1,4 +1,4 @@
-# Copyright 2002, 2003 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,9 +14,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
# This file tests that GDB's console can be accessed via the MI.
# Specifically, we are testing the "interpreter-exec" command and that
# the commands that are executed via this command are properly executed.
@@ -67,6 +64,11 @@ mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
mi_run_to_main
+set line_main_head [gdb_get_line_number "main ("]
+set line_main_body [expr $line_main_head + 2]
+set line_main_hello [gdb_get_line_number "Hello, World!"]
+set line_main_return [expr $line_main_hello + 2]
+
mi_gdb_test "-interpreter-exec console \"set args foobar\"" \
{\^done} \
"-interpreter-exec console \"set args foobar\""
@@ -91,8 +93,9 @@ mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \
{\^done} \
"-interpreter-exec console \"set listsize 1\""
+# {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done }
mi_gdb_test "-interpreter-exec console \"list\"" \
- {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done} \
+ ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
"-interpreter-exec console \"list\""
# # NOTE: cagney/2003-02-03: Not yet.
@@ -150,43 +153,43 @@ mi_gdb_test "500-stack-select-frame 0" \
"-stack-select-frame 0"
# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-break-insert -t basics.c:35" \
+# mi_gdb_test "-break-insert -t basics.c:$line_main_hello" \
# {.*=breakpoint-create,number="3".*\^done} \
-# "-break-insert -t basics.c:35"
-mi_gdb_test "600-break-insert -t basics.c:35" \
+# "-break-insert -t basics.c:\$line_main_hello"
+mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
{600\^done,bkpt=.number="3",type="breakpoint".*\}} \
- "-break-insert -t basics.c:35"
+ "-break-insert -t basics.c:\$line_main_hello"
# mi_gdb_test "-exec-continue" \
-# {.*\*stopped.*,file=".*basics.c",line="35"\}} \
-# "-exec-continue to line 35"
+# {.*\*stopped.*,file=".*basics.c",line="$line_main_hello"\}} \
+# "-exec-continue to line \$line_main_hello"
send_gdb "700-exec-continue\n"
gdb_expect {
- -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=.*basics.c.,line=.35.*$mi_gdb_prompt$" {
- pass "-exec-continue to line 35"
+ -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=.*basics.c.,line=.$line_main_hello.*$mi_gdb_prompt$" {
+ pass "-exec-continue to line \$line_main_hello"
}
timeout {
- fail "-exec-continue to line 35"
+ fail "-exec-continue to line \$line_main_hello"
}
}
# NOTE: cagney/2003-02-03: Not yet.
# mi_gdb_test "-exec-next" \
-# {.*\*stopped,reason="end-stepping-range",.*,file=".*basics.c",line="37"\}} \
-# "-exec-next to line 37"
+# {.*\*stopped,reason="end-stepping-range",.*,file=".*basics.c",line="$line_main_return"\}} \
+# "-exec-next to line \$line_main_return"
send_gdb "800-exec-next\n"
gdb_expect {
- -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=.end-stepping-range.*,file=.*basics.c.,line=.37.*$mi_gdb_prompt$" {
- pass "-exec-next to line 37"
+ -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=.end-stepping-range.*,file=.*basics.c.,line=.$line_main_return.*$mi_gdb_prompt$" {
+ pass "-exec-next to line \$line_main_return"
}
timeout {
- fail "-exec-next to line 37"
+ fail "-exec-next to line \$line_main_return"
}
}
mi_gdb_test "-interpreter-exec console \"list\"" \
- {\~"37[ \t(\\t)]*return 0;\\n".*\^done} \
- "-interpreter-exec console \"list\" at basics.c:37"
+ "\~\"$line_main_return\[\\\\t ]*return 0;\\\\n\".*\\^done" \
+ "-interpreter-exec console \"list\" at basics.c:\$line_main_return"
mi_gdb_test "-interpreter-exec console \"help set args\"" \
{\~"Set argument list to give program being debugged when it is started\.\\nFollow this command with any number of args, to be passed to the program\.".*\^done} \