[binutils-gdb] [gdb/testsuite] Fix gdb.server/unittest.exp with host board local-remote-host.exp

[binutils-gdb] [gdb/testsuite] Fix gdb.server/unittest.exp with host board local-remote-host.exp

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7c635f3e61e014d713f7fc884215576187fda038

commit 7c635f3e61e014d713f7fc884215576187fda038
Author: Tom de Vries <tdevries@suse.de>
Date:   Fri Oct 14 19:59:26 2022 +0200

    [gdb/testsuite] Fix gdb.server/unittest.exp with host board local-remote-host.exp
    
    With test-case gdb.server/unittest.exp and host board local-remote-host.exp I
    run into:
    ...
    builtin_spawn build/gdbserver/gdbserver --selftest^M
    ERROR: : spawn id exp7 not open
        while executing
    "expect {
    -i exp7 -timeout 10
        -i $server_spawn_id
        -re "Ran ($decimal) unit tests, 0 failed" {
            set num_ran $expect_out(1,string)
            gdb_assert "..."
        ("uplevel" body line 1)
        invoked from within
    "uplevel $body" NONE : spawn id exp7 not open
    UNRESOLVED: gdb.server/unittest.exp: unit tests
    ...
    
    The problem is (as fixed for avr in commit df5b8876083 ("gdb/testsuite: better
    handle failures in simavr board, reap simavr process")), that gdb_expect through
    remote_expect adds a "-i <gdb spawn id> -timeout 10", which is the one causing
    the error.
    
    As in aforementioned commit, fix this by using expect instead.
    
    Tested on x86_64-linux.

Diff:
---
 gdb/testsuite/gdb.server/unittest.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.server/unittest.exp b/gdb/testsuite/gdb.server/unittest.exp
index 57157ef8d35..d083ef25487 100644
--- a/gdb/testsuite/gdb.server/unittest.exp
+++ b/gdb/testsuite/gdb.server/unittest.exp
@@ -31,7 +31,7 @@ set gdbserver_command "$gdbserver --selftest"
 set server_spawn_id [remote_spawn target $gdbserver_command]
 
 set test "unit tests"
-gdb_expect {
+expect {
     -i $server_spawn_id
     -re "Ran ($decimal) unit tests, 0 failed" {
 	set num_ran $expect_out(1,string)