Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

"maint test-settings set/show" -> "maint set/show test-settings"

Browse Source 
This commit renames "maint test-settings set/show" to "maint set/show
test-settings".

This helps the following patch, which introduce a "maint with" command
what works with all "maint set" settings.

gdb/ChangeLog:
yyyy-mm-dd  Pedro Alves  <palves@redhat.com>

	* NEWS (New commands): Mention "maint set/show test-settings"
	instead of "maint test-settings".
	* maint-test-settings.c (maintenance_test_settings_list): Delete.
	(maintenance_test_settings_set_list): Rename to ...
	(maintenance_set_test_settings_list): ... this.
	(maintenance_test_settings_show_list): Rename to  ...
	(maintenance_show_test_settings_list): ... this.
	(maintenance_test_settings_cmd): Delete.
	(maintenance_test_settings_set_cmd): ...
	(maintenance_set_test_settings_cmd): ... this.
	(maintenance_test_settings_show_cmd): ...
	(maintenance_show_test_settings_cmd): ... this.
	(maintenance_test_settings_show_value_cmd):
	(maintenance_show_test_settings_value_cmd): ... this.
	(_initialize_maint_test_settings): No longer install the "maint
	test-settings" prefix command.  Rename "maint test-settings set"
	to "maint set test-settings", and "maint test-settings show" to
	"maint show test-settings".  Adjust all subcommands.

gdb/doc/ChangeLog:
yyyy-mm-dd  Pedro Alves  <palves@redhat.com>

	* gdb.texinfo (Maintenance Commands): Document "maint set/show
	test-settings" instead of "maint test-settings set/show".

gdb/testsuite/ChangeLog:
yyyy-mm-dd  Pedro Alves  <palves@redhat.com>

	* gdb.base/settings.exp: Replace all references to "maint
	test-settings set" with references to "maint set test-settings",
	and all references to "maint test-settings show" with references
	to "maint show test-settings".
This commit is contained in:
Pedro Alves
2019-06-18 01:20:47 +01:00
parent 03c6774d01
commit 47f969f4d9
4 changed files with 83 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gdb/NEWS
View File

@@ -84,7 +84,8 @@ set style highlight background COLOR
set style highlight intensity VALUE set style highlight intensity VALUE
Control the styling of highlightings. Control the styling of highlightings.
maint test-settings KIND maint set test-settings KIND
maint show test-settings KIND
A set of commands used by the testsuite for exercising the settings A set of commands used by the testsuite for exercising the settings
infrastructure. infrastructure.

7
gdb/doc/gdb.texinfo
View File

@@ -37626,9 +37626,10 @@ Shows the result of completing the @code{maint test-options}
subcommands. This is used by the testsuite to validate completion subcommands. This is used by the testsuite to validate completion
support in the command options framework. support in the command options framework.
@kindex maint test-settings @kindex maint set test-settings
@item maint test-settings set @var{kind} @kindex maint show test-settings
@itemx maint test-settings show @var{kind} @item maint set test-settings @var{kind}
@itemx maint show test-settings @var{kind}
These are representative commands for each @var{kind} of setting type These are representative commands for each @var{kind} of setting type
@value{GDBN} supports. They are used by the testsuite for exercising @value{GDBN} supports. They are used by the testsuite for exercising
the settings infrastructure. the settings infrastructure.

149
gdb/maint-test-settings.c
View File

@@ -21,46 +21,33 @@
#include "defs.h" #include "defs.h"
#include "gdbcmd.h" #include "gdbcmd.h"
/* Command list for "maint test-settings". */ /* Command list for "maint set test-settings". */
static cmd_list_element *maintenance_test_settings_list; static cmd_list_element *maintenance_set_test_settings_list;
/* Command list for "maint test-settings set/show". */ /* Command list for "maint show test-settings". */
static cmd_list_element *maintenance_test_settings_set_list; static cmd_list_element *maintenance_show_test_settings_list;
static cmd_list_element *maintenance_test_settings_show_list;
/* The "maintenance test-settings" prefix command. */ /* The "maintenance set test-settings" prefix command. */
static void static void
maintenance_test_settings_cmd (const char *arg, int from_tty) maintenance_set_test_settings_cmd (const char *args, int from_tty)
{ {
printf_unfiltered printf_unfiltered (_("\"maintenance set test-settings\" must be followed "
(_("\"maintenance test-settings\" must be followed "
"by the name of a subcommand.\n"));
help_list (maintenance_test_settings_list, "maintenance test-settings ",
all_commands, gdb_stdout);
}
/* The "maintenance test-settings set" prefix command. */
static void
maintenance_test_settings_set_cmd (const char *args, int from_tty)
{
printf_unfiltered (_("\"maintenance test-settings set\" must be followed "
"by the name of a set command.\n")); "by the name of a set command.\n"));
help_list (maintenance_test_settings_set_list, help_list (maintenance_set_test_settings_list,
"maintenance test-settings set ", "maintenance set test-settings ",
all_commands, gdb_stdout); all_commands, gdb_stdout);
} }
/* The "maintenance test-settings show" prefix command. */ /* The "maintenance show test-settings" prefix command. */
static void static void
maintenance_test_settings_show_cmd (const char *args, int from_tty) maintenance_show_test_settings_cmd (const char *args, int from_tty)
{ {
cmd_show_list (maintenance_test_settings_show_list, from_tty, ""); cmd_show_list (maintenance_show_test_settings_list, from_tty, "");
} }
/* Control variables for all the "maintenance test-settings set/show /* Control variables for all the "maintenance set/show test-settings
xxx" commands. */ xxx" commands. */
static int maintenance_test_settings_boolean; static int maintenance_test_settings_boolean;
@@ -85,7 +72,7 @@ static char *maintenance_test_settings_optional_filename;
static char *maintenance_test_settings_filename; static char *maintenance_test_settings_filename;
/* Enum values for the "maintenance test-settings set/show boolean" /* Enum values for the "maintenance set/show test-settings boolean"
commands. */ commands. */
static const char maintenance_test_settings_xxx[] = "xxx"; static const char maintenance_test_settings_xxx[] = "xxx";
static const char maintenance_test_settings_yyy[] = "yyy"; static const char maintenance_test_settings_yyy[] = "yyy";
@@ -101,10 +88,10 @@ static const char *const maintenance_test_settings_enums[] = {
static const char *maintenance_test_settings_enum static const char *maintenance_test_settings_enum
= maintenance_test_settings_xxx; = maintenance_test_settings_xxx;
/* The "maintenance test-settings show xxx" commands. */ /* The "maintenance show test-settings xxx" commands. */
static void static void
maintenance_test_settings_show_value_cmd maintenance_show_test_settings_value_cmd
(struct ui_file *file, int from_tty, (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value) struct cmd_list_element *c, const char *value)
{ {
@@ -117,29 +104,21 @@ _initialize_maint_test_settings (void)
{ {
maintenance_test_settings_filename = xstrdup ("/foo/bar"); maintenance_test_settings_filename = xstrdup ("/foo/bar");
add_prefix_cmd ("test-settings", no_class, add_prefix_cmd ("test-settings", class_maintenance,
maintenance_test_settings_cmd, maintenance_set_test_settings_cmd, _("\
_("\
Generic command for testing the settings infrastructure."),
&maintenance_test_settings_list,
"maintenance test-settings ", 0,
&maintenancelist);
add_prefix_cmd ("set", class_maintenance,
maintenance_test_settings_set_cmd, _("\
Set GDB internal variables used for set/show command infrastructure testing."), Set GDB internal variables used for set/show command infrastructure testing."),
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
"maintenance test-settings set ", "maintenance set test-settings ",
0/*allow-unknown*/, 0/*allow-unknown*/,
&maintenance_test_settings_list); &maintenance_set_cmdlist);
add_prefix_cmd ("show", class_maintenance, add_prefix_cmd ("test-settings", class_maintenance,
maintenance_test_settings_show_cmd, _("\ maintenance_show_test_settings_cmd, _("\
Show GDB internal variables used for set/show command infrastructure testing."), Show GDB internal variables used for set/show command infrastructure testing."),
&maintenance_test_settings_show_list, &maintenance_show_test_settings_list,
"maintenance test-settings show ", "maintenance show test-settings ",
0/*allow-unknown*/, 0/*allow-unknown*/,
&maintenance_test_settings_list); &maintenance_show_cmdlist);
add_setshow_boolean_cmd ("boolean", class_maintenance, add_setshow_boolean_cmd ("boolean", class_maintenance,
&maintenance_test_settings_boolean, _("\ &maintenance_test_settings_boolean, _("\
@@ -147,9 +126,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_auto_boolean_cmd ("auto-boolean", class_maintenance, add_setshow_auto_boolean_cmd ("auto-boolean", class_maintenance,
&maintenance_test_settings_auto_boolean, _("\ &maintenance_test_settings_auto_boolean, _("\
@@ -157,19 +136,19 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_uinteger_cmd ("uinteger", class_maintenance, add_setshow_uinteger_cmd ("uinteger", class_maintenance,
&maintenance_test_settings_uinteger, _("\ &maintenance_test_settings_uinteger, _("\
command used for internal testing"), _("\ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_integer_cmd ("integer", class_maintenance, add_setshow_integer_cmd ("integer", class_maintenance,
&maintenance_test_settings_integer, _("\ &maintenance_test_settings_integer, _("\
@@ -177,9 +156,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_string_cmd ("string", class_maintenance, add_setshow_string_cmd ("string", class_maintenance,
&maintenance_test_settings_string, _("\ &maintenance_test_settings_string, _("\
@@ -187,9 +166,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_string_noescape_cmd add_setshow_string_noescape_cmd
("string-noescape", class_maintenance, ("string-noescape", class_maintenance,
@@ -198,9 +177,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_optional_filename_cmd add_setshow_optional_filename_cmd
("optional-filename", class_maintenance, ("optional-filename", class_maintenance,
@@ -209,9 +188,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_filename_cmd ("filename", class_maintenance, add_setshow_filename_cmd ("filename", class_maintenance,
&maintenance_test_settings_filename, _("\ &maintenance_test_settings_filename, _("\
@@ -219,9 +198,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_zinteger_cmd ("zinteger", class_maintenance, add_setshow_zinteger_cmd ("zinteger", class_maintenance,
&maintenance_test_settings_zinteger, _("\ &maintenance_test_settings_zinteger, _("\
@@ -229,9 +208,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_zuinteger_cmd ("zuinteger", class_maintenance, add_setshow_zuinteger_cmd ("zuinteger", class_maintenance,
&maintenance_test_settings_zuinteger, _("\ &maintenance_test_settings_zuinteger, _("\
@@ -239,9 +218,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_zuinteger_unlimited_cmd add_setshow_zuinteger_unlimited_cmd
("zuinteger-unlimited", class_maintenance, ("zuinteger-unlimited", class_maintenance,
@@ -250,9 +229,9 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
add_setshow_enum_cmd ("enum", class_maintenance, add_setshow_enum_cmd ("enum", class_maintenance,
maintenance_test_settings_enums, maintenance_test_settings_enums,
@@ -261,7 +240,7 @@ command used for internal testing"), _("\
command used for internal testing"), command used for internal testing"),
nullptr, /* help_doc */ nullptr, /* help_doc */
nullptr, /* set_cmd */ nullptr, /* set_cmd */
maintenance_test_settings_show_value_cmd, maintenance_show_test_settings_value_cmd,
&maintenance_test_settings_set_list, &maintenance_set_test_settings_list,
&maintenance_test_settings_show_list); &maintenance_show_test_settings_list);
} }

26
gdb/testsuite/gdb.base/settings.exp
View File

@@ -45,8 +45,8 @@ proc show_setting {show_cmd expected_re} {
# var_Xinteger tests. VARIANT determines which command/variant to # var_Xinteger tests. VARIANT determines which command/variant to
# exercise. # exercise.
proc test-integer {variant} { proc test-integer {variant} {
set set_cmd "maint test-settings set $variant" set set_cmd "maint set test-settings $variant"
set show_cmd "maint test-settings show $variant" set show_cmd "maint show test-settings $variant"
# A bogus value. # A bogus value.
gdb_test "$set_cmd bogus" \ gdb_test "$set_cmd bogus" \
@@ -122,7 +122,7 @@ proc test-integer {variant} {
} }
if {$variant == "zuinteger"} { if {$variant == "zuinteger"} {
test_gdb_complete_multiple "maint test-settings set " "zuinteger" "" { test_gdb_complete_multiple "maint set test-settings " "zuinteger" "" {
"zuinteger" "zuinteger"
"zuinteger-unlimited" "zuinteger-unlimited"
} }
@@ -166,7 +166,7 @@ proc test-integer {variant} {
# Check show command completion. # Check show command completion.
if {$variant == "zuinteger"} { if {$variant == "zuinteger"} {
test_gdb_complete_multiple "maintenance test-settings show " "zuinteger" "" { test_gdb_complete_multiple "maintenance show test-settings " "zuinteger" "" {
"zuinteger" "zuinteger"
"zuinteger-unlimited" "zuinteger-unlimited"
} }
@@ -182,8 +182,8 @@ proc test-integer {variant} {
proc_with_prefix test-boolean {} { proc_with_prefix test-boolean {} {
# Use these variables to make sure we don't call the wrong command # Use these variables to make sure we don't call the wrong command
# by mistake. # by mistake.
set set_cmd "maint test-settings set boolean" set set_cmd "maint set test-settings boolean"
set show_cmd "maint test-settings show boolean" set show_cmd "maint show test-settings boolean"
# A bogus value. # A bogus value.
gdb_test "$set_cmd bogus" \ gdb_test "$set_cmd bogus" \
@@ -277,8 +277,8 @@ proc_with_prefix test-boolean {} {
proc_with_prefix test-auto-boolean {} { proc_with_prefix test-auto-boolean {} {
# Use these variables to make sure we don't call the wrong command # Use these variables to make sure we don't call the wrong command
# by mistake. # by mistake.
set set_cmd "maint test-settings set auto-boolean" set set_cmd "maint set test-settings auto-boolean"
set show_cmd "maint test-settings show auto-boolean" set show_cmd "maint show test-settings auto-boolean"
# A bogus value. # A bogus value.
gdb_test "$set_cmd bogus" \ gdb_test "$set_cmd bogus" \
@@ -381,8 +381,8 @@ proc_with_prefix test-auto-boolean {} {
proc_with_prefix test-enum {} { proc_with_prefix test-enum {} {
# Use these variables to make sure we don't call the wrong command # Use these variables to make sure we don't call the wrong command
# by mistake. # by mistake.
set set_cmd "maint test-settings set enum" set set_cmd "maint set test-settings enum"
set show_cmd "maint test-settings show enum" set show_cmd "maint show test-settings enum"
# Missing value. # Missing value.
gdb_test "$set_cmd" \ gdb_test "$set_cmd" \
@@ -444,8 +444,8 @@ proc test-string {variant} {
# Use these variables to make sure we don't call the wrong command # Use these variables to make sure we don't call the wrong command
# by mistake. # by mistake.
set set_cmd "maint test-settings set $variant" set set_cmd "maint set test-settings $variant"
set show_cmd "maint test-settings show $variant" set show_cmd "maint show test-settings $variant"
# Checks that gdb doesn't crash if we haven't set the string yet. # Checks that gdb doesn't crash if we haven't set the string yet.
if {$variant != "filename"} { if {$variant != "filename"} {
@@ -519,7 +519,7 @@ proc test-string {variant} {
# Check show command completion. # Check show command completion.
if {$variant == "string"} { if {$variant == "string"} {
test_gdb_complete_multiple "maint test-settings show " "string" "" { test_gdb_complete_multiple "maint show test-settings " "string" "" {
"string" "string"
"string-noescape" "string-noescape"
} }