From patchwork Mon Feb 10 10:59:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 37846 Received: (qmail 45459 invoked by alias); 10 Feb 2020 10:59:17 -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 45448 invoked by uid 89); 10 Feb 2020 10:59:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.2 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=HX-Languages-Length:2593 X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 10 Feb 2020 10:59:16 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 12EEAAD00; Mon, 10 Feb 2020 10:59:14 +0000 (UTC) Subject: [PATCH][gdb/testsuite] Skip multi-target.exp without gdbserver From: Tom de Vries To: Tom Tromey Cc: Pedro Alves , gdb-patches@sourceware.org References: <87d0bf45up.fsf@tromey.com> <7ceebbb7-b2f7-3d4a-1d8a-f31310badbe8@redhat.com> <874kwk8nz9.fsf@tromey.com> <171a3144-af37-1c29-a2a4-c4cd7eaa14c0@redhat.com> <87r1zm6x8s.fsf@tromey.com> <01b4b5ca-a802-54b5-3135-428b7c9faa84@redhat.com> <87o8uo4mj0.fsf@tromey.com> <87blqfn0d6.fsf@tromey.com> <0b6b4f24-f5c8-b236-c249-737e70395667@suse.de> <4d5a1276-91aa-7197-5f90-854767987f73@suse.de> Message-ID: <428ef76b-23f4-e6dc-499f-e90c4edb074e@suse.de> Date: Mon, 10 Feb 2020 11:59:13 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <4d5a1276-91aa-7197-5f90-854767987f73@suse.de> X-IsSubscribed: yes [ was: Re: [PATCH] Move gdbserver to top level ] On 09-02-2020 15:17, Tom de Vries wrote: > On 09-02-2020 14:59, Tom de Vries wrote: >> On 03-02-2020 22:34, Tom Tromey wrote: >>> I'm going to push it tomorrow or the day after, unless there's some >>> objection. >> >> Hi, >> >> FYI, starting this commit, I'm running into: >> ... >> (gdb) PASS: gdb.multi/multi-target.exp: continue: non-stop=off: set >> remote-exec file in inferior 2 >> spawn of --once --multi localhost:2346 failed >> ERROR: tcl error sourcing >> /data/gdb_versions/devel/src/gdb/testsuite/gdb.multi/multi-target.exp. >> ERROR: Timeout waiting for gdbserver response. > > Looking at other tests that use gdbserver, I guess this is missing: > ... > diff --git a/gdb/testsuite/gdb.multi/multi-target.exp > b/gdb/testsuite/gdb.multi/multi-target.exp > index 3588eb4d76..6c727b5e3b 100644 > --- a/gdb/testsuite/gdb.multi/multi-target.exp > +++ b/gdb/testsuite/gdb.multi/multi-target.exp > @@ -17,6 +17,10 @@ > > load_lib gdbserver-support.exp > > +if { [skip_gdbserver_tests] } { > + return 0 > +} > + > standard_testfile > > # The plain remote target can't do multiple inferiors. > > ... This is an unrelated issue though, I can reproduce it before this commit with --disable-gdbserver. Fixed by attached patch. OK for trunk? Thanks, - Tom [gdb/testsuite] Skip multi-target.exp without gdbserver Pre-commit 919adfe840 "Move gdbserver to top level", if we build gdb with --disable-gdbserver, and run test-case gdb.multi/multi-target.exp, we run into: ... (gdb) PASS: gdb.multi/multi-target.exp: continue: non-stop=off: set remote-exec file in inferior 2 spawn of --once --multi localhost:2346 failed ERROR: tcl error sourcing /data/gdb_versions/devel/src/gdb/testsuite/gdb.multi/multi-target.exp. ERROR: Timeout waiting for gdbserver response. ... Fix this by using skip_gdbserver_tests in multi-target.exp. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-02-10 Tom de Vries * gdb.multi/multi-target.exp: Skip if skip_gdbserver_tests. --- gdb/testsuite/gdb.multi/multi-target.exp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gdb/testsuite/gdb.multi/multi-target.exp b/gdb/testsuite/gdb.multi/multi-target.exp index 3588eb4d76..6c727b5e3b 100644 --- a/gdb/testsuite/gdb.multi/multi-target.exp +++ b/gdb/testsuite/gdb.multi/multi-target.exp @@ -17,6 +17,10 @@ load_lib gdbserver-support.exp +if { [skip_gdbserver_tests] } { + return 0 +} + standard_testfile # The plain remote target can't do multiple inferiors.