diff options
| author | Tom Tromey <tom@tromey.com> | 2020-02-14 14:14:38 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2020-02-14 14:14:38 -0700 |
| commit | f251f50533110132ce83678d644d53b1d1110b05 (patch) | |
| tree | df0286067321d7a43bc82893487c9720f63a95da /gdb/testsuite/lib/gdbserver-support.exp | |
| parent | e8217e61f5952ccfdabb0c4ee0c237a363e9bd99 (diff) | |
| download | gdb-f251f50533110132ce83678d644d53b1d1110b05.zip gdb-f251f50533110132ce83678d644d53b1d1110b05.tar.gz gdb-f251f50533110132ce83678d644d53b1d1110b05.tar.bz2 | |
Have testsuite find gdbserver in new location
This updates the gdb testsuite to look for gdbserver in its new
location. The old location is also checked for, on the theory that
perhaps someone sets GDB to a full path for install testing.
gdb/testsuite/ChangeLog
2020-02-14 Tom Tromey <tom@tromey.com>
* lib/gdbserver-support.exp (find_gdbserver): Find gdbserver in
build directory.
* boards/gdbserver-base.exp: Update path to gdbserver.
Change-Id: If03db762ba53882ddfaf2d2d516de14c3fa03938
Diffstat (limited to 'gdb/testsuite/lib/gdbserver-support.exp')
| -rw-r--r-- | gdb/testsuite/lib/gdbserver-support.exp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index 12796e8..706bbeb 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -138,13 +138,15 @@ proc find_gdbserver { } { return [target_info gdb_server_prog] } - set gdbserver "${GDB}server" - if { [file isdirectory $gdbserver] } { - append gdbserver "/gdbserver" - } + set toplevel [file join [file dirname $GDB] .. gdbserver] + foreach gdbserver [list "${GDB}server" $toplevel] { + if { [file isdirectory $gdbserver] } { + append gdbserver "/gdbserver" + } - if { [file executable $gdbserver] } { - return $gdbserver + if { [file executable $gdbserver] } { + return $gdbserver + } } return "" |