public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom de Vries <vries@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Handle remote host in gdb_load_shlib Date: Fri, 17 Mar 2023 18:25:32 +0000 (GMT) [thread overview] Message-ID: <20230317182532.D95963851171@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1850ef87c62178705d84af9b4c9cf72f17b9fd93 commit 1850ef87c62178705d84af9b4c9cf72f17b9fd93 Author: Tom de Vries <tdevries@suse.de> Date: Fri Mar 17 19:25:18 2023 +0100 [gdb/testsuite] Handle remote host in gdb_load_shlib With test-case gdb.arch/ftrace-insn-reloc.exp and host board local-remote-host-notty and target board native-gdbserver I run into: ... (gdb) tstart^M Target returns error code '.In-process agent library not loaded in process. \ Fast and static trace points unavailable.'.^M (gdb) FAIL: gdb.arch/ftrace-insn-reloc.exp: start trace experiment ... Fix this by: - handling remote host in gdb_load_shlib, and - moving the gdb_load_shlib to after the clean_restart, such that the set solib-search-path can take effect. Tested on x86_64-linux. Diff: --- gdb/testsuite/gdb.arch/ftrace-insn-reloc.exp | 2 +- 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 a00c4dbe2ff..b13438fda0e 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 8f3bbd986f5..e48b94b4696 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]" }
reply other threads:[~2023-03-17 18:25 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230317182532.D95963851171@sourceware.org \ --to=vries@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).