From 8a6251301c6ea6d804735fbad8cdb7cba707f784 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 19 Sep 2019 01:14:19 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb_target_cmd In commit 81dc3ab594 "[gdb/testsuite] Handle unreachable network in server-connect.exp" a regression was introduced in gdb_target_cmd, causing ERRORs like this: ... ERROR: tcl error sourcing src/gdb/testsuite/gdb.server/abspath.exp. ERROR: wrong # args: should be "gdb_target_cmd {$args}" while executing "gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport" ... Fix the argument passing in gdb_target_cmd. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2019-09-19 Tom de Vries * lib/gdbserver-support.exp (gdb_target_cmd): Fix argument passing. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/lib/gdbserver-support.exp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2acc1f73423..d5a5309fdf3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-09-19 Tom de Vries + + * lib/gdbserver-support.exp (gdb_target_cmd): Fix argument passing. + 2019-09-19 Tom de Vries * lib/gdbserver-support.exp (gdb_target_cmd_ext): Return 2 (meaning diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 2ad53c1f608..00f46c82649 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -112,8 +112,8 @@ proc gdb_target_cmd_ext { targetname serialport {additional_text ""} } { # Like gdb_target_cmd_ext, but returns 0 on success, 1 on failure. -proc gdb_target_cmd { $args } { - set res [gdb_target_cmd_ext $args] +proc gdb_target_cmd { args } { + set res [eval gdb_target_cmd_ext $args] return [expr $res == 0 ? 0 : 1] } -- 2.30.2