From f251f50533110132ce83678d644d53b1d1110b05 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 14 Feb 2020 14:14:38 -0700 Subject: 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 * lib/gdbserver-support.exp (find_gdbserver): Find gdbserver in build directory. * boards/gdbserver-base.exp: Update path to gdbserver. Change-Id: If03db762ba53882ddfaf2d2d516de14c3fa03938 --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/boards/gdbserver-base.exp | 2 +- gdb/testsuite/lib/gdbserver-support.exp | 14 ++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 469ebc2..1a9203c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-02-14 Tom Tromey + + * 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 * lib/ada.exp (gdb_compile_ada): Delete stale exec before compilation. diff --git a/gdb/testsuite/boards/gdbserver-base.exp b/gdb/testsuite/boards/gdbserver-base.exp index 4db834d..f27a2fd 100644 --- a/gdb/testsuite/boards/gdbserver-base.exp +++ b/gdb/testsuite/boards/gdbserver-base.exp @@ -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. 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 "" -- cgit v1.1