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.
174 lines
4.6 KiB
Text
174 lines
4.6 KiB
Text
# Copyright 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
|
|
|
|
if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
|
|
return -1
|
|
}
|
|
|
|
proc test_actions_changed { } {
|
|
gdb_breakpoint "end"
|
|
|
|
gdb_test "trace subr" "Tracepoint .*" \
|
|
"tracepoint at subr"
|
|
|
|
# The first set of tests are regression tests for a GDB bug where
|
|
# the while-stepping count of a tracepoint would be left stale if
|
|
# the tracepoint's actions were redefined, and the new action list
|
|
# had no while-stepping action.
|
|
|
|
# First pass, define simple action.
|
|
with_test_prefix "1" {
|
|
gdb_trace_setactions "define simple action" \
|
|
"" \
|
|
"collect parm" "^$"
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=1\\) .*" \
|
|
"advance through tracing"
|
|
|
|
gdb_test "tstatus" ".*Collected 1 trace frame.*" \
|
|
"collected 1 trace frame"
|
|
|
|
gdb_test_no_output "tstop"
|
|
}
|
|
|
|
# Redefine action, run second trace.
|
|
with_test_prefix "2" {
|
|
gdb_trace_setactions "redefine simple action" \
|
|
"" \
|
|
"collect keeping, busy" "^$"
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=2\\) .*" \
|
|
"advance through tracing"
|
|
|
|
gdb_test "tstatus" ".*Collected 1 trace frame.*" \
|
|
"collected 1 trace frame"
|
|
|
|
gdb_test_no_output "tstop"
|
|
}
|
|
|
|
# Redefine to stepping action, run third trace.
|
|
with_test_prefix "3" {
|
|
gdb_trace_setactions "redefine to stepping action" \
|
|
"" \
|
|
"collect parm" "^$" \
|
|
"while-stepping 5" "^$" \
|
|
"collect parm" "^$" \
|
|
"end" "^$"
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=3\\) .*" \
|
|
"advance through tracing"
|
|
|
|
gdb_test "tstatus" ".*Collected 6 trace frames.*" \
|
|
"collected 6 trace frames"
|
|
|
|
gdb_test_no_output "tstop"
|
|
}
|
|
|
|
# Redefine to non-stepping, run fourth trace.
|
|
with_test_prefix "4" {
|
|
gdb_trace_setactions "redefine to non-stepping action" \
|
|
"" \
|
|
"collect parm" "^$"
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=4\\) .*" \
|
|
"advance through tracing"
|
|
|
|
gdb_test "tstatus" ".*Collected 1 trace frame.*" \
|
|
"collected 1 trace frame"
|
|
|
|
gdb_test_no_output "tstop"
|
|
}
|
|
|
|
# The following tests are related to the above, but use two
|
|
# tracepoints. They are regression tests for a GDB bug where only
|
|
# the first tracepoint would end up with the step count set.
|
|
|
|
# Store the first tracepoint's number.
|
|
gdb_test_no_output "set \$prev_tpnum=\$tpnum" "store previous \$tpnum"
|
|
|
|
# And here's the second tracepoint.
|
|
gdb_test "trace subr2" "Tracepoint .*" "tracepoint at subr2"
|
|
|
|
# Set a stepping action in both tracepoints, with the "commands"
|
|
# command.
|
|
with_test_prefix "5" {
|
|
gdb_trace_setcommands \
|
|
"redefine 2 tracepoints to stepping action, using commands" \
|
|
"\$prev_tpnum-\$tpnum" \
|
|
"collect parm" "^$" \
|
|
"while-stepping 5" "^$" \
|
|
"collect parm" "^$" \
|
|
"end" "^$"
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=5\\) .*" \
|
|
"advance through tracing"
|
|
|
|
gdb_test "tstatus" ".*Collected 12 trace frames.*" \
|
|
"collected 12 trace frames"
|
|
|
|
gdb_test_no_output "tstop"
|
|
}
|
|
|
|
# Redefine the actions of both tracepoints to non-stepping, also
|
|
# using the "commands" command.
|
|
with_test_prefix "6" {
|
|
gdb_trace_setcommands \
|
|
"redefine 2 tracepoints to non-stepping action, using commands" \
|
|
"\$prev_tpnum-\$tpnum" \
|
|
"collect parm" "^$"
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "continue" ".*Breakpoint \[0-9\]+, end \\(i=6\\) .*" \
|
|
"advance through tracing"
|
|
|
|
gdb_test "tstatus" ".*Collected 2 trace frame.*" \
|
|
"collected 2 trace frames"
|
|
|
|
gdb_test_no_output "tstop"
|
|
}
|
|
}
|
|
|
|
# Check whether the target supports tracepoints.
|
|
|
|
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 "Current target does not support trace"
|
|
return -1
|
|
}
|
|
|
|
test_actions_changed
|
|
|
|
return 0
|