From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31428 invoked by alias); 10 Apr 2013 16:15:19 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 31410 invoked by uid 9514); 10 Apr 2013 16:15:19 -0000 Date: Wed, 10 Apr 2013 16:15:00 -0000 Message-ID: <20130410161519.31382.qmail@sourceware.org> From: pmuldoon@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] pmuldoon/python-backtrace: Add no debug info and multiple local scope tests X-Git-Refname: refs/heads/pmuldoon/python-backtrace X-Git-Reftype: branch X-Git-Oldrev: 93f20b0a91af2a011b3d9f8899688d2e20dedb42 X-Git-Newrev: 0cb454caccab3d459a8db960d65246391572695c X-SW-Source: 2013-q2/txt/msg00014.txt.bz2 List-Id: The branch, pmuldoon/python-backtrace has been updated via 0cb454caccab3d459a8db960d65246391572695c (commit) from 93f20b0a91af2a011b3d9f8899688d2e20dedb42 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 0cb454caccab3d459a8db960d65246391572695c Author: Phil Muldoon Date: Wed Apr 10 17:14:55 2013 +0100 Add no debug info and multiple local scope tests ----------------------------------------------------------------------- Summary of changes: gdb/testsuite/gdb.python/py-framefilter-mi.c | 18 ++++++++++++++++-- gdb/testsuite/gdb.python/py-framefilter-mi.exp | 18 ++++++++++++++---- gdb/testsuite/gdb.python/py-framefilter.c | 6 ++++-- gdb/testsuite/gdb.python/py-framefilter.exp | 10 ++++++++++ 4 files changed, 44 insertions(+), 8 deletions(-) First 500 lines of diff: diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.c b/gdb/testsuite/gdb.python/py-framefilter-mi.c index 9c6b161..21f79f1 100644 --- a/gdb/testsuite/gdb.python/py-framefilter-mi.c +++ b/gdb/testsuite/gdb.python/py-framefilter-mi.c @@ -1,6 +1,6 @@ /* This testcase is part of GDB, the GNU debugger. - Copyright 2008-2012 Free Software Foundation, Inc. + Copyright 2013 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 @@ -33,7 +33,21 @@ void end_func (int foo, char *bar, foobar *fb, foobar bf) const char *st2 = "Is Near"; int b = 12; short c = 5; - + { + int d = 15; + int e = 14; + const char *foo = "Inside block"; + { + int f = 42; + int g = 19; + const char *bar = "Inside block x2"; + { + short h = 9; + h = h +1; /* Inner test breakpoint */ + } + } + } + return; /* Backtrace end breakpoint */ } diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.exp b/gdb/testsuite/gdb.python/py-framefilter-mi.exp index 1daa62b..a36d42e 100644 --- a/gdb/testsuite/gdb.python/py-framefilter-mi.exp +++ b/gdb/testsuite/gdb.python/py-framefilter-mi.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2013 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 @@ -49,10 +49,22 @@ set remote_python_file [remote_download host ${srcdir}/${subdir}/${pyfile}] mi_gdb_test "python execfile ('${remote_python_file}')" "" +# Multiple blocks test +mi_continue_to_line [gdb_get_line_number {Inner test breakpoint} ${srcfile}] \ + "step to breakpoint" + +mi_gdb_test "-stack-list-locals --all-values" \ + "\\^done,locals=\\\[{name=\"h\",value=\"9\"},{name=\"f\",value=\"42\"},{name=\"g\",value=\"19\"},{name=\"bar\",value=\"$hex \\\\\"Inside block x2\\\\\"\"},{name=\"d\",value=\"15\"},{name=\"e\",value=\"14\"},{name=\"foo\",value=\"$hex \\\\\"Inside block\\\\\"\"},{name=\"str\",value=\"$hex \\\\\"The End\\\\\"\"},{name=\"st2\",value=\"$hex \\\\\"Is Near\\\\\"\"},{name=\"b\",value=\"12\"},{name=\"c\",value=\"5\"}\\\]" \ + "stack-list-locals --all-values" + +mi_gdb_test "-enable-frame-filters" "" +mi_gdb_test "-stack-list-locals --all-values" \ + "\\^done,locals=\\\[{name=\"h\",value=\"9\"},{name=\"f\",value=\"42\"},{name=\"g\",value=\"19\"},{name=\"bar\",value=\"$hex \\\\\"Inside block x2\\\\\"\"},{name=\"d\",value=\"15\"},{name=\"e\",value=\"14\"},{name=\"foo\",value=\"$hex \\\\\"Inside block\\\\\"\"},{name=\"str\",value=\"$hex \\\\\"The End\\\\\"\"},{name=\"st2\",value=\"$hex \\\\\"Is Near\\\\\"\"},{name=\"b\",value=\"12\"},{name=\"c\",value=\"5\"}\\\]" \ + "stack-list-locals --all-values" + mi_continue_to_line [gdb_get_line_number {Backtrace end breakpoint} ${srcfile}] \ "step to breakpoint" -mi_gdb_test "-stack-list-frames" "" mi_gdb_test "-enable-frame-filters" "" mi_gdb_test "-stack-list-frames" \ "\\^done,stack=\\\[frame={level=\"0\",addr=\"$hex\",func=\"cnuf_dne\".*},frame={level=\"1\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"2\",addr=\"$hex\",func=\"bcnuf\".*},frame={level=\"3\",addr=\"$hex\",func=\"acnuf\".*},frame={level=\"22\",addr=\"$hex\",func=\"1cnuf\".*,children=\\\[frame={level=\"23\",addr=\"$hex\",func=\"func2\".*}\\\]},frame={level=\"24\",addr=\"$hex\",func=\"3cnuf\".*},frame={level=\"27\",addr=\"$hex\",func=\"niam\".*}\\\].*" \ @@ -166,5 +178,3 @@ mi_gdb_test "-stack-list-variables --no-frame-filters 0" \ mi_gdb_test "-stack-list-variables 0" \ "\\^done,variables=\\\[{name=\"foo\",arg=\"1\"},{name=\"bar\",arg=\"1\"},{name=\"fb\",arg=\"1\"},{name=\"bf\",arg=\"1\"},{name=\"str\"},{name=\"st2\"},{name=\"b\"},{name=\"c\"}\\\]" \ "stack-list-variables 0" - -remote_file host delete ${remote_python_file} diff --git a/gdb/testsuite/gdb.python/py-framefilter.c b/gdb/testsuite/gdb.python/py-framefilter.c index be81415..5add087 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.c +++ b/gdb/testsuite/gdb.python/py-framefilter.c @@ -42,8 +42,10 @@ void end_func (int foo, char *bar, foobar *fb, foobar bf) int f = 42; int g = 19; const char *bar = "Inside block x2"; - - g = g +1; /* Inner test breakpoint */ + { + short h = 9; + h = h +1; /* Inner test breakpoint */ + } } } diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp index d7d3a48..44dcbe7 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.exp +++ b/gdb/testsuite/gdb.python/py-framefilter.exp @@ -59,6 +59,16 @@ set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}.py] gdb_test_no_output "python execfile ('${remote_python_file}')" gdb_breakpoint [gdb_get_line_number "Backtrace end breakpoint"] +gdb_breakpoint [gdb_get_line_number "Inner test breakpoint"] +gdb_continue_to_breakpoint "Inner test breakpoint" + +# Test multiple local blocks. +gdb_test "bt full no-filters" \ + ".*#0.*end_func.*h = 9.*f = 42.*g = 19.*bar = $hex \"Inside block x2\".*d = 15.*e = 14.*foo = $hex \"Inside block\".*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*" + +gdb_test "bt full" \ + ".*#0.*cnuf_dne.*h = 9.*f = 42.*g = 19.*bar = $hex \"Inside block x2\".*d = 15.*e = 14.*foo = $hex \"Inside block\".*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*" + gdb_continue_to_breakpoint "Backtrace end breakpoint" gdb_test "info frame-filter" \ hooks/post-receive -- Repository for Project Archer.