From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8665 invoked by alias); 31 Aug 2004 04:17:50 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 8599 invoked from network); 31 Aug 2004 04:17:36 -0000 Received: from unknown (HELO smtp10.atl.mindspring.net) (207.69.200.246) by sourceware.org with SMTP; 31 Aug 2004 04:17:36 -0000 Received: from user-119a90a.biz.mindspring.com ([66.149.36.10] helo=berman.michael-chastain.com) by smtp10.atl.mindspring.net with esmtp (Exim 3.33 #1) id 1C205P-0003QK-00 for gdb-patches@sources.redhat.com; Tue, 31 Aug 2004 00:17:35 -0400 Received: from mindspring.com (localhost [127.0.0.1]) by berman.michael-chastain.com (Postfix) with SMTP id E495C4B102 for ; Tue, 31 Aug 2004 00:17:56 -0400 (EDT) Date: Tue, 31 Aug 2004 04:17:00 -0000 From: Michael Chastain To: gdb-patches@sources.redhat.com Subject: [patch/testsuite] sigstep.exp: exp_continue -continue_timer Message-ID: <4133FBF3.nailGUJ11HSLW@mindspring.com> User-Agent: nail 10.8 6/28/04 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-SW-Source: 2004-08/txt/msg00779.txt.bz2 [Unusual hour for me to post, sigh] This patch changes "exp_continue" to "exp_continue -continue_timer". "-continue_timer" means that the existing timer on "expect" continues to run, rather than reset. So if there is an exp_continue loop, the test script will bust out after the normal timeout rather than going into an infinite loop. This actually happens with sigstep.exp on the drow intercu branch. More generally, I think it's a good idea to do this for most of our calls to "exp_continue". This is the first use of "-continue_timer" in the test suite so it might run into a land mine. I tested with both the stock released versions of tcl+expect+dejagnu and the sourceware version of tcl+expect+dejagnu, which has an "expect" from 1998-06-15. Tested on: native i686-pc-linux-gnu, red hat 8.0, gdb 6.2, gdb HEAD, gdb drow_intercu-20040221-branch. various compilers and debug formats tcl 8.4.6 + expect 5.41 + dejagnu 1.4.4 native i686-pc-linux-gnu, red hat 8.0, gdb 6.2, gdb HEAD, gdb drow_intercu-20040221-branch. various compilers and debug formats sourceware tcl+expect+dejagnu native hppa2.0w-hp-hpux11.11 hp ansi c B.11.11.28706.gp tcl 8.4.6 + expect 5.41 + dejagnu 1.4.4 I'll give this 48 hours for comments and then commit it. Then I'll give it at last a week for field testing before I add any more "-continue_timer". === 2004-08-30 Michael Chastain * gdb.base/sigstep.exp (advance): Use "-continue_timer" option of "exp_continue". (advancei): Likewise. Index: gdb.base/sigstep.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/sigstep.exp,v retrieving revision 1.6 diff -c -3 -p -r1.6 sigstep.exp *** gdb.base/sigstep.exp 30 Aug 2004 16:59:45 -0000 1.6 --- gdb.base/sigstep.exp 30 Aug 2004 18:18:32 -0000 *************** proc advance { i } { *** 81,91 **** gdb_test_multiple "$i" "${test}" { -re "done = 1;.*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue } -re "\} .. handler .*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue } -re "Program exited normally.*${gdb_prompt} $" { setup_kfail powerpc-*-*bsd* gdb/1639 --- 81,91 ---- gdb_test_multiple "$i" "${test}" { -re "done = 1;.*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue -continue_timer } -re "\} .. handler .*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue -continue_timer } -re "Program exited normally.*${gdb_prompt} $" { setup_kfail powerpc-*-*bsd* gdb/1639 *************** proc advancei { i } { *** 123,133 **** } -re "done = 1;.*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue } -re "\} .. handler .*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue } -re "signal handler called.*${gdb_prompt} $" { pass "$test" --- 123,133 ---- } -re "done = 1;.*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue -continue_timer } -re "\} .. handler .*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue -continue_timer } -re "signal handler called.*${gdb_prompt} $" { pass "$test" *************** proc advancei { i } { *** 141,147 **** } -re "Make handler return now.*y or n. $" { send_gdb "y\n" ! exp_continue } } --- 141,147 ---- } -re "Make handler return now.*y or n. $" { send_gdb "y\n" ! exp_continue -continue_timer } } *************** proc advancei { i } { *** 152,165 **** } -re "signal handler called.*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue } -re "return .*${gdb_prompt} $" { fail "$test (stepped)" } -re "Make .*frame return now.*y or n. $" { send_gdb "y\n" ! exp_continue } -re "Program exited normally.*${gdb_prompt} $" { kfail gdb/1639 "$test (program exited)" --- 152,165 ---- } -re "signal handler called.*${gdb_prompt} $" { send_gdb "$i\n" ! exp_continue -continue_timer } -re "return .*${gdb_prompt} $" { fail "$test (stepped)" } -re "Make .*frame return now.*y or n. $" { send_gdb "y\n" ! exp_continue -continue_timer } -re "Program exited normally.*${gdb_prompt} $" { kfail gdb/1639 "$test (program exited)"