952ebca583
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.
134 lines
3.9 KiB
Text
134 lines
3.9 KiB
Text
# Copyright 2012-2016 Free Software Foundation, Inc.
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
load_lib "trace-support.exp"
|
|
|
|
standard_testfile
|
|
set executable $testfile
|
|
set expfile $testfile.exp
|
|
|
|
# Some targets have leading underscores on assembly symbols.
|
|
set additional_flags [gdb_target_symbol_prefix_flags]
|
|
|
|
if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
|
|
executable [list debug $additional_flags] ] != "" } {
|
|
untested "Couldn't compile test program"
|
|
return -1
|
|
}
|
|
|
|
clean_restart ${testfile}
|
|
|
|
if ![runto_main] {
|
|
fail "Can't run to main to check for trace support"
|
|
return -1
|
|
}
|
|
|
|
if ![gdb_target_supports_trace] {
|
|
unsupported "target does not support trace"
|
|
return -1
|
|
}
|
|
|
|
proc step_over_tracepoint { trace_type } \
|
|
{with_test_prefix "step over $trace_type" \
|
|
{
|
|
global executable
|
|
global hex
|
|
|
|
# Start with a fresh gdb.
|
|
clean_restart ${executable}
|
|
# Make sure inferior is running in all-stop mode.
|
|
gdb_test_no_output "set non-stop 0"
|
|
if ![runto_main] {
|
|
fail "Can't run to main"
|
|
return -1
|
|
}
|
|
|
|
gdb_test "break set_point1" "Breakpoint \[0-9\] at $hex: file.*"
|
|
gdb_test "continue" "Continuing\\.\[ \r\n\]+.*Breakpoint.*" "continue to set_point1"
|
|
|
|
gdb_test "${trace_type} *\$pc" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "stepi" ".*"
|
|
gdb_test_no_output "tstop"
|
|
}}
|
|
|
|
# Set breakpoint and tracepoint at the same address.
|
|
|
|
proc break_trace_same_addr { trace_type option } \
|
|
{with_test_prefix "$trace_type $option" \
|
|
{
|
|
global executable
|
|
global hex
|
|
|
|
# Start with a fresh gdb.
|
|
clean_restart ${executable}
|
|
if ![runto_main] {
|
|
fail "Can't run to main"
|
|
return -1
|
|
}
|
|
|
|
gdb_test_no_output "set breakpoint always-inserted ${option}"
|
|
|
|
gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
|
|
|
|
gdb_test "break set_point1" "Breakpoint \[0-9\] at $hex: file.*"
|
|
gdb_test "${trace_type} set_point1" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "continue" "Continuing\\.\[ \r\n\]+.*Breakpoint.*" "continue to set_point1 1"
|
|
gdb_test "continue" "Continuing\\.\[ \r\n\]+.*Breakpoint.*" "continue to set_point1 2"
|
|
|
|
gdb_test "continue" "Continuing\\.\[ \r\n\]+.*Breakpoint.*" "continue to end"
|
|
gdb_test_no_output "tstop"
|
|
|
|
gdb_test "tfind" "Found trace frame 0, tracepoint .*" "tfind frame 0"
|
|
gdb_test "tfind" "Found trace frame 1, tracepoint .*" "tfind frame 1"
|
|
|
|
gdb_test "tfind" "Target failed to find requested trace frame\\..*"
|
|
}}
|
|
|
|
foreach break_always_inserted { "on" "off" } {
|
|
break_trace_same_addr "trace" ${break_always_inserted}
|
|
}
|
|
|
|
step_over_tracepoint "trace"
|
|
|
|
set libipa [get_in_proc_agent]
|
|
set remote_libipa [gdb_load_shlib $libipa]
|
|
|
|
# Compile test case again with IPA.
|
|
if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
|
|
executable [list debug $additional_flags shlib=$libipa] ] != "" } {
|
|
untested "failed to compile ftrace tests"
|
|
return -1
|
|
}
|
|
clean_restart ${executable}
|
|
|
|
if ![runto_main] {
|
|
fail "Can't run to main for ftrace tests"
|
|
return 0
|
|
}
|
|
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 } {
|
|
untested "Could not find IPA lib loaded"
|
|
} else {
|
|
foreach break_always_inserted { "on" "off" } {
|
|
break_trace_same_addr "ftrace" ${break_always_inserted}
|
|
}
|
|
|
|
step_over_tracepoint "ftrace"
|
|
}
|