[binutils-gdb] [gdb/testsuite] Fix gdbserver path in remote-stdio-gdbserver.exp

[binutils-gdb] [gdb/testsuite] Fix gdbserver path in remote-stdio-gdbserver.exp

[Tom de Vries]

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

commit 593dda1880146c1487828f2878d5e74c9b1b42ad
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Mar 9 10:45:03 2023 +0100

    [gdb/testsuite] Fix gdbserver path in remote-stdio-gdbserver.exp
    
    With test-case gdb.server/unittest.exp and target board remote-stdio-gdbserver
    I run into:
    ...
    (gdb) builtin_spawn /usr/bin/ssh -t -l vries localhost /usr/bin/gdbserver \
      --selftest^M
    Selftests have been disabled for this build.^M
    UNSUPPORTED: gdb.server/unittest.exp: unit tests
    ...
    due to using the system gdbserver /usr/bin/gdbserver rather than the one from
    the build.
    
    Fix this by removing the hard-coding of /usr/bin/gdbserver in
    remote-stdio-gdbserver, allowing find_gdbserver to do its work, such that we
    have instead:
    ...
    (gdb) builtin_spawn /usr/bin/ssh -t -l vries localhost \
      /data/vries/gdb/leap-15-4/build/gdbserver/gdbserver --selftest^M
    Running selftest remote_memory_tagging.^M
    Ran 1 unit tests, 0 failed^M
    Connection to localhost closed.^M^M
    PASS: gdb.server/unittest.exp: unit tests
    ...
    
    Tested on x86_64-linux.

Diff:
---
 gdb/testsuite/boards/remote-stdio-gdbserver.exp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gdb/testsuite/boards/remote-stdio-gdbserver.exp b/gdb/testsuite/boards/remote-stdio-gdbserver.exp
index 47a0577733c..479dfb066a4 100644
--- a/gdb/testsuite/boards/remote-stdio-gdbserver.exp
+++ b/gdb/testsuite/boards/remote-stdio-gdbserver.exp
@@ -47,11 +47,9 @@ if [info exists REMOTE_TMPDIR] {
     set_board_info remotedir $REMOTE_TMPDIR
 }
 
-unset_board_info gdb_server_prog
 if [info exists GDBSERVER] {
+    unset_board_info gdb_server_prog
     set_board_info gdb_server_prog $GDBSERVER
-} else {
-    set_board_info gdb_server_prog /usr/bin/gdbserver
 }
 
 proc get_remote_login { } {