This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: [rfc/testsuite/mi] use gdb_get_line_number
Andrew Cagney <cagney@gnu.org> wrote:
> I suspect I deleted it :-(
No prob, here it is again. I haven't changed it since the last posting.
===
Old test names:
break-insert -t operation
insert temp breakpoint at basics.c:callee2
insert temp breakpoint at basics.c:15 (callee3)
insert temp breakpoint at "<fullfilename>":6 (callee4)
New test names:
break-insert -t operation
insert temp breakpoint at basics.c:callee2
insert temp breakpoint at basics.c:$line_callee3_body
insert temp breakpoint at "<fullfilename>":$line_callee4_head
That is a literal dollar sign in the last two test names,
so the test name is a constant string.
The line number variables are now named "line_foo_head"
and "line_foo_body".
Tweak away ... or give it the drastic treatment.
Not fully tested yet.
===
2004-08-11 Michael Chastain <mec.gnu@mindspring.com>
* gdb.mi/mi-break.exp: Use gdb_get_line_number.
Index: mi-break.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-break.exp,v
retrieving revision 1.6
diff -r1.6 mi-break.exp
1c1
< # Copyright 1999, 2001 Free Software Foundation, Inc.
---
> # Copyright 1999, 2001, 2004 Free Software Foundation, Inc.
17,19d16
< # Please email any bugs, comments, and/or additions to this file to:
< # bug-gdb@prep.ai.mit.edu
<
49a47,58
> # Locate line numbers in basics.c.
> set line_callee4_head [gdb_get_line_number "callee4 ("]
> set line_callee4_body [expr $line_callee4_head + 2]
> set line_callee3_head [gdb_get_line_number "callee3 ("]
> set line_callee3_body [expr $line_callee3_head + 2]
> set line_callee2_head [gdb_get_line_number "callee2 ("]
> set line_callee2_body [expr $line_callee2_head + 2]
> set line_callee1_head [gdb_get_line_number "callee1 ("]
> set line_callee1_body [expr $line_callee1_head + 2]
> set line_main_head [gdb_get_line_number "main ("]
> set line_main_body [expr $line_main_head + 2]
>
53a63,67
> global line_callee4_head line_callee4_body
> global line_callee3_head line_callee3_body
> global line_callee2_head line_callee2_body
> global line_callee1_head line_callee1_body
> global line_main_head line_main_body
60,61c74,75
< # -break-insert -t basics.c:15
< # -break-insert -t srcfile:6
---
> # -break-insert -t basics.c:$line_callee3_head
> # -break-insert -t srcfile:$line_callee4_head
65c79
< "222\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\}" \
---
> "222\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}" \
69c83
< "333\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee2\",file=\".*basics.c\",line=\"22\",times=\"0\"\}" \
---
> "333\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee2\",file=\".*basics.c\",line=\"$line_callee2_body\",times=\"0\"\}" \
72,79c86,93
< mi_gdb_test "444-break-insert -t basics.c:15" \
< "444\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"15\",times=\"0\"\}" \
< "insert temp breakpoint at basics.c:15 (callee3)"
<
< # Getting the quoting right is tricky. That is "\"<file>\":6"
< mi_gdb_test "555-break-insert -t \"\\\"${srcfile}\\\":6\"" \
< "555\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"6\",times=\"0\"\}" \
< "insert temp breakpoint at \"<fullfilename>\":6 (callee4)"
---
> mi_gdb_test "444-break-insert -t basics.c:$line_callee3_head" \
> "444\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_head\",times=\"0\"\}" \
> "insert temp breakpoint at basics.c:\$line_callee3_body"
>
> # Getting the quoting right is tricky. That is "\"<file>\":$line_callee4_head"
> mi_gdb_test "555-break-insert -t \"\\\"${srcfile}\\\":$line_callee4_head\"" \
> "555\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_head\",times=\"0\"\}" \
> "insert temp breakpoint at \"<fullfilename>\":\$line_callee4_head"
82c96
< "666\\\^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=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\}.*\\\]\}" \
---
> "666\\\^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=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}.*\\\]\}" \
93a108,112
> global line_callee4_head line_callee4_body
> global line_callee3_head line_callee3_body
> global line_callee2_head line_callee2_body
> global line_callee1_head line_callee1_body
> global line_main_head line_main_body
106c125
< "122\\^done,bkpt=\{number=\"5\",addr=\"$hex\",file=\".*basics.c\",line=\"32\"\}" \
---
> "122\\^done,bkpt=\{number=\"5\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_main_body\"\}" \
111c130
< "133\\^done,bkpt=\{number=\"6\",addr=\"$hex\",file=\".*basics.c\",line=\"22\"\}" \
---
> "133\\^done,bkpt=\{number=\"6\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\}" \
116c135
< "144\\^done,bkpt=\{number=\"7\",addr=\"$hex\",file=\".*basics.c\",line=\"27\"\},bkpt=\{number=\"8\",addr=\"$hex\",file=\".*basics.c\",line=\"22\"\},bkpt=\{number=\"9\",addr=\"$hex\",file=\".*basics.c\",line=\"17\"\},bkpt=\{number=\"10\",addr=\"$hex\",file=\".*basics.c\",line=\"8\"\}" \
---
> "144\\^done,bkpt=\{number=\"7\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee1_body\"\},bkpt=\{number=\"8\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\},bkpt=\{number=\"9\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee3_body\"\},bkpt=\{number=\"10\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee4_body\"\}" \
121c140
< "155\\^done,bkpt=\{number=\"11\",addr=\"$hex\",file=\".*basics.c\",line=\"27\"\},bkpt=\{number=\"12\",addr=\"$hex\",file=\".*basics.c\",line=\"22\"\},bkpt=\{number=\"13\",addr=\"$hex\",file=\".*basics.c\",line=\"17\"\},bkpt=\{number=\"14\",addr=\"$hex\",file=\".*basics.c\",line=\"8\"\}" \
---
> "155\\^done,bkpt=\{number=\"11\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee1_body\"\},bkpt=\{number=\"12\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\},bkpt=\{number=\"13\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee3_body\"\},bkpt=\{number=\"14\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee4_body\"\}" \
126c145
< "1\\\^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=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"32\",times=\"0\"\},.*\}\\\]\}" \
---
> "1\\\^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=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\]\}" \