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.
149 lines
4.1 KiB
Text
149 lines
4.1 KiB
Text
# Copyright 2012-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/>.
|
|
|
|
# Test of disconnected-tracing.
|
|
|
|
load_lib "trace-support.exp"
|
|
|
|
standard_testfile
|
|
set executable $testfile
|
|
set expfile $testfile.exp
|
|
set gdbserver_reconnect_p 1
|
|
|
|
if { [info proc gdb_reconnect] == "" } {
|
|
unsupported "target does not support reconnect"
|
|
return -1
|
|
}
|
|
|
|
if [prepare_for_testing $expfile $executable $srcfile \
|
|
{debug nowarnings}] {
|
|
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
|
|
}
|
|
|
|
# Disconnect in tracing.
|
|
|
|
proc disconnected_tracing { } {
|
|
with_test_prefix "trace" {
|
|
global executable
|
|
global decimal
|
|
global srcfile
|
|
|
|
# Start with a fresh gdb.
|
|
clean_restart ${executable}
|
|
if ![runto_main] {
|
|
fail "Can't run to main"
|
|
return -1
|
|
}
|
|
|
|
gdb_test_no_output "set confirm off"
|
|
gdb_test_no_output "set disconnected-tracing on"
|
|
gdb_test "trace start" ".*"
|
|
gdb_trace_setactions "collect on tracepoint 2" "2" \
|
|
"collect foo" "^$"
|
|
gdb_test "break end" "Breakpoint ${decimal} at .*"
|
|
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*"
|
|
gdb_test_no_output "tstop"
|
|
|
|
gdb_test "info tracepoints" ".*in start at.*" \
|
|
"first info tracepoints"
|
|
|
|
gdb_test "disconnect" "Ending remote debugging\\." "first disconnect"
|
|
if { [gdb_reconnect] == 0 } {
|
|
pass "first reconnect after unload"
|
|
} else {
|
|
fail "first reconnect after unload"
|
|
return 0
|
|
}
|
|
gdb_test "info tracepoints" ".*in start at.*" \
|
|
"second info tracepoints"
|
|
|
|
delete_breakpoints
|
|
gdb_test "info tracepoints" ".*No tracepoints..*" \
|
|
"third info tracepoints"
|
|
|
|
gdb_test "disconnect" "Ending remote debugging\\." "second disconnect"
|
|
if { [gdb_reconnect] == 0 } {
|
|
pass "second reconnect after unload"
|
|
} else {
|
|
fail "second reconnect after unload"
|
|
return 0
|
|
}
|
|
gdb_test "tstatus"
|
|
gdb_test "info tracepoints" \
|
|
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
|
|
\[0-9\]+\[\t \]+tracepoint keep y.* in start at .*$srcfile:\[0-9\]+.
|
|
\[\t \]+tracepoint already hit 1 time.
|
|
\[\t \]+trace buffer usage ${decimal} bytes.
|
|
\[\t \]+collect foo.*" \
|
|
"fourth info tracepoints"
|
|
}
|
|
}
|
|
|
|
disconnected_tracing
|
|
|
|
# Disconnected in tfind
|
|
|
|
proc disconnected_tfind { } {
|
|
with_test_prefix "tfind" {
|
|
global executable
|
|
global decimal
|
|
|
|
# Start with a fresh gdb.
|
|
clean_restart ${executable}
|
|
if ![runto_main] {
|
|
fail "Can't run to main"
|
|
return -1
|
|
}
|
|
|
|
gdb_test_no_output "set confirm off"
|
|
gdb_test_no_output "set disconnected-tracing on"
|
|
gdb_test "trace start" ".*"
|
|
gdb_test_no_output "tstart"
|
|
|
|
gdb_test "break end" "Breakpoint ${decimal} at .*"
|
|
gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*"
|
|
gdb_test_no_output "tstop"
|
|
|
|
gdb_test "tfind" "Found trace frame 0, tracepoint .*" "tfind frame 0"
|
|
gdb_test "p \$trace_frame" ".*\\\$${decimal} = 0.*" \
|
|
"p \$trace_frame before disconnected"
|
|
gdb_test "p \$tracepoint" ".*\\\$${decimal} = 2.*" \
|
|
"p \$tracepoint before disconnected"
|
|
|
|
gdb_test "disconnect" "Ending remote debugging\\." "first disconnect"
|
|
|
|
gdb_test "p \$trace_frame" ".*\\\$${decimal} = -1.*"
|
|
gdb_test "p \$tracepoint" ".*\\\$${decimal} = -1.*"
|
|
gdb_test "p \$trace_line" ".*\\\$${decimal} = -1.*"
|
|
gdb_test "p \$trace_file" ".*\\\$${decimal} = void.*"
|
|
gdb_test "p \$trace_func" ".*\\\$${decimal} = void.*"
|
|
}
|
|
}
|
|
|
|
disconnected_tfind
|