From patchwork Fri Dec 5 18:34:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 4088 Received: (qmail 1496 invoked by alias); 5 Dec 2014 18:34:33 -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 1487 invoked by uid 89); 5 Dec 2014 18:34:32 -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, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg21.ericsson.net Received: from usevmg21.ericsson.net (HELO usevmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 05 Dec 2014 18:34:30 +0000 Received: from EUSAAHC002.ericsson.se (Unknown_Domain [147.117.188.78]) by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id 4C.5C.25146.36E91845; Fri, 5 Dec 2014 13:00:35 +0100 (CET) Received: from [142.133.110.254] (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.78) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 5 Dec 2014 13:34:27 -0500 Message-ID: <5481FAB2.9070105@ericsson.com> Date: Fri, 5 Dec 2014 13:34:26 -0500 From: Simon Marchi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Pedro Alves , Subject: Re: [PATCH v5] Introduce target_is_gdbserver (was: v4) References: <1411485577-25675-1-git-send-email-simon.marchi@ericsson.com> <5480912B.5090702@redhat.com> In-Reply-To: <5480912B.5090702@redhat.com> X-IsSubscribed: yes On 2014-12-04 11:51 AM, Pedro Alves wrote: > On 09/23/2014 04:19 PM, 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. > > "function". Or, "procedure". Done. >> 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 > > I don't think gdbserver-support.exp is always loaded on all > targets? By putting the procedure here, ISTM that non-GDBserver > testing will ERROR when the procedure is called? Damn, you are right (again). I moved it to gdb.exp in the updated patch below. >> @@ -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. > > s/gdbserver/our GDBserver/ > > Double space after period. Done. >> + >> +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 > > Indentation doesn't look right here. Should be one tab + 4 spaces? Right, done. >> + } >> + -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 >> +} > > > Thanks, > Pedro Alves > Here is the updated patch. From 918e76a8e4dfff49c89a8d69d6cc332e990dd4dc Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 23 Sep 2014 11:19:37 -0400 Subject: [PATCH v5] Introduce target_is_gdbserver 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 v5: * Move target_is_gdbserver to gdb.exp. * Fix formatting and typos. gdb/testsuite/ChangeLog: * gdb.trace/qtro.exp: Replace gdbserver detection code by... * lib/gdb.exp (target_is_gdbserver): New procedure. --- gdb/testsuite/gdb.trace/qtro.exp | 13 +------------ gdb/testsuite/lib/gdb.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/gdb.exp b/gdb/testsuite/lib/gdb.exp index a29b661..b420e00 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5004,5 +5004,30 @@ proc capture_command_output { command prefix } { return $output_string } +# Return 1 if the current remote target is an instance of our 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 +} + # Always load compatibility stuff. load_lib future.exp