From patchwork Fri Apr 12 10:38:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 32268 Received: (qmail 59457 invoked by alias); 12 Apr 2019 10:38:53 -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 58758 invoked by uid 89); 12 Apr 2019 10:38:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, MIME_BASE64_BLANKS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=mq, Mq, uppercase, Couldnt X-HELO: EUR04-DB3-obe.outbound.protection.outlook.com Received: from mail-eopbgr60062.outbound.protection.outlook.com (HELO EUR04-DB3-obe.outbound.protection.outlook.com) (40.107.6.62) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 12 Apr 2019 10:38:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Kuv9EjLufTiqoC6P5WNWbnwSQvb7oiQ2BK8BVUtCR7Y=; b=gm1b9kjxTr8oFP/kr5w9PDLxPH5ZpDLMhZZD7+dCMoVuVFDFhSie0Sn0dX84R2ZcgvYHxnfmAWs0dhyB5BDx4GjoejwE6bo4eeBN1uOzEBEURxBoud6oFeceW3lQbDfAbcJkqHNjvOfQN4THR9dS5bRkhLzP6OP4RbTfW7qa9AA= Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com (10.172.227.22) by DB6PR0802MB2568.eurprd08.prod.outlook.com (10.172.250.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1771.15; Fri, 12 Apr 2019 10:38:47 +0000 Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::399b:3a32:bff9:827e]) by DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::399b:3a32:bff9:827e%10]) with mapi id 15.20.1771.016; Fri, 12 Apr 2019 10:38:47 +0000 From: Alan Hayward To: Pedro Alves CC: "gdb-patches@sourceware.org" , nd Subject: Re: [PATCH] Testsuite: Add gdbserver sysroot test Date: Fri, 12 Apr 2019 10:38:47 +0000 Message-ID: References: <20190408153440.39250-1-alan.hayward@arm.com> <2c8f233b-0c53-ed95-b556-6932c5b077fd@redhat.com> <55920B72-A248-4908-A748-CE6E4DE4D49A@arm.com> <9b30a7df-72d8-2e5b-4077-e291e57b82a8@redhat.com> In-Reply-To: <9b30a7df-72d8-2e5b-4077-e291e57b82a8@redhat.com> authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; x-ms-exchange-purlcount: 2 received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 Content-ID: <99976BB894A9BF448B01DFBD123CAECB@eurprd08.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-IsSubscribed: yes > On 11 Apr 2019, at 17:11, Pedro Alves wrote: > > On 4/10/19 1:10 PM, Alan Hayward wrote: > >>> Fix for that posted: >>> https://sourceware.org/ml/gdb-patches/2019-04/msg00141.html >> >> Excellent. I would give it a review, but don’t know anything in that area. > > Review is often an excellent way to learn about new areas. :-) True :) > >>> >>> Hit M-q in your emacs here. >> >> Done (assuming you just meant to wrap before column 80). > > Right. >>> Use clean_restart, and add period: >>> >>> # Restart GDB. >>> clean_restart >> >> This was intentional to avoid the “file” command at the end of clean_restart. > > The "file" command at the end is only run if you pass an argument to clean_restart. > > if { [llength $args] >= 1 } { > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > set executable [lindex $args 0] > set binfile [standard_output_file ${executable}] > gdb_load ${binfile} > } Yes! Done. > Please do add the all-important period. :-) And done. > >> + >> + # Set the sysroot. >> + gdb_test_no_output "set sysroot $sysroot_command" >> + >> + # Connect to gdbsever, making sure GDB reads in the binary correctly. > > type: “gdbsever" Done. > >> + set test "connect to remote and read binary" > >> >> # >> # gdb_target_cmd >> -# Send gdb the "target" command >> +# Send gdb the "target" command. Returns 0 on success, 1 on failure. > > Double space after period. > Done. >> +# If specified, then additional_text must match the text which must comes after > > Uppercase ADDITIONAL_TEXT. > > s/which must comes/that comes/ ? Done. > >> +# the connection message in order for procedure to succeed. > > s/for procedure/for the procedure/. Done. > > OK with the issues mentioned above fixed. > > Thanks, > Pedro Alves Pushed the following: diff --git a/gdb/testsuite/gdb.server/sysroot.c b/gdb/testsuite/gdb.server/sysroot.c new file mode 100644 index 0000000000..7db1a138d1 --- /dev/null +++ b/gdb/testsuite/gdb.server/sysroot.c @@ -0,0 +1,25 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2019 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +int +main () +{ + printf ("Hello World!\n"); + return 0; +} diff --git a/gdb/testsuite/gdb.server/sysroot.exp b/gdb/testsuite/gdb.server/sysroot.exp new file mode 100644 index 0000000000..4b95fdf087 --- /dev/null +++ b/gdb/testsuite/gdb.server/sysroot.exp @@ -0,0 +1,77 @@ +# This testcase is part of GDB, the GNU debugger. +# +# Copyright 2019 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test that GDB can correctly read the binary and shared libraries +# with different sysroot setups: local and "target:". + +load_lib gdbserver-support.exp + +if { [skip_gdbserver_tests] } { + verbose "skipping gdbserver tests" + return -1 +} + +standard_testfile +if {[build_executable "failed to prepare" $testfile $srcfile "additional_flags=--no-builtin"] == -1} { + return -1 +} + +# Run once with sysroot set to the local filesystem and once set to the remote +# target. +foreach_with_prefix sysroot { "local" "remote" } { + global srcdir + global subdir + global binfile + + if { $sysroot == "local" } { + set sysroot_command "/" + set reading_symbols "Reading symbols from $binfile..." + } else { + set sysroot_command "target:" + set reading_symbols "Reading $binfile from remote target..." + } + + # Restart GDB. + clean_restart + + # Make sure we're disconnected, in case we're testing with an + # extended-remote board, therefore already connected. + gdb_test "disconnect" ".*" + + # Start GDBserver. + set res [gdbserver_start "" $binfile] + set gdbserver_protocol [lindex $res 0] + set gdbserver_gdbport [lindex $res 1] + + # Set the sysroot. + gdb_test_no_output "set sysroot $sysroot_command" + + # Connect to gdbserver, making sure GDB reads in the binary correctly. + set test "connect to remote and read binary" + if {[gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport $reading_symbols] == 0} { + pass $test + } else { + fail $test + } + + gdb_breakpoint main + gdb_test "continue" "Breakpoint $decimal.* main.*" "continue to main" + + # Test that we can stop inside a library. + gdb_breakpoint printf + gdb_test "continue" "Breakpoint $decimal.* printf .*" "continue to printf" +} diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index dbd885aa22..2cb64f7d2f 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -42,9 +42,11 @@ # # gdb_target_cmd -# Send gdb the "target" command +# Send gdb the "target" command. Returns 0 on success, 1 on failure. +# If specified, then ADDITIONAL_TEXT must match the text that comes after +# the connection message in order for the procedure to succeed. # -proc gdb_target_cmd { targetname serialport } { +proc gdb_target_cmd { targetname serialport {additional_text ""} } { global gdb_prompt set serialport_re [string_to_regexp $serialport] @@ -61,23 +63,23 @@ proc gdb_target_cmd { targetname serialport } { -re "Couldn't establish connection to remote.*$gdb_prompt $" { verbose "Connection failed" } - -re "Remote MIPS debugging.*$gdb_prompt" { + -re "Remote MIPS debugging.*$additional_text.*$gdb_prompt" { verbose "Set target to $targetname" return 0 } - -re "Remote debugging using .*$serialport_re.*$gdb_prompt $" { + -re "Remote debugging using .*$serialport_re.*$additional_text.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 } - -re "Remote debugging using stdio.*$gdb_prompt $" { + -re "Remote debugging using stdio.*$additional_text.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 } - -re "Remote target $targetname connected to.*$gdb_prompt $" { + -re "Remote target $targetname connected to.*$additional_text.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 } - -re "Connected to.*$gdb_prompt $" { + -re "Connected to.*$additional_text.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 }