From patchwork Thu Apr 18 21:42:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 32341 Received: (qmail 81897 invoked by alias); 18 Apr 2019 21:42:15 -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 81765 invoked by uid 89); 18 Apr 2019 21:42:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=H*M:4489 X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 18 Apr 2019 21:42:14 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 1567AAEEA; Thu, 18 Apr 2019 21:42:12 +0000 (UTC) Subject: Re: [PATCH][gdb/testsuite] Fix break-probes.exp with native-gdbserver To: Pedro Alves , gdb-patches@sourceware.org References: <20190418165011.GA14803@delia> <27f28bbf-107d-dbd0-9bbd-480776aa5d0c@redhat.com> From: Tom de Vries Message-ID: Date: Thu, 18 Apr 2019 23:42:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <27f28bbf-107d-dbd0-9bbd-480776aa5d0c@redhat.com> X-IsSubscribed: yes On 18-04-19 20:13, Pedro Alves wrote: > On 4/18/19 5:50 PM, Tom de Vries wrote: >> Hi, >> >> When running break-probes.exp with native-gdbserver, we run into: >> ... >> FAIL: gdb.base/break-probes.exp: run til our library loads (the program exited) >> FAIL: gdb.base/break-probes.exp: call (int) foo(23) >> ... >> due to the fact that we're trying to match: >> ... >> Inferior loaded /data/gdb_versions/devel/build/gdb/testsuite/outputs/gdb.base\ >> /break-probes/break-probes-solib.so >> ... >> using pattern: >> ... >> Inferior loaded $sysroot$binfile_lib >> ... >> which expands into: >> ... >> Inferior loaded //data/gdb_versions/devel/build/gdb/testsuite/outputs/gdb.base\ >> /break-probes/break-probes-solib.so >> ... >> >> Fix this by removing trailing slashes from the sysroot variable. >> >> Tested on x86_64-linux with native and native-gdbserver (with sysroot set to >> "/", "/." and "/./"). >> >> OK for trunk? >> > > I think we made a little mistake in the recent "set sysroot in board file" patch: > > commit c92df149c29518f6e1d4a3174b3e29162fcd3ad6 > Author: Alan Hayward > AuthorDate: Thu Mar 28 12:33:29 2019 +0000 > > Testsuite: set sysroot when using gdbserver > > I think it would be better to make that do > > "set sysroot" > > instead of the current > > "set sysroot /" > > Setting the sysroot to empty means to read from the local filesystem, > which is what was intended. > > And with that, this patch shouldn't be necessary. Ack, committed as below. Thanks, - Tom [gdb/testsuite] Fix gdb.base/break-probes.exp with native-gdbserver When running break-probes.exp with native-gdbserver, we run into: ... FAIL: gdb.base/break-probes.exp: run til our library loads (the program exited) FAIL: gdb.base/break-probes.exp: call (int) foo(23) ... due to the fact that we're trying to match: ... Inferior loaded /data/gdb_versions/devel/build/gdb/testsuite/outputs/gdb.base\ /break-probes/break-probes-solib.so ... using pattern: ... Inferior loaded $sysroot$binfile_lib ... which expands into: ... Inferior loaded //data/gdb_versions/devel/build/gdb/testsuite/outputs/gdb.base\ /break-probes/break-probes-solib.so ... Fix by setting sysroot to "" in local-board.exp. Tested on x86_64-linux with native-gdbserver. gdb/testsuite/ChangeLog: 2019-04-18 Tom de Vries PR gdb/24433 * boards/local-board.exp: Set sysroot to "". --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/boards/local-board.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index bdabbba8d6..297e2d48c6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-04-18 Tom de Vries + + PR gdb/24433 + * boards/local-board.exp: Set sysroot to "". + 2019-04-18 Tom de Vries Pedro Alves diff --git a/gdb/testsuite/boards/local-board.exp b/gdb/testsuite/boards/local-board.exp index bf710f4632..6e0448c58a 100644 --- a/gdb/testsuite/boards/local-board.exp +++ b/gdb/testsuite/boards/local-board.exp @@ -24,4 +24,4 @@ set baseboard [lindex [split $board "/"] 0] set board_info($baseboard,isremote) 0 # Set sysroot to avoid sending files via the remote protocol. -set GDBFLAGS "${GDBFLAGS} -ex \"set sysroot /\"" +set GDBFLAGS "${GDBFLAGS} -ex \"set sysroot\""