From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by sourceware.org (Postfix) with ESMTPS id 99821385840C for ; Tue, 11 Jan 2022 18:55:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 99821385840C Received: by mail-il1-x132.google.com with SMTP id h30so5484228ila.12 for ; Tue, 11 Jan 2022 10:55:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4ab+v7Q4gb8H6PCyIvaIR/akKytxzRBeqKCeqZRSpDM=; b=PPC632hcGF/nwt2r7W+pAjM/NQmO19HgHbA8pDsv8jiQFnlJvH0j0RI+BGnt+iS9mJ RHUJugoBNxy7sUcLSyEknI8XAUrkoYyXbgRlQRDS3SZagVyjZhS8leN1AeDOL8np2Ohc zF681pWQVv3YPQhR3kwlIoRGM6cXB4UQoj2POhdl0EyZm8+lXKvK1NcWBYxlAKMkYkoI exSa7OND22xEMuKV9o98wClVES1ZJn8i2qwVrJGekNPaRNmZ4FosUwqpcA0nj7ECuMTW 8CAWMvS2M18wnw5VdvsW74tcYo9i3YUbkflraVXmQTjZzm7w44I6JvMsso2cEGnaYSRI +ikg== X-Gm-Message-State: AOAM533EaPF0X36iqc6Z631dIr+1eJSEn7dWNN1Ua6MwV42urqs8LZem T7nIp7XCZmg6bqpWjszrsGZm2kHqPNLJvw== X-Google-Smtp-Source: ABdhPJweGU1Ihyqqt8ThaI4LLtXYYb6IYyZ3ne9jYS4Tq7GB0Y+lHjIuOuBY2iuHMSbvdhwLF2XKmA== X-Received: by 2002:a92:ca07:: with SMTP id j7mr3050266ils.159.1641927308083; Tue, 11 Jan 2022 10:55:08 -0800 (PST) Received: from murgatroyd.Home (75-166-134-30.hlrn.qwest.net. [75.166.134.30]) by smtp.gmail.com with ESMTPSA id d16sm5870240ila.51.2022.01.11.10.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 10:55:07 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Don't mention "serial" in target remote description Date: Tue, 11 Jan 2022 11:55:05 -0700 Message-Id: <20220111185505.2707134-1-tromey@adacore.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jan 2022 18:55:10 -0000 PR remote/9177 points out that "info files" mentions "serial" a couple of times: Remote serial target in gdb-specific protocol: Debugging a target over a serial line. However, often the remote target isn't really a serial connection. It seems to me that this text could be a bit clearer; and furthermore since "info files" prints the target's long description, remote_target::files_info doesn't really add much and can simply be removed. Regression tested on x86-64 Fedora 34. --- gdb/remote.c | 11 ++--------- .../gdb.multi/multi-target-info-inferiors.exp | 8 ++++---- gdb/testsuite/lib/gdb.exp | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index 290edd07cd1..b126532af45 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -391,7 +391,7 @@ class remote_state static const target_info remote_target_info = { "remote", - N_("Remote serial target in gdb-specific protocol"), + N_("Remote target using gdb-specific protocol"), remote_doc }; @@ -426,8 +426,6 @@ class remote_target : public process_stratum_target void store_registers (struct regcache *, int) override; void prepare_to_store (struct regcache *) override; - void files_info () override; - int insert_breakpoint (struct gdbarch *, struct bp_target_info *) override; int remove_breakpoint (struct gdbarch *, struct bp_target_info *, @@ -959,7 +957,7 @@ class remote_target : public process_stratum_target static const target_info extended_remote_target_info = { "extended-remote", - N_("Extended remote serial target in gdb-specific protocol"), + N_("Extended remote target using gdb-specific protocol"), remote_doc }; @@ -9420,11 +9418,6 @@ remote_target::flash_done () } } -void -remote_target::files_info () -{ - puts_filtered ("Debugging a target over a serial line.\n"); -} /* Stuff for dealing with the packets which are part of this protocol. See comment at top of file for details. */ diff --git a/gdb/testsuite/gdb.multi/multi-target-info-inferiors.exp b/gdb/testsuite/gdb.multi/multi-target-info-inferiors.exp index bb4efa11ae4..8b0c6c91a2a 100644 --- a/gdb/testsuite/gdb.multi/multi-target-info-inferiors.exp +++ b/gdb/testsuite/gdb.multi/multi-target-info-inferiors.exp @@ -89,9 +89,9 @@ proc test_info_inferiors {multi_process} { [multi_line \ "Num${ws}What${ws}Description${ws}" \ "[connection_num 1 $inf]${ws}native${ws}Native process${ws}" \ - "[connection_num 2 $inf]${ws}extended-remote localhost:$decimal${ws}Extended remote serial target in gdb-specific protocol${ws}" \ + "[connection_num 2 $inf]${ws}extended-remote localhost:$decimal${ws}Extended remote target using gdb-specific protocol${ws}" \ "[connection_num 3 $inf]${ws}core${ws}Local core dump file${ws}" \ - "[connection_num 4 $inf]${ws}extended-remote localhost:$decimal${ws}Extended remote serial target in gdb-specific protocol${ws}" \ + "[connection_num 4 $inf]${ws}extended-remote localhost:$decimal${ws}Extended remote target using gdb-specific protocol${ws}" \ "[connection_num 5 $inf]${ws}core${ws}Local core dump file${ws}" \ ] @@ -100,9 +100,9 @@ proc test_info_inferiors {multi_process} { [multi_line \ "Num${ws}What${ws}Description" \ "[connection_num 1 $inf]${ws}native${ws}Native process" \ - "[connection_num 2 $inf]${ws}extended-remote localhost:$decimal${ws}Extended remote serial target in gdb-specific protocol" \ + "[connection_num 2 $inf]${ws}extended-remote localhost:$decimal${ws}Extended remote target using gdb-specific protocol" \ "[connection_num 3 $inf]${ws}core${ws}Local core dump file" \ - "[connection_num 4 $inf]${ws}extended-remote localhost:$decimal${ws}Extended remote serial target in gdb-specific protocol" \ + "[connection_num 4 $inf]${ws}extended-remote localhost:$decimal${ws}Extended remote target using gdb-specific protocol" \ "[connection_num 5 $inf]${ws}core${ws}Local core dump file" \ ] } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 60f7b83571a..c69cb0070ef 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3884,7 +3884,7 @@ proc gdb_is_target_1 { target_name target_stack_regexp prompt_regexp } { # Helper for gdb_is_target_remote where the expected prompt is variable. proc gdb_is_target_remote_prompt { prompt_regexp } { - return [gdb_is_target_1 "remote" ".*emote serial target in gdb-specific protocol.*" $prompt_regexp] + return [gdb_is_target_1 "remote" ".*emote target using gdb-specific protocol.*" $prompt_regexp] } # Check whether we're testing with the remote or extended-remote -- 2.31.1