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.
171 lines
4.7 KiB
Text
171 lines
4.7 KiB
Text
# Copyright 1998-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/>.
|
|
|
|
# This file was written by Michael Snyder (msnyder@cygnus.com)
|
|
|
|
load_lib "trace-support.exp"
|
|
|
|
|
|
gdb_exit
|
|
gdb_start
|
|
|
|
standard_testfile actions.c
|
|
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
|
|
executable {debug nowarnings}] != "" } {
|
|
untested while-stepping.exp
|
|
return -1
|
|
}
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
|
|
# If testing on a remote host, download the source file.
|
|
# remote_download host $srcdir/$subdir/$srcfile
|
|
|
|
gdb_file_cmd $binfile
|
|
|
|
#
|
|
# test while-stepping command
|
|
#
|
|
|
|
gdb_delete_tracepoints
|
|
set trcpt1 [gdb_gettpnum gdb_c_test]
|
|
if { $trcpt1 <= 0 } then {
|
|
fail "Could not find gdb_c_test function"
|
|
return
|
|
}
|
|
|
|
# 5.12 basic while-stepping command (collect regs)
|
|
|
|
gdb_test "info tracepoints" \
|
|
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
|
|
\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+.
|
|
\[\t \]+not installed on target." \
|
|
"5.12: set a tracepoint, stepcount is zero"
|
|
|
|
set stepcount 12
|
|
|
|
gdb_trace_setactions "5.12: set stepcount to $stepcount" \
|
|
"" \
|
|
"while-stepping $stepcount" "" \
|
|
"collect \$regs" "^$" \
|
|
"end" ""
|
|
|
|
gdb_test "info tracepoints" \
|
|
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
|
|
\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+.
|
|
\[\t \]+while-stepping 12.*" \
|
|
"5.12: info trace shows \"while-stepping\""
|
|
|
|
# 5.13 step out of context while collecting local variable
|
|
# [deferred to dynamic test section]
|
|
|
|
proc while_stepping_bogus_arg { bogus msgstring } {
|
|
global gdb_prompt
|
|
|
|
gdb_trace_setactions "$msgstring" \
|
|
"" \
|
|
"while-stepping $bogus" ".*while-stepping step count"
|
|
}
|
|
|
|
# 5.14 while-stepping (no argument)
|
|
|
|
while_stepping_bogus_arg "" "5.14: while-stepping null stepcount"
|
|
|
|
# 5.15 while-stepping (zero stepcount)
|
|
|
|
while_stepping_bogus_arg "0" "5.15: while-stepping rejects zero stepcount"
|
|
|
|
# 5.16 while-stepping without collecting anything
|
|
gdb_trace_setactions "5.16: step without collecting anything" \
|
|
"" \
|
|
"while-stepping $stepcount" "^$" \
|
|
"end" ""
|
|
|
|
gdb_test "info tracepoints" \
|
|
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
|
|
\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+.
|
|
.*while-stepping $stepcount.*
|
|
.*end.*" \
|
|
"5.16: confirm actions, step without collecting anything"
|
|
|
|
gdb_test "break main"
|
|
gdb_run_cmd
|
|
gdb_test "" "Breakpoint .*"
|
|
if ![gdb_target_supports_trace] {
|
|
unsupported "target does not support trace"
|
|
return -1
|
|
}
|
|
|
|
gdb_trace_setactions "set stepcount to $stepcount" \
|
|
"" \
|
|
"while-stepping $stepcount" "" \
|
|
"collect \$regs " "^$" \
|
|
"collect \$locals " "^$" \
|
|
"end" ""
|
|
|
|
proc check_tracepoint { data_source } {
|
|
with_test_prefix "$data_source" {
|
|
global srcfile
|
|
global stepcount
|
|
|
|
gdb_test "info tracepoints" \
|
|
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
|
|
\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+.
|
|
\[\t \]+while-stepping $stepcount.*
|
|
\[\t \]+collect \\\$regs.*
|
|
\[\t \]+collect \\\$locals.*
|
|
\[\t \]+end.*"
|
|
}
|
|
}
|
|
|
|
gdb_test_no_output "tstart"
|
|
check_tracepoint "live"
|
|
gdb_test_no_output "tstop"
|
|
set tracefile [standard_output_file ${testfile}]
|
|
gdb_test "tsave ${tracefile}.tf" \
|
|
"Trace data saved to file '${tracefile}.tf'\.\\r" \
|
|
"save tfile trace file"
|
|
gdb_test "tsave -ctf ${tracefile}.ctf" \
|
|
"Trace data saved to directory '${tracefile}.ctf'\.\\r" \
|
|
"save ctf trace file"
|
|
|
|
# Restart GDB and read the trace data in tfile target.
|
|
gdb_exit
|
|
gdb_start
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
gdb_file_cmd $binfile
|
|
gdb_test "target tfile ${tracefile}.tf" ".*" \
|
|
"change to tfile target"
|
|
check_tracepoint "tfile"
|
|
|
|
# Try to read ctf data if GDB supports.
|
|
set gdb_can_read_ctf_data 0
|
|
gdb_test_multiple "target ctf" "" {
|
|
-re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
|
|
set gdb_can_read_ctf_data 0
|
|
}
|
|
-re "No CTF directory specified.*\r\n$gdb_prompt $" {
|
|
set gdb_can_read_ctf_data 1
|
|
}
|
|
}
|
|
|
|
if { $gdb_can_read_ctf_data } {
|
|
gdb_exit
|
|
gdb_start
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
gdb_file_cmd $binfile
|
|
gdb_test "target ctf ${tracefile}.ctf" ".*" \
|
|
"change to ctf target"
|
|
check_tracepoint "ctf"
|
|
}
|