From patchwork Tue Dec 4 11:33:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 30531 Received: (qmail 79562 invoked by alias); 4 Dec 2018 11:33:58 -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 79533 invoked by uid 89); 4 Dec 2018 11:33:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*RU:209.85.128.68, Hx-spam-relays-external:209.85.128.68, sim X-HELO: mail-wm1-f68.google.com Received: from mail-wm1-f68.google.com (HELO mail-wm1-f68.google.com) (209.85.128.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Dec 2018 11:33:53 +0000 Received: by mail-wm1-f68.google.com with SMTP id a18so8985505wmj.1 for ; Tue, 04 Dec 2018 03:33:53 -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=WS/y72tmBuyUkjGGpKzRjPfBrlnP0opHcCqeXUS3ntg=; b=Oh9iWHXHPqpeqqGST9igdmOfyeaTjlAgIspR3DeRtGM25pC2331JTTSaQi38QE46Jj JBSRdUZPrND3K3vizFfg62rOwaYNhhiT3+eELCP8+qpUr34x4QSZXSs3NZcn5I0gBl83 8nWtGjpXZ8DYbfVVkmtcWqcEQ6ONqix9/sU43utiaC88OxjzHlXbTa0n+beGL46b/klh MLFYtFgFo4aGj4KQ6hBUof15tHg32k+2SPuUfuHmfWBi9hPAuvDwjqu44wEPhbWPw9nV +xZVDgE/5Himmv1ryPfL54+hPhrzpQ6xFUeBnSzYSoWVxscAdMIrAYv7N7lFN48MAYkB AwKg== Return-Path: Received: from localhost (host86-156-236-210.range86-156.btcentralplus.com. [86.156.236.210]) by smtp.gmail.com with ESMTPSA id g201sm7532853wme.43.2018.12.04.03.33.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Dec 2018 03:33:50 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH] gdb/testsuite/sim: Remove redundant setting of timeout Date: Tue, 4 Dec 2018 11:33:45 +0000 Message-Id: <20181204113345.717-1-andrew.burgess@embecosm.com> X-IsSubscribed: yes In the config/sim.exp file two functions are defined. Both of these functions define local timeout variables and then call gdb_expect, which (through a call to get_largest_timeout) will find the local definition of timeout. However, both of these functions set the local timeout to some arbitrary value and print a log message for this "new" timeout just before returning. As in both cases, the timeout is a local variable, this final setting of the timeout has no effect and can be removed. gdb/testsuite/ChangeLog: * config/sim.exp (gdb_target_sim): Remove redundant adjustment of local timeout variable before return. (gdb_load): Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/config/sim.exp | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp index d9072febc6a..47146c6662e 100644 --- a/gdb/testsuite/config/sim.exp +++ b/gdb/testsuite/config/sim.exp @@ -37,8 +37,6 @@ proc gdb_target_sim { } { return -1 } } - set timeout 10 - verbose "Timeout is now $timeout seconds" 2 return 0 } @@ -67,8 +65,6 @@ proc gdb_load { arg } { if $verbose>1 then { send_user "Loaded $arg into $GDB\n" } - set timeout 30 - verbose "Timeout is now $timeout seconds" 2 return 0 } -re "$gdb_prompt $" {