From patchwork Thu Mar 7 14:04:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 31766 Received: (qmail 37035 invoked by alias); 7 Mar 2019 14:04:59 -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 36946 invoked by uid 89); 7 Mar 2019 14:04:58 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-14.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=Nothing, monitor, HX-Spam-Relays-External:sk:host86-, USE X-HELO: mail-wr1-f66.google.com Received: from mail-wr1-f66.google.com (HELO mail-wr1-f66.google.com) (209.85.221.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 07 Mar 2019 14:04:56 +0000 Received: by mail-wr1-f66.google.com with SMTP id r5so17563110wrg.9 for ; Thu, 07 Mar 2019 06:04:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id; bh=wKhp1RvMrkbMZAZp8lz8mc+73Kd1zLjdY5ZHKHS8Kio=; b=SGgA+xxi6tjv7m5Ahev+cyzhlc6nX4pg/KQoq4UQOkrPn0+533xsk04x4Mfmhl1PAV j/MTNYgc2VwrQucGzJ+RhTIDNAWGDt/9345MoCDeX4LFU+xuTRnduJQiogbNR9Aj8gQZ 6SivbfKfD0gRaj4h6+BR84G/3fYHl2LxDOPfqZCt6AA5i85DjpmwDFybwDYU0RzPrZQo vLxcaZmJhIN5+G7rtS10k0sWN2t09oEsFbvhJZVBKMSiYW9TxepVniUDLac12SRcuKNX U97AxRDcrVhLCBEOeRZm3n4G2YWIuQf8qxyLhcYH4wXgtn7MOxNMyheDxaxeGmkeIhcc 0klw== Return-Path: Received: from localhost (host86-142-70-198.range86-142.btcentralplus.com. [86.142.70.198]) by smtp.gmail.com with ESMTPSA id c1sm11576840wrw.7.2019.03.07.06.04.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Mar 2019 06:04:52 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH] gdb/testsuite: Prepare for DejaGnu 1.6.2 Date: Thu, 7 Mar 2019 14:04:50 +0000 Message-Id: <20190307140450.22503-1-andrew.burgess@embecosm.com> X-IsSubscribed: yes Changes in DejaGnu 1.6.2 mean that our testsuite will no longer run. This is because of some confusion over how the gdb.exp file is handled. The gdb.exp file is really the tool init file, which is loaded from within the DejaGnu core, and it should not be loaded directly from any other file in the testsuite. DejaGnu tries to prevent the same library being loaded twice by remembering the names of library files as they are loaded. Until recently loading the tool init file in DejaGnu was very similar to loading a library file, as a result, loading the gdb.exp tool init file simply recorded 'gdb.exp' as having been loaded, future attempts to load 'gdb.exp' as a library would then be ignored (as the file was marked as already loaded). DejaGnu has now changed so that it supports having both a tool init file and a library with the same name, something that was not possible before. What this means however is that when the core loads the 'gdb.exp' tool init file it no longer marks the library 'gdb.exp' as having been loaded. When we then execute 'load_lib gdb.exp' we then try to reload the 'gdb.exp' file. Unfortunately our gdb.exp file can only be loaded once. It use of 'rename cd builtin_cd' means that a second attempt to load this file will fail. This was discussed on the DejaGnu list here: http://lists.gnu.org/archive/html/dejagnu/2019-03/msg00000.html and the suggested advice is that, unless we have some real requirement to load the tool init file twice, we should remove calls to 'load_lib gdb.exp' and rely on DejaGnu to load the file for us, which is what this patch does. I've tested with native X86-64/GNU Linux and see no regressions. gdb/testsuite/ChangeLog: * config/default.exp: Remove 'load_lib gdb.exp'. * config/monitor.exp: Likewise. * config/sid.exp: Likewise. * config/sim.exp: Likewise. * config/slite.exp: Likewise. * config/unix.exp: Likewise. * gdb.base/default.exp: Remove unhelpful comment. --- gdb/testsuite/ChangeLog | 10 ++++++++++ gdb/testsuite/config/default.exp | 2 +- gdb/testsuite/config/monitor.exp | 3 --- gdb/testsuite/config/sid.exp | 2 -- gdb/testsuite/config/sim.exp | 2 -- gdb/testsuite/config/slite.exp | 2 +- gdb/testsuite/config/unix.exp | 2 -- gdb/testsuite/gdb.base/default.exp | 2 -- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/config/default.exp b/gdb/testsuite/config/default.exp index 8b70ee4b507..325a58851ec 100644 --- a/gdb/testsuite/config/default.exp +++ b/gdb/testsuite/config/default.exp @@ -13,4 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -load_lib gdb.exp +# Nothing extra is needed here. diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp index be8d8429b8d..48a01feb706 100644 --- a/gdb/testsuite/config/monitor.exp +++ b/gdb/testsuite/config/monitor.exp @@ -14,9 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -load_lib gdb.exp -# puts "***** DID USE MONITOR ******" - # # gdb_target_cmd # Send gdb the "target" command diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp index 3c92a4fe9f5..17a3ad568d9 100644 --- a/gdb/testsuite/config/sid.exp +++ b/gdb/testsuite/config/sid.exp @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -load_lib gdb.exp - proc sid_start {} { global verbose diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp index dafb1a26063..8d87e3089b0 100644 --- a/gdb/testsuite/config/sim.exp +++ b/gdb/testsuite/config/sim.exp @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -load_lib gdb.exp - # # gdb_target_sim # Set gdb to target the simulator diff --git a/gdb/testsuite/config/slite.exp b/gdb/testsuite/config/slite.exp index 0fa472ee0cb..ffbd9c811e8 100644 --- a/gdb/testsuite/config/slite.exp +++ b/gdb/testsuite/config/slite.exp @@ -27,7 +27,7 @@ # rather than being displayed by gdb. load_lib remote.exp -load_lib gdb.exp + set gdb_prompt "\\(gdb\\)" # diff --git a/gdb/testsuite/config/unix.exp b/gdb/testsuite/config/unix.exp index 2ab1d9abf0c..770e69b4c32 100644 --- a/gdb/testsuite/config/unix.exp +++ b/gdb/testsuite/config/unix.exp @@ -21,5 +21,3 @@ # does not seem to be enough. Try starting with 60. set timeout 60 verbose "Timeout is now $timeout seconds" 2 - -load_lib gdb.exp diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index 8a11401c79f..ece1428e617 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -25,8 +25,6 @@ set timeout 60 # test default actions of gdb commands # -#load_lib gdb.exp - gdb_test "add-symbol-file" "add-symbol-file takes a file name and an address" "add-symbol-file" # test append