From 76ff342d252acc41e28986a6d6e5f96a8ce3adf5 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Wed, 18 May 2005 03:41:59 +0000 Subject: 2005-05-17 Daniel Jacobowitz Dennis Brueni gdb/ * stack.c (print_frame): In MI mode, output a fullname attribute with the stack frame. gdb/doc/ * gdb.texinfo (GDB/MI Breakpoint Table Commands) (GDB/MI Data Manipulation, GDB/MI Program Control) (GDB/MI Stack Manipulation): Update examples to include the fullname attribute in stack frames. gdb/testsuite/ * gdb.mi/mi-cli.exp, gdb.mi/mi-return.exp, gdb.mi/mi-stack.exp, gdb.mi/mi-stepi.exp, gdb.mi/mi-syn-frame.exp, gdb.mi/mi-until.exp, gdb.mi/mi-var-display.exp, gdb.mi/mi-watch.exp, gdb.mi/mi2-cli.exp, gdb.mi/mi2-return.exp, gdb.mi/mi2-stack.exp, gdb.mi/mi2-syn-frame.exp, gdb.mi/mi2-until.exp, gdb.mi/mi2-var-display.exp: Expect fullname field in stack frames. * lib/mi-support.exp (mi_runto, mi_execute_to_helper): Likewise. --- gdb/testsuite/lib/mi-support.exp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gdb/testsuite/lib/mi-support.exp') diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index a8d2942..c03c3cc 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -799,7 +799,7 @@ proc mi_runto {func} { } global mi_gdb_prompt expect_out - global hex decimal + global hex decimal fullname_syntax set test "mi runto $func" mi_gdb_test "200-break-insert $func" \ @@ -813,7 +813,7 @@ proc mi_runto {func} { mi_run_cmd gdb_expect { - -re ".*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"$bkptno\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=\(\\\[.*\\\]\|\{.*\}\),file=\".*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" { + -re ".*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"$bkptno\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=\(\\\[.*\\\]\|\{.*\}\),file=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" { pass "$test" return 0 } @@ -857,13 +857,14 @@ proc mi_execute_to_helper { cmd reason func args file line extra test } { global mi_gdb_prompt global hex global decimal + global fullname_syntax 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\",fullname=\"${fullname_syntax}$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=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}.*\r\n$mi_gdb_prompt$" { fail "$test (stopped at wrong place)" return -1 } -- cgit v1.1