From patchwork Fri Nov 7 01:01:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 3601 Received: (qmail 3865 invoked by alias); 7 Nov 2014 01:02:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 3850 invoked by uid 89); 7 Nov 2014 01:02:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pd0-f172.google.com Received: from mail-pd0-f172.google.com (HELO mail-pd0-f172.google.com) (209.85.192.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 07 Nov 2014 01:02:46 +0000 Received: by mail-pd0-f172.google.com with SMTP id r10so2219377pdi.17 for ; Thu, 06 Nov 2014 17:02:45 -0800 (PST) X-Received: by 10.70.129.209 with SMTP id ny17mr5583506pdb.163.1415322164946; Thu, 06 Nov 2014 17:02:44 -0800 (PST) Received: from seba.sebabeach.org.gmail.com (173-13-178-53-sfba.hfc.comcastbusiness.net. [173.13.178.53]) by mx.google.com with ESMTPSA id wa3sm7057065pac.18.2014.11.06.17.02.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Nov 2014 17:02:44 -0800 (PST) From: Doug Evans To: gdb-patches@sourceware.org Subject: [PATCH] Allow board file to specify remotetimeout Date: Thu, 06 Nov 2014 17:01:53 -0800 Message-ID: MIME-Version: 1.0 X-IsSubscribed: yes Hi. I was cross-testing from linux to windows7 with stdio gdbserver, and ssh was taking longer to connect than the default remotetimeout of 2 seconds. This patch adds the ability to specify remotetimeout in the board file. For reference sake, here's my board file. ---snip--- # To use this file: # bash$ cd ${build_dir}/gdb # bash$ make check RUNTESTFLAGS="--target_board=win7" # # gdbserver running over ssh. set REMOTE_HOSTNAME win7 set REMOTE_USERNAME dje set REMOTE_PORTNUM 22 set REMOTE_TMPDIR /tmp load_board_description "remote-stdio-gdbserver" # Path to the gdbserver executable. unset_board_info gdb_server_prog set_board_info gdb_server_prog "/usr/bin/gdbserver.exe" # It takes a few seconds to establish the ssh session. set_board_info gdb,remotetimeout 15 ---snip--- 2014-11-06 Doug Evans * README: Document gdb,remotetimeout. * lib/gdbserver-support.exp (gdb_target_cmd): Apply remotetimeout if specified in board description. * lib/mi-support.exp (mi_gdb_target_cmd): Ditto. diff --git a/gdb/testsuite/README b/gdb/testsuite/README index 9a5059a..0e4b73c 100644 --- a/gdb/testsuite/README +++ b/gdb/testsuite/README @@ -367,6 +367,10 @@ gdb,predefined_tsv The predefined trace state variables the board has. +gdb,remotetimeout + + The value for gdb's "remotetimeout" parameter, for use with gdbserver. + Testsuite Organization ********************** diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 026a937..b99a594 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -39,6 +39,8 @@ # After GDB starts you should check global $gdbserver_gdbport for the # real port used. It is not useful if $gdbserver_reconnect_p was not set. # +# set_board_info gdb,remotetimeout +# The value for gdb's "remotetimeout" parameter. # # gdb_target_cmd @@ -47,6 +49,11 @@ proc gdb_target_cmd { targetname serialport } { global gdb_prompt + if [target_info exists gdb,remotetimeout] { + set remotetimeout [target_info gdb,remotetimeout] + gdb_test_no_output "set remotetimeout $remotetimeout" + } + set serialport_re [string_to_regexp $serialport] for {set i 1} {$i <= 3} {incr i} { send_gdb "target $targetname $serialport\n" diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index a7f7aef..0437fa5 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -335,6 +335,19 @@ proc mi_gdb_reinitialize_dir { subdir } { proc mi_gdb_target_cmd { targetname serialport } { global mi_gdb_prompt + if [target_info exists gdb,remotetimeout] { + set remotetimeout [target_info gdb,remotetimeout] + send_gdb "46-gdb-set remotetimeout $remotetimeout\n" + gdb_expect 10 { + -re ".*46-gdb-set remotetimeout $remotetimeout\r\n46\\\^done\r\n$mi_gdb_prompt$" { + verbose "Setting remotetimeout to $remotetimeout." 2 + } + timeout { + warning "Couldn't set remotetimeout to $remotetimeout." + } + } + } + set serialport_re [string_to_regexp $serialport] for {set i 1} {$i <= 3} {incr i} { send_gdb "47-target-select $targetname $serialport\n"