From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30146 invoked by alias); 2 Oct 2014 17:54:34 -0000 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 Received: (qmail 30136 invoked by uid 89); 2 Oct 2014 17:54:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 02 Oct 2014 17:54:32 +0000 Received: from EUSAAHC004.ericsson.se (Unknown_Domain [147.117.188.84]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 8B.DD.05330.5BA3D245; Thu, 2 Oct 2014 13:44:53 +0200 (CEST) Received: from [142.133.110.254] (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.84) with Microsoft SMTP Server (TLS) id 14.3.174.1; Thu, 2 Oct 2014 13:54:29 -0400 Message-ID: <542D9154.3050007@ericsson.com> Date: Thu, 02 Oct 2014 17:54:00 -0000 From: Simon Marchi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.1.2 MIME-Version: 1.0 To: GDB Patches Subject: Re: [PATCH v4] Introduce target_is_gdbserver References: <1411485577-25675-1-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1411485577-25675-1-git-send-email-simon.marchi@ericsson.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2014-10/txt/msg00038.txt.bz2 On 2014-09-23 11:19 AM, Simon Marchi wrote: > This patch introduces a function in gdbserver-support.exp to find out > whether the current target is GDBserver. > > The code was inspired from gdb.trace/qtro.exp, so it replaces the code > there by a call to the new function. > > New in v4: > - Return -1 on error, and check for -1 in qtro.exp. > - Use gdb_caching_proc to cache result. > > gdb/testsuite/ChangeLog: > > * gdb.trace/qtro.exp: Replace gdbserver detection code by... > * lib/gdbserver-support.exp (target_is_gdbserver): New > fonction. > --- > gdb/testsuite/gdb.trace/qtro.exp | 13 +------------ > gdb/testsuite/lib/gdbserver-support.exp | 25 +++++++++++++++++++++++++ > 2 files changed, 26 insertions(+), 12 deletions(-) > > diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp > index 22b5051..d8ffc40 100644 > --- a/gdb/testsuite/gdb.trace/qtro.exp > +++ b/gdb/testsuite/gdb.trace/qtro.exp > @@ -98,18 +98,7 @@ if { $traceframe_info_supported == -1 } { > } > > # Check whether we're testing with our own GDBserver. > -set is_gdbserver -1 > -set test "probe for GDBserver" > -gdb_test_multiple "monitor help" $test { > - -re "The following monitor commands are supported.*debug-hw-points.*remote-debug.*GDBserver.*$gdb_prompt $" { > - set is_gdbserver 1 > - pass $test > - } > - -re "$gdb_prompt $" { > - set is_gdbserver 0 > - pass $test > - } > -} > +set is_gdbserver [target_is_gdbserver] > if { $is_gdbserver == -1 } { > return -1 > } > diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp > index 026a937..e3f421e 100644 > --- a/gdb/testsuite/lib/gdbserver-support.exp > +++ b/gdb/testsuite/lib/gdbserver-support.exp > @@ -436,3 +436,28 @@ proc mi_gdbserver_start_multi { } { > > return [mi_gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport] > } > + > +# Return 1 if the current remote target is an instance of gdbserver, 0 > +# otherwise. Return -1 if there was an error and we can't tell. > + > +gdb_caching_proc target_is_gdbserver { > + global gdb_prompt > + > + set is_gdbserver -1 > + set test "Probing for GDBserver" > + > + gdb_test_multiple "monitor help" $test { > + -re "The following monitor commands are supported.*Quit GDBserver.*$gdb_prompt $" { > + set is_gdbserver 1 > + } > + -re "$gdb_prompt $" { > + set is_gdbserver 0 > + } > + } > + > + if { $is_gdbserver == -1 } { > + verbose -log "Unable to tell whether we are using gdbserver or not." > + } > + > + return $is_gdbserver > +} > Ping.