Re: [PATCH][gdb/testsuite] Handle unreachable network in server-connect.exp

[Tom de Vries <tdevries@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 713 bytes --]

On 18-09-19 23:27, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:
> 
> Tom> So, I'm attaching an updated patch that does not modify the existing
> Tom> semantics of gdb_target_cmd.
> 
> Tom> 2019-09-14  Tom de Vries  <tdevries@suse.de>
> 
> Tom> 	* lib/gdbserver-support.exp (gdb_target_cmd_ext): Return 2 (meaning
> Tom> 	UNSUPPORTED) for 'Network is unreachable' message.  Factor out of ...
> Tom> 	(gdb_target_cmd): ... here.
> Tom> 	* gdb.server/server-connect.exp: Use gdb_target_cmd_ext, handle return
> Tom> 	value 2.
> 
> Thanks you for doing this.  This is ok.

I did not find any FAILs when testing this, but in fact there were errors.

Fixed with this commit.

Thanks,
- Tom

[-- Attachment #2: 0001-gdb-testsuite-Fix-gdb_target_cmd.patch --]
[-- Type: text/x-patch, Size: 1238 bytes --]

gdb/testsuite/ChangeLog:

2019-09-19  Tom de Vries  <tdevries@suse.de>

	* lib/gdbserver-support.exp:

[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.

---
 gdb/testsuite/lib/gdbserver-support.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index 2ad53c1f60..00f46c8264 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]
 }