4ec7020176
A few months ago semicolons after "return" were removed throughout the testsuite. However, as I pointed out in review, they're unnecessary not just after "return", but pretty much after any tcl command. ';' is the command separator, and you only need it if there's another command on the same line afterwards. This patch was written by running: $ find . -name "*.exp" | xargs grep -l ";\s*$" | xargs sed -i 's/\([^#][^\s*;]*\)\s*;\s*$/\1/' and then undoing changes to comments, and lib/future.exp. Tested on x86_64 Fedora 17. gdb/testsuite/ 2013-06-07 Pedro Alves <palves@redhat.com> * boards/native-extended-gdbserver.exp: Remove semicolon. * config/arm-ice.exp: Likewise. * config/bfin.exp: Likewise. * config/cygmon.exp: Likewise. * config/h8300.exp: Likewise. * config/monitor.exp: Likewise. * config/sid.exp: Likewise. * config/sim.exp: Likewise. * config/slite.exp: Likewise. * config/vx.exp: Likewise. * gdb.arch/i386-bp_permanent.exp: Likewise. * gdb.asm/asm-source.exp: Likewise. * gdb.base/args.exp: Likewise. * gdb.base/attach-pie-misread.exp: Likewise. * gdb.base/auxv.exp: Likewise. * gdb.base/bigcore.exp: Likewise. * gdb.base/bitfields2.exp: Likewise. * gdb.base/bitfields.exp: Likewise. * gdb.base/break.exp: Likewise. * gdb.base/break-interp.exp: Likewise. * gdb.base/callfuncs.exp: Likewise. * gdb.base/call-sc.exp: Likewise. * gdb.base/commands.exp: Likewise. * gdb.base/corefile.exp: Likewise. * gdb.base/dbx.exp: Likewise. * gdb.base/ending-run.exp: Likewise. * gdb.base/exprs.exp: Likewise. * gdb.base/funcargs.exp: Likewise. * gdb.base/hbreak2.exp: Likewise. * gdb.base/huge.exp: Likewise. * gdb.base/list.exp: Likewise. * gdb.base/memattr.exp: Likewise. * gdb.base/overlays.exp: Likewise. * gdb.base/printcmds.exp: Likewise. * gdb.base/recurse.exp: Likewise. * gdb.base/remotetimeout.exp: Likewise. * gdb.base/reread.exp: Likewise. * gdb.base/savedregs.exp: Likewise. * gdb.base/scope.exp: Likewise. * gdb.base/sepdebug.exp: Likewise. * gdb.base/setshow.exp: Likewise. * gdb.base/setvar.exp: Likewise. * gdb.base/sigaltstack.exp: Likewise. * gdb.base/siginfo-addr.exp: Likewise. * gdb.base/siginfo.exp: Likewise. * gdb.base/siginfo-obj.exp: Likewise. * gdb.base/sigrepeat.exp: Likewise. * gdb.base/sigstep.exp: Likewise. * gdb.base/structs.exp: Likewise. * gdb.base/testenv.exp: Likewise. * gdb.base/twice.exp: Likewise. * gdb.base/valgrind-db-attach.exp: Likewise. * gdb.base/valgrind-infcall.exp: Likewise. * gdb.base/varargs.exp: Likewise. * gdb.base/watchpoint.exp: Likewise. * gdb.cp/gdb1355.exp: Likewise. * gdb.cp/misc.exp: Likewise. * gdb.disasm/hppa.exp: Likewise. * gdb.disasm/t01_mov.exp: Likewise. * gdb.disasm/t02_mova.exp: Likewise. * gdb.disasm/t03_add.exp: Likewise. * gdb.disasm/t04_sub.exp: Likewise. * gdb.disasm/t05_cmp.exp: Likewise. * gdb.disasm/t06_ari2.exp: Likewise. * gdb.disasm/t07_ari3.exp: Likewise. * gdb.disasm/t08_or.exp: Likewise. * gdb.disasm/t09_xor.exp: Likewise. * gdb.disasm/t10_and.exp: Likewise. * gdb.disasm/t11_logs.exp: Likewise. * gdb.disasm/t12_bit.exp: Likewise. * gdb.disasm/t13_otr.exp: Likewise. * gdb.gdb/selftest.exp: Likewise. * gdb.hp/gdb.base-hp/callfwmall.exp: Likewise. * gdb.mi/mi-reverse.exp: Likewise. * gdb.pascal/floats.exp: Likewise. * gdb.python/py-inferior.exp: Likewise. * gdb.threads/attach-into-signal.exp: Likewise. * gdb.threads/pthreads.exp: Likewise. * gdb.threads/thread_events.exp: Likewise. * gdb.threads/watchthreads.exp: Likewise. * gdb.trace/actions-changed.exp: Likewise. * gdb.trace/actions.exp: Likewise. * gdb.trace/ax.exp: Likewise. * gdb.trace/backtrace.exp: Likewise. * gdb.trace/change-loc.exp: Likewise. * gdb.trace/deltrace.exp: Likewise. * gdb.trace/disconnected-tracing.exp: Likewise. * gdb.trace/ftrace.exp: Likewise. * gdb.trace/infotrace.exp: Likewise. * gdb.trace/passc-dyn.exp: Likewise. * gdb.trace/passcount.exp: Likewise. * gdb.trace/pending.exp: Likewise. * gdb.trace/qtro.exp: Likewise. * gdb.trace/range-stepping.exp: Likewise. * gdb.trace/report.exp: Likewise. * gdb.trace/save-trace.exp: Likewise. * gdb.trace/status-stop.exp: Likewise. * gdb.trace/strace.exp: Likewise. * gdb.trace/tfile.exp: Likewise. * gdb.trace/tfind.exp: Likewise. * gdb.trace/trace-break.exp: Likewise. * gdb.trace/tracecmd.exp: Likewise. * gdb.trace/trace-mt.exp: Likewise. * gdb.trace/tspeed.exp: Likewise. * gdb.trace/tsv.exp: Likewise. * gdb.trace/while-stepping.exp: Likewise. * lib/gdb.exp: Likewise. * lib/gdbserver-support.exp: Likewise. * lib/java.exp: Likewise. * lib/mi-support.exp: Likewise. * lib/pascal.exp: Likewise. * lib/prompt.exp: Likewise. * lib/trace-support.exp: Likewise.
172 lines
4.6 KiB
Text
172 lines
4.6 KiB
Text
# Copyright 2011-2013 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 [prepare_for_testing $expfile $executable $srcfile \
|
|
[list debug $additional_flags]] {
|
|
untested "failed to prepare for trace tests"
|
|
return -1
|
|
}
|
|
|
|
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
|
|
}
|
|
|
|
set libipa [get_in_proc_agent]
|
|
gdb_load_shlibs $libipa
|
|
|
|
# Can't use prepare_for_testing, because that splits compiling into
|
|
# building objects and then linking, and we'd fail with "linker input
|
|
# file unused because linking not done" when building the object.
|
|
|
|
if { [gdb_compile "$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
|
|
}
|
|
|
|
proc run_trace_experiment {} {
|
|
|
|
gdb_test "continue" \
|
|
".*Breakpoint \[0-9\]+, begin .*" \
|
|
"advance to trace begin"
|
|
|
|
gdb_test_no_output "tstart" "start trace experiment"
|
|
|
|
gdb_test "continue" \
|
|
".*Breakpoint \[0-9\]+, end .*" \
|
|
"advance through tracing"
|
|
|
|
gdb_test "tstatus" ".*Trace .*" "check on trace status"
|
|
|
|
gdb_test "tstop" "" ""
|
|
}
|
|
|
|
proc test_fast_tracepoints {} {
|
|
global gdb_prompt
|
|
|
|
set fourgood 0
|
|
|
|
gdb_test "break begin" ".*" ""
|
|
|
|
gdb_test "break end" ".*" ""
|
|
|
|
gdb_test "print gdb_agent_gdb_trampoline_buffer_error" ".*" ""
|
|
|
|
if { [istarget "x86_64-*-*"] || [istarget "i\[34567\]86-*-*"] } {
|
|
|
|
gdb_test "ftrace set_point" "Fast tracepoint .*" \
|
|
"fast tracepoint at a long insn"
|
|
|
|
gdb_trace_setactions "collect at set_point: define actions" \
|
|
"" \
|
|
"collect globvar, anarg" "^$"
|
|
|
|
# Make a test of shorter fast tracepoints, 32-bit x86 only
|
|
|
|
if { [istarget "i?86-*-*"] } {
|
|
|
|
# A Linux target needs to be able to allocate trampolines in the
|
|
# 16-bit range, check mmap_min_addr so we can warn testers.
|
|
if { [istarget "i?86-*-linux*"] } {
|
|
|
|
set minaddr [exec sh -c "cat /proc/sys/vm/mmap_min_addr"]
|
|
|
|
if { [expr $minaddr > 64512] } {
|
|
warning "mmap_min_addr > 64512, fast tracepoint will fail"
|
|
warning "do \"sudo sysctl -w vm.mmap_min_addr=32768\" to adjust"
|
|
}
|
|
}
|
|
|
|
gdb_test_multiple "ftrace four_byter" "set 4-byte fast tracepoint" {
|
|
-re "May not have a fast tracepoint at .*\r\n$gdb_prompt $" {
|
|
pass "4-byte fast tracepoint could not be set"
|
|
}
|
|
-re "Fast tracepoint .*\r\n$gdb_prompt $" {
|
|
pass "4-byte fast tracepoint is set"
|
|
set fourgood 1
|
|
}
|
|
}
|
|
|
|
if { $fourgood } {
|
|
|
|
gdb_trace_setactions "collect at four_byter: define actions" \
|
|
"" \
|
|
"collect globvar, anarg" "^$"
|
|
}
|
|
}
|
|
|
|
run_trace_experiment
|
|
|
|
gdb_test "tfind pc *set_point" "Found trace frame .*" \
|
|
"tfind set_point frame, first time"
|
|
|
|
setup_kfail "gdb/13808" "x86_64-*-linux*"
|
|
gdb_test "print globvar" " = 1"
|
|
|
|
gdb_test "tfind pc *set_point" "Found trace frame .*" \
|
|
"tfind set_point frame, second time"
|
|
|
|
setup_kfail "gdb/13808" "x86_64-*-linux*"
|
|
gdb_test "print anarg" " = 200"
|
|
|
|
gdb_test "tfind start" "Found trace frame .*" \
|
|
"reset tfinding"
|
|
|
|
if { $fourgood } {
|
|
|
|
gdb_test "tfind pc *four_byter" "Found trace frame .*" \
|
|
"tfind four_byter frame, first time"
|
|
|
|
gdb_test "print anarg" " = 101" \
|
|
"look at collected local, first time"
|
|
|
|
gdb_test "tfind pc *four_byter" "Found trace frame .*" \
|
|
"tfind four_byter frame, second time"
|
|
|
|
gdb_test "print anarg" " = 201" \
|
|
"look at collected local, second time"
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
|
|
if { [gdb_test "info sharedlibrary" ".*${libipa}.*" "IPA loaded"] != 0 } {
|
|
untested "Could not find IPA lib loaded"
|
|
return 1
|
|
}
|
|
|
|
test_fast_tracepoints
|