From patchwork Wed Feb 12 00:57:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 37984 Received: (qmail 31631 invoked by alias); 12 Feb 2020 00:57:09 -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 31621 invoked by uid 89); 12 Feb 2020 00:57:08 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway30.websitewelcome.com Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (50.116.127.1) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 12 Feb 2020 00:57:07 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway30.websitewelcome.com (Postfix) with ESMTP id A4A19896A for ; Tue, 11 Feb 2020 18:57:05 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 1gKvjg5XCRP4z1gKvj7tkF; Tue, 11 Feb 2020 18:57:05 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version :Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=QnurBQ5n68RBwMQAm8pi9+vY6M1IUtYswgHRCHbdOec=; b=OnPZlhmn/SU7ECzOl8s75uoXV7 1IFBCDe6PhtPZYM6SRWeffKGAA7o3Nn9rdWhYHbQ7La4jMM8EznGrioyXrPWwPasnPKSdvKopasfz AnqHApwqeNFKpEbQeyDfIKE5U; Received: from 50-194-130-62-static.hfc.comcastbusiness.net ([50.194.130.62]:59600 helo=bapiya.hsd1.co.comcast.net) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1j1gKv-001T7c-BF; Tue, 11 Feb 2020 17:57:05 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Have testsuite find gdbserver in new location Date: Tue, 11 Feb 2020 17:57:03 -0700 Message-Id: <20200212005703.14566-1-tom@tromey.com> This updates the gdb testsuite to look for gdbserver in its new location. The old location is also checked for, on the theory that perhaps someone sets GDB to a full path for install testing. gdb/testsuite/ChangeLog 2020-02-11 Tom Tromey * lib/gdbserver-support.exp (find_gdbserver): Find gdbserver in build directory. * boards/gdbserver-base.exp: Update path to gdbserver. Change-Id: If03db762ba53882ddfaf2d2d516de14c3fa03938 --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/boards/gdbserver-base.exp | 2 +- gdb/testsuite/lib/gdbserver-support.exp | 14 ++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/boards/gdbserver-base.exp b/gdb/testsuite/boards/gdbserver-base.exp index 4db834dd842..f27a2fdf915 100644 --- a/gdb/testsuite/boards/gdbserver-base.exp +++ b/gdb/testsuite/boards/gdbserver-base.exp @@ -22,7 +22,7 @@ process_multilib_options "" set_board_info compiler "[find_gcc]" # Test the copy of gdbserver in the build directory. -set_board_info gdb_server_prog "[pwd]/../gdbserver/gdbserver" +set_board_info gdb_server_prog "[pwd]/../../gdbserver/gdbserver" # gdbserver does not intercept target file operations and perform them # on the host. diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 12796e8a41e..706bbeb9df4 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -138,13 +138,15 @@ proc find_gdbserver { } { return [target_info gdb_server_prog] } - set gdbserver "${GDB}server" - if { [file isdirectory $gdbserver] } { - append gdbserver "/gdbserver" - } + set toplevel [file join [file dirname $GDB] .. gdbserver] + foreach gdbserver [list "${GDB}server" $toplevel] { + if { [file isdirectory $gdbserver] } { + append gdbserver "/gdbserver" + } - if { [file executable $gdbserver] } { - return $gdbserver + if { [file executable $gdbserver] } { + return $gdbserver + } } return ""