Re: [PATCH] GDB/testsuite: Add a way to send multiple init commands

Maciej W. Rozycki
2014-06-11T18:41:20Z

On Wed, 11 Jun 2014, Tom Tromey wrote:

> Maciej> 2014-06-10 Maciej W. Rozycki <macro@mips.com>
> Maciej> Maciej W. Rozycki <macro@codesourcery.com>
>
> Maciej> * lib/gdb.exp (gdb_run_cmd): Process `gdb_init_commands'.
> Maciej> * lib/mi-support.exp (mi_run_cmd): Process `gdb_init_commands'.
>
> I like Keith's proposed cleanup.
>
> Maciej> + set commands [target_info gdb_init_commands];
>
> Extraneous ";". There are a few of these.

Sigh, it just shows my lack of experience with TCL back in 2005. I've
been pondering an update to the change to avoid some code duplication, so
given I had to touch it anyway I went ahead and did it. Here's the
result.

It has been lightly tested with gdb.base/advance.exp, with neither
setting defined, with `gdb_init_command' only, with `gdb_init_commands'
only having a single element, with `gdb_init_commands' only having two
elements and with both `gdb_init_command' and `gdb_init_commands' defined,
the latter having two elements. It has been also smoke-tested with
gdb.mi/mi-break.exp, with the last arrangement mentioned above only.

> I think this patch should also update testsuite/README to document the
> new setting.

And presumably the old one as well, right? Cc-ing Eli for this part.

2014-06-11 Maciej W. Rozycki <macro@mips.com>
Maciej W. Rozycki <macro@codesourcery.com>

* lib/gdb.exp (gdb_run_cmd): Process `gdb_init_commands'.
* lib/mi-support.exp (mi_run_cmd): Process `gdb_init_commands'.
* README (Board Settings): Document `gdb_init_command' and
`gdb_init_commands'.

Maciej

gdb-init-commands.diff
Index: gdb-fsf-trunk-quilt/gdb/testsuite/README
===================================================================
--- gdb-fsf-trunk-quilt.orig/gdb/testsuite/README 2014-06-03 15:23:24.000000000 +0100
+++ gdb-fsf-trunk-quilt/gdb/testsuite/README 2014-06-11 19:29:49.538972371 +0100
@@ -271,6 +271,16 @@ gdb,use_precord

The board supports process record.

+gdb_init_command
+gdb_init_commands
+
+ Commands to send to GDB every time a program is about to be run. The
+ first of these settings defines a single command as a string. The
+ second defines a TCL list of commands being a string each. The commands
+ are sent one by one in a sequence, first from `gdb_init_command', if any,
+ followed by individual commands from `gdb_init_command', if any, in this
+ list's order.
+
gdb_server_prog

The location of GDBserver. If GDBserver somewhere other than its
Index: gdb-fsf-trunk-quilt/gdb/testsuite/lib/gdb.exp
===================================================================
--- gdb-fsf-trunk-quilt.orig/gdb/testsuite/lib/gdb.exp 2014-06-07 18:27:52.000000000 +0100
+++ gdb-fsf-trunk-quilt/gdb/testsuite/lib/gdb.exp 2014-06-11 19:05:45.388928853 +0100
@@ -209,8 +209,15 @@ proc delete_breakpoints {} {
proc gdb_run_cmd {args} {
global gdb_prompt use_gdb_stub

+ set commands ""
if [target_info exists gdb_init_command] {
- send_gdb "[target_info gdb_init_command]\n"
+ lappend commands [target_info gdb_init_command]
+ }
+ if [target_info exists gdb_init_commands] {
+ set commands [concat $commands [target_info gdb_init_commands]]
+ }
+ foreach command $commands {
+ send_gdb "$command\n"
gdb_expect 30 {
-re "$gdb_prompt $" { }
default {
Index: gdb-fsf-trunk-quilt/gdb/testsuite/lib/mi-support.exp
===================================================================
--- gdb-fsf-trunk-quilt.orig/gdb/testsuite/lib/mi-support.exp 2014-06-07 18:27:50.000000000 +0100
+++ gdb-fsf-trunk-quilt/gdb/testsuite/lib/mi-support.exp 2014-06-11 19:06:27.888927573 +0100
@@ -859,8 +859,15 @@ proc mi_run_cmd_full {use_mi_command arg
set run_match ""
}

+ set commands ""
if [target_info exists gdb_init_command] {
- send_gdb "[target_info gdb_init_command]\n"
+ lappend commands [target_info gdb_init_command]
+ }
+ if [target_info exists gdb_init_commands] {
+ set commands [concat $commands [target_info gdb_init_commands]]
+ }
+ foreach command $commands {
+ send_gdb "$command\n"
gdb_expect 30 {
-re "$mi_gdb_prompt$" { }
default {