diff options
author | Simon Marchi <simon.marchi@ericsson.com> | 2016-04-28 09:49:01 -0400 |
---|---|---|
committer | Simon Marchi <simon.marchi@ericsson.com> | 2016-04-28 09:49:01 -0400 |
commit | 952ebca5831911a8ef2a79f6e1e7a2c24f71a388 (patch) | |
tree | 7bd8c5c2de97f877a8b0765c670f357c681392b5 /gdb/testsuite/gdb.trace/range-stepping.exp | |
parent | 786a118cdf1aa33a8c232c63307e6711a0c00dfb (diff) | |
download | gdb-952ebca5831911a8ef2a79f6e1e7a2c24f71a388.zip gdb-952ebca5831911a8ef2a79f6e1e7a2c24f71a388.tar.gz gdb-952ebca5831911a8ef2a79f6e1e7a2c24f71a388.tar.bz2 |
ftrace tests: Use gdb_load_shlib result to lookup IPA in info sharedlibrary
Some fast tracepoints tests make sure that the in-process agent library
is properly loaded, by searching for the library name in "info
sharedlibrary".
Originally, it would search for the full path. Since patch "Make ftrace
tests work with remote targets" [1], the "runtime" location of the IPA,
in the standard output directory, is not the same as the original
location, in the gdbserver build directory. Therefore, the patch
changed the checks:
gdb_test "info sharedlibrary" ".*${libipa}.*" "IPA loaded"
to
gdb_test "info sharedlibrary" ".*[file tail ${libipa}].*" "IPA loaded"
so that only the "libinproctrace.so" part would be searched for.
Antoine (in CC) pointed out that I missed some, so I have to update
them. In the mean time, I noticed that I missed a few test failures:
adding the SONAME to the IPA makes it possible for the test executable
to erroneously pick up libinproctrace.so from /usr/lib if the test
harness failed to put the libinproctrace.so we want to test in the right
place. To mitigate that kind of error in the future, we can use the
return value of gdb_load_shlib (the path of the "runtime" version of the
library) and use that to search in the output of info sharedlibrary.
When testing locally, gdb_load_shlib returns the full normalized path of
the destination library, which the test executable should use e.g.:
/path/to/gdb/testsuite/outputs/gdb.trace/thetest/libinproctrace.so
My testing showed that it was the same path that gdb displayed in info
sharedlibrary. If the test executable picks up another
libinproctrace.so, the test will fail.
When testing remotely, gdb_load_shlib/gdb_remote_download only returns
us "libinproctrace.so", so the situation doesn't really change. If
there is a rogue libinproctrace.so in /usr/lib on the target and we fail
to download ours, it might cover up a test failure. But that situation
is probably still better than the original one, where it wasn't possible
to test remotely using the IPA at all.
[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=6e774b13c3b81ac2599812adf058796948ce7e95
gdb/testsuite/ChangeLog:
* gdb.arch/ftrace-insn-reloc.exp: Save gdb_load_shlib result,
use it in info sharedlibrary test.
* gdb.trace/ftrace-lock.exp: Likewise.
* gdb.trace/ftrace.exp: Likewise.
* gdb.trace/range-stepping.exp: Likewise.
* gdb.trace/trace-break.exp: Likewise.
* gdb.trace/trace-condition.exp: Likewise.
* gdb.trace/trace-mt.exp: Likewise.
Diffstat (limited to 'gdb/testsuite/gdb.trace/range-stepping.exp')
-rw-r--r-- | gdb/testsuite/gdb.trace/range-stepping.exp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp index b135963..ba8c3d2 100644 --- a/gdb/testsuite/gdb.trace/range-stepping.exp +++ b/gdb/testsuite/gdb.trace/range-stepping.exp @@ -67,7 +67,7 @@ proc range_stepping_with_tracepoint { type } { range_stepping_with_tracepoint "trace" set libipa [get_in_proc_agent] -gdb_load_shlib $libipa +set remote_libipa [gdb_load_shlib $libipa] if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ executable [list debug nowarnings shlib=$libipa] ] != "" } { @@ -83,7 +83,7 @@ if ![runto_main] { } gdb_reinitialize_dir $srcdir/$subdir -if { [gdb_test "info sharedlibrary" ".*${libipa}.*" "IPA loaded"] != 0 } { +if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } { untested "Could not find IPA lib loaded" } else { range_stepping_with_tracepoint "ftrace" |