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
This commit is contained in:
Tom Tromey 2020-02-14 14:14:38 -07:00
parent e8217e61f5
commit f251f50533
3 changed files with 15 additions and 7 deletions

View File

@ -1,3 +1,9 @@
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.
2020-02-13 Tom de Vries <tdevries@suse.de>
* lib/ada.exp (gdb_compile_ada): Delete stale exec before compilation.

View File

@ -22,7 +22,7 @@ process_multilib_options ""
set_board_info compiler "[find_gcc]"
# Test the copy of gdbserver in the build directory.
set_board_info gdb_server_prog "[pwd]/../gdbserver/gdbserver"
set_board_info gdb_server_prog "[pwd]/../../gdbserver/gdbserver"
# gdbserver does not intercept target file operations and perform them
# on the host.

View File

@ -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 ""