From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25048 invoked by alias); 12 Mar 2010 21:11:23 -0000 Received: (qmail 25040 invoked by uid 22791); 12 Mar 2010 21:11:22 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 12 Mar 2010 21:11:14 +0000 Received: (qmail 29055 invoked from network); 12 Mar 2010 21:11:13 -0000 Received: from unknown (HELO orlando.localnet) (pedro@127.0.0.2) by mail.codesourcery.com with ESMTPA; 12 Mar 2010 21:11:13 -0000 From: Pedro Alves To: gdb-patches@sourceware.org Subject: Re: allow gdb_test_multiple { -timeout n } Date: Fri, 12 Mar 2010 21:11:00 -0000 User-Agent: KMail/1.12.2 (Linux/2.6.31-19-generic; KDE/4.3.2; x86_64; ; ) References: <201003122109.02279.pedro@codesourcery.com> In-Reply-To: <201003122109.02279.pedro@codesourcery.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201003122111.11222.pedro@codesourcery.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-03/txt/msg00478.txt.bz2 On Friday 12 March 2010 21:09:02, Pedro Alves wrote: > I've applied this patch of Daniel's. It tweaks gdb_test_multiple > to be able to forward expect a -timeout switch. E.g., > instead of: > > set prev_timeout $timeout > set timeout 10 > > gdb_test_multiple "" "" { > -re "$gdb_prompt $" { } > } > > set timeout $prev_timeout > > you can simply do: > > gdb_test_multiple "" "" { > -timeout 10 > -re "$gdb_prompt $" { } > } This patch. -- Pedro Alves 2010-03-12 Daniel Jacobowitz * lib/gdb.exp (gdb_test_multiple): Handle -timeout. --- gdb/testsuite/lib/gdb.exp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) Index: src/gdb/testsuite/lib/gdb.exp =================================================================== --- src.orig/gdb/testsuite/lib/gdb.exp 2010-03-12 19:13:56.000000000 +0000 +++ src/gdb/testsuite/lib/gdb.exp 2010-03-12 20:57:56.000000000 +0000 @@ -601,12 +601,23 @@ proc gdb_test_multiple { command message set processed_code "" set patterns "" set expecting_action 0 + set expecting_arg 0 foreach item $user_code subst_item $subst_code { if { $item == "-n" || $item == "-notransfer" || $item == "-nocase" } { lappend processed_code $item continue } - if {$item == "-indices" || $item == "-re" || $item == "-ex"} { + if { $item == "-indices" || $item == "-re" || $item == "-ex" } { + lappend processed_code $item + continue + } + if { $item == "-timeout" } { + set expecting_arg 1 + lappend processed_code $item + continue + } + if { $expecting_arg } { + set expecting_arg 0 lappend processed_code $item continue }