diff options
| -rw-r--r-- | gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp index a00c4db..b13438f 100644 --- a/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp +++ b/gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp @@ -34,7 +34,6 @@ if ![gdb_target_supports_trace] { } set libipa [get_in_proc_agent] -set remote_libipa [gdb_load_shlib $libipa] # Can't use prepare_for_testing, because that splits compiling into # building objects and then linking, and we'd fail with "linker input @@ -46,6 +45,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ return -1 } clean_restart $testfile +set remote_libipa [gdb_load_shlib $libipa] if ![runto_main] { return 0 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 8f3bbd9..e48b94b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5967,7 +5967,11 @@ proc gdb_remote_download {dest fromfile {tofile {}}} { # Copy shlib FILE to the target. proc gdb_download_shlib { file } { - return [gdb_remote_download target [shlib_target_file $file]] + set target_file [shlib_target_file $file] + if { [is_remote host] } { + remote_download host $target_file + } + return [gdb_remote_download target $target_file] } # Set solib-search-path to allow gdb to locate shlib FILE. @@ -5979,16 +5983,26 @@ proc gdb_locate_shlib { file } { perror "gdb_load_shlib: GDB is not running" } - # If the target is remote, we need to tell gdb where to find the - # libraries. - if { ![is_remote target] } { + if { [is_remote target] || [is_remote host] } { + # If the target or host is remote, we need to tell gdb where to find + # the libraries. + } else { return } # We could set this even when not testing remotely, but a user # generally won't set it unless necessary. In order to make the tests # more like the real-life scenarios, we don't set it for local testing. - gdb_test "set solib-search-path [file dirname $file]" "" \ + if { [is_remote host] } { + set solib_search_path [board_info host remotedir] + if { $solib_search_path == "" } { + set solib_search_path . + } + } else { + set solib_search_path [file dirname $file] + } + + gdb_test_no_output "set solib-search-path $solib_search_path" \ "set solib-search-path for [file tail $file]" } |