diff options
author | Tom Tromey <tromey@adacore.com> | 2022-01-11 11:52:33 -0700 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2022-01-12 07:43:57 -0700 |
commit | ae9adb365189f0f8c04aa5d7348c8e8a73a65f61 (patch) | |
tree | fb0b974df81fd7d3715a8da66b4e8ad892213cbd | |
parent | 72aa81732b3aff00e5bf1f69bb794513b3b37464 (diff) | |
download | gdb-ae9adb365189f0f8c04aa5d7348c8e8a73a65f61.zip gdb-ae9adb365189f0f8c04aa5d7348c8e8a73a65f61.tar.gz gdb-ae9adb365189f0f8c04aa5d7348c8e8a73a65f61.tar.bz2 |
Don't mention "serial" in target remote description
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.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=9177
-rw-r--r-- | gdb/remote.c | 11 | ||||
-rw-r--r-- | gdb/testsuite/gdb.multi/multi-target-info-inferiors.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/lib/gdb.exp | 2 |
3 files changed, 7 insertions, 14 deletions
diff --git a/gdb/remote.c b/gdb/remote.c index 290edd0..b126532 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -391,7 +391,7 @@ private: 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 @@ public: 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 @@ private: 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 bb4efa1..8b0c6c9 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 60f7b83..c69cb00 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 |