diff mbox

Don't mention "Unix" in native target name.

Message ID 5321A4C8.80909@redhat.com
State Committed
Headers show

Commit Message

Pedro Alves March 13, 2014, 12:30 p.m. UTC
On 03/13/2014 12:13 AM, Doug Evans wrote:
> On Wed, Mar 12, 2014 at 6:16 AM, Gary Benson <gbenson@redhat.com> wrote:
>> Pedro Alves wrote:
>>> How about we just say the same mostly everywhere?
>>
>> I'm all for this.
>>
>>> In the same vein, I'd also rename Solaris/procfs.c's "target procfs"
>>> to "target child".
>>
>> Ditto.
> 
> +1

Thanks guys.  Judging from the quick positive reactions, seems
like everyone's in favor, so I've pushed this in.

---------
[PATCH] Don't mention "Unix" in native target name.

I find the mention of "Unix" unnecessary (and really slightly a lie)
on GNU/Linux in a couple of places:

 (gdb) maint print target-stack
 The current target stack is:
  - multi-thread (multi-threaded child process.)
  - child (Unix child process)
  - exec (Local exec file)
  - None (None)

 (gdb) help target child
 Unix child process (started by the "run" command).

 (gdb) target child
 Use the "run" command to start a Unix child process.

It's also odd that e.g., the Windows port says "Unix" in reaction to
"target child" (it was already that way before Windows used
inf-child.c):

 (gdb) target child
 Use the "run" command to start a Unix child process.
 (gdb)

So drop "Unix", going in the direction of saying mostly the same on
all native targets:

  (gdb) maint print target-stack
  The current target stack is:
   - multi-thread (multi-threaded child process.)
 - - child (Unix child process)
 + - child (Child process)
   - exec (Local exec file)
   - None (None)

  (gdb) help target child
 - Unix child process (started by the "run" command).
 + Child process (started by the "run" command).

 (gdb) target child
 -Use the "run" command to start a Unix child process.
 +Use the "run" command to start a child process.

gdb/
2014-03-13  Pedro Alves  <palves@redhat.com>

	* inf-child.c (inf_child_open, inf_child_target): Don't mention
	Unix in user visible strings.

gdb/testsuite/
2014-03-13  Pedro Alves  <palves@redhat.com>

	* gdb.base/default.exp: Update "target child" and "target procfs"
	tests to not expect "Unix".
---
 gdb/ChangeLog                      | 5 +++++
 gdb/inf-child.c                    | 6 +++---
 gdb/testsuite/ChangeLog            | 5 +++++
 gdb/testsuite/gdb.base/default.exp | 4 ++--
 4 files changed, 15 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b1f4b50..8ce0f98 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@ 
+2014-03-13  Pedro Alves  <palves@redhat.com>
+
+	* inf-child.c (inf_child_open, inf_child_target): Don't mention
+	Unix in user visible strings.
+
 2014-03-12  Stan Shebs  <stan@codesourcery.com>
 
 	* gdbtypes.h: Annotate comments for Doxygen, add a page
diff --git a/gdb/inf-child.c b/gdb/inf-child.c
index c6483f9..cc16b40 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -112,7 +112,7 @@  inf_child_prepare_to_store (struct target_ops *self,
 static void
 inf_child_open (char *arg, int from_tty)
 {
-  error (_("Use the \"run\" command to start a Unix child process."));
+  error (_("Use the \"run\" command to start a child process."));
 }
 
 static void
@@ -407,8 +407,8 @@  inf_child_target (void)
   struct target_ops *t = XCNEW (struct target_ops);
 
   t->to_shortname = "child";
-  t->to_longname = "Unix child process";
-  t->to_doc = "Unix child process (started by the \"run\" command).";
+  t->to_longname = "Child process";
+  t->to_doc = "Child process (started by the \"run\" command).";
   t->to_open = inf_child_open;
   t->to_post_attach = inf_child_post_attach;
   t->to_fetch_registers = inf_child_fetch_inferior_registers;
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5180a25..7e7cb67 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@ 
+2014-03-13  Pedro Alves  <palves@redhat.com>
+
+	* gdb.base/default.exp: Update "target child" and "target procfs"
+	tests to not expect "Unix".
+
 2014-03-12  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.base/corefile.exp (corefile_test_run, corefile_test_attach):
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index 73c33ba..b63955e 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -747,10 +747,10 @@  gdb_test "step" "The program is not being run." "step #2"
 gdb_test "symbol-file" ".*" "symbol-file"
 
 #test target child
-gdb_test "target child" "Use the \"run\" command to start a Unix child process.*|Undefined target command: \"child\".  *Try \"help target\".*" "target child"
+gdb_test "target child" "Use the \"run\" command to start a child process.*|Undefined target command: \"child\".  *Try \"help target\".*" "target child"
 
 #test target procfs
-gdb_test "target procfs" "Use the \"run\" command to start a Unix child process.*|Undefined target command: \"procfs\".  *Try \"help target\".*" "target procfs"
+gdb_test "target procfs" "Use the \"run\" command to start a child process.*|Undefined target command: \"procfs\".  *Try \"help target\".*" "target procfs"
 
 #test target core
 send_gdb "target core\n"