From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30583 invoked by alias); 10 Aug 2006 15:21:10 -0000 Received: (qmail 30574 invoked by uid 22791); 10 Aug 2006 15:21:09 -0000 X-Spam-Check-By: sourceware.org Received: from fra-del-03.spheriq.net (HELO fra-del-03.spheriq.net) (195.46.51.99) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 10 Aug 2006 15:21:05 +0000 Received: from fra-out-03.spheriq.net (fra-out-03.spheriq.net [195.46.51.131]) by fra-del-03.spheriq.net with ESMTP id k7AFL0TY019839 for ; Thu, 10 Aug 2006 15:21:00 GMT Received: from fra-cus-01.spheriq.net (fra-cus-01.spheriq.net [195.46.51.37]) by fra-out-03.spheriq.net with ESMTP id k7AFKxCG013045 for ; Thu, 10 Aug 2006 15:20:59 GMT Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by fra-cus-01.spheriq.net with ESMTP id k7AFKvGh013382 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK) for ; Thu, 10 Aug 2006 15:20:58 GMT Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6C17CDA42 for ; Thu, 10 Aug 2006 15:20:57 +0000 (GMT) Received: from mail1.bri.st.com (mail1.bri.st.com [164.129.8.218]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 2AA2F475C5 for ; Thu, 10 Aug 2006 15:20:57 +0000 (GMT) Received: from [164.129.15.13] (bri1043.bri.st.com [164.129.15.13]) by mail1.bri.st.com (MOS 3.5.8-GR) with ESMTP id CHW93641 (AUTH stubbsa); Thu, 10 Aug 2006 16:20:55 +0100 (BST) Message-ID: <44DB4ED7.2030004@st.com> Date: Thu, 10 Aug 2006 16:16:00 -0000 From: Andrew STUBBS User-Agent: Thunderbird 1.5.0.5 (Windows/20060719) MIME-Version: 1.0 To: GDB Patches Subject: Re: [PATCH] Command trace testsuite References: <44D772B2.5090301@st.com> <20060808173357.GA24191@nevyn.them.org> In-Reply-To: <20060808173357.GA24191@nevyn.them.org> Content-Type: multipart/mixed; boundary="------------030406050301010005070407" X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-08/txt/msg00080.txt.bz2 This is a multi-part message in MIME format. --------------030406050301010005070407 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 300 Daniel Jacobowitz wrote: > For this sort of test, there's gdb_expect_list. The nice thing about > that is that it will tell you where there's a problem on errors (and > not generate thousand-character lines). Could you give that a try? Thanks! That's much better. How about the attached? Andrew --------------030406050301010005070407 Content-Type: text/plain; name="commandtrace-test.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="commandtrace-test.patch" Content-length: 5104 2006-08-10 Andrew Stubbs gdb/ * cli/cli-script.c (execute_user_command): Update command_next_depth on user-command call. gdb/testsuite * gdb.base/trace-commands.exp: New file. Index: src/gdb/testsuite/gdb.base/trace-commands.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ src/gdb/testsuite/gdb.base/trace-commands.exp 2006-08-10 16:15:29.000000000 +0100 @@ -0,0 +1,129 @@ +# Copyright 2006 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Test that the source command's verbose mode works, the 'set trace-commands' +# command works, and that the nest depth is correct in various circumstances. + +if $tracelevel then { + strace $tracelevel +} + +gdb_exit +gdb_start + +# Create a file to source +set fd [open "tracecommandsscript" w] +puts $fd "\ +echo in tracecommandsscript\\n +define func + echo in func \$arg0\\n +end +if 1 + if 2 + if 3 + if 4 + echo deep\\n + func 999 + end + end + end +end +" +close $fd + +# Make sure that the show trace-commands exists and the default is 'off'. +gdb_test "show trace-commands" "State of GDB CLI command tracing is off\\." \ + "show trace-commands says off" + +# Source the script with verbose mode. +send_gdb "source -v tracecommandsscript\n" +gdb_expect_list "source -v" ".*$gdb_prompt $" { + {[\r\n]\+echo in tracecommandsscript\\n} + {[\r\n]\+define func} + {[\r\n]\+if 1} + {[\r\n]\+\+if 2} + {[\r\n]\+\+\+if 3} + {[\r\n]\+\+\+\+if 4} + {[\r\n]\+\+\+\+\+echo deep\\n} + {[\r\n]\+\+\+\+\+func 999} + {[\r\n]\+\+\+\+\+\+echo in func 999\\n} +} + +# Turn on command tracing. +gdb_test "set trace-commands" "" "set trace-commands" + +# Make sure show trace-commands now gives 'on'. +gdb_test "show trace-commands" \ + {\+show trace-commands[\r\n]+State of GDB CLI command tracing is on\.} \ + "show trace-commands says on" + +# Simple test +gdb_test "echo hi\\n" {\+echo hi\\n[\r\n]+hi} "simple trace-commands test" + +# Nested test +send_gdb "if 1\nset \$i = 0\nwhile \$i < 5\nfunc \$i\nset \$i += 1\nend\nend\n" +gdb_expect_list "nested trace-commands test" ".*$gdb_prompt $" { + {[\r\n]\+if 1} + {[\r\n]\+\+set \$i = 0} + {[\r\n]\+\+while \$i < 5} + {[\r\n]\+\+\+func \$i} + {[\r\n]\+\+\+\+echo in func \$i\\n} + {[\r\n]\+\+\+set \$i \+= 1} + {[\r\n]\+\+\+func \$i} + {[\r\n]\+\+\+\+echo in func \$i\\n} + {[\r\n]\+\+\+set \$i \+= 1} + {[\r\n]\+\+\+func \$i} + {[\r\n]\+\+\+\+echo in func \$i\\n} + {[\r\n]\+\+\+set \$i \+= 1} + {[\r\n]\+\+\+func \$i} + {[\r\n]\+\+\+\+echo in func \$i\\n} + {[\r\n]\+\+\+set \$i \+= 1} + {[\r\n]\+\+\+func \$i} + {[\r\n]\+\+\+\+echo in func \$i\\n} + {[\r\n]\+\+\+set \$i \+= 1} +} + +# Function with source works +send_gdb "define topfunc\nsource tracecommandsscript\nend\n" +gdb_expect_list "define user command" ".*$gdb_prompt $" { + {[\r\n]\+define topfunc} +} +send_gdb "topfunc\n" +gdb_expect_list "nested trace-commands test with source" ".*$gdb_prompt $" { + {[\r\n]\+topfunc} + {[\r\n]\+\+source tracecommandsscript} + {[\r\n]\+\+echo in tracecommandsscript\\n} + {[\r\n]\+\+define func} + {[\r\n]\+\+if 1} + {[\r\n]\+\+\+if 2} + {[\r\n]\+\+\+\+if 3} + {[\r\n]\+\+\+\+\+if 4} + {[\r\n]\+\+\+\+\+\+echo deep\\n} + {[\r\n]\+\+\+\+\+\+func 999} + {[\r\n]\+\+\+\+\+\+\+echo in func 999\\n} +} + +# Test nest depth resets properly on error +send_gdb "if 1\nif 2\nload\necho should not get here\\n\nend\nend\n" +gdb_expect_list "depth resets on error part 1" ".*$gdb_prompt $" { + {[\r\n]\+if 1} + {[\r\n]\+\+if 2} + {[\r\n]\+\+\+load} + {[\r\n]No executable file specified\.} + {[\r\n]Use the "file" or "exec-file" command\.} +} +gdb_test "echo hi\\n" {[\r\n]\+echo hi\\n[\r\n]+hi} \ + "depth resets on error part 2" Index: src/gdb/cli/cli-script.c =================================================================== --- src.orig/gdb/cli/cli-script.c 2006-08-07 16:07:55.000000000 +0100 +++ src/gdb/cli/cli-script.c 2006-08-07 17:10:03.000000000 +0100 @@ -286,6 +286,7 @@ execute_user_command (struct cmd_list_el not confused with Insight. */ in_user_command = 1; + command_nest_depth++; while (cmdlines) { ret = execute_control_command (cmdlines); @@ -296,6 +297,7 @@ execute_user_command (struct cmd_list_el } cmdlines = cmdlines->next; } + command_nest_depth--; do_cleanups (old_chain); } --------------030406050301010005070407--