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.
163 lines
4.8 KiB
Text
163 lines
4.8 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 save-trace.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
|
|
|
|
# define relative source line numbers:
|
|
# all subsequent line numbers are relative to this first one (baseline)
|
|
set baseline [gdb_find_recursion_test_baseline $srcfile]
|
|
if { $baseline == -1 } then {
|
|
fail "Could not find gdb_recursion_test function"
|
|
return
|
|
}
|
|
|
|
set testline1 [expr $baseline + 4]
|
|
set testline2 [expr $baseline + 5]
|
|
set testline3 [expr $baseline + 6]
|
|
set testline4 [expr $baseline + 7]
|
|
set testline5 [expr $baseline + 8]
|
|
set testline6 [expr $baseline + 9]
|
|
|
|
#
|
|
# test save-trace command
|
|
#
|
|
|
|
# setup a set of tracepoints to save
|
|
|
|
gdb_delete_tracepoints
|
|
|
|
foreach x { 1 2 3 4 5 6 } {
|
|
set testline [expr \$testline$x]
|
|
set trcpt [gdb_gettpnum $testline]
|
|
set trcpt$x $trcpt
|
|
gdb_test "passcount $x" \
|
|
"Setting tracepoint $trcpt.* to $x" \
|
|
"10.x: set passcount for tracepoint $trcpt"
|
|
|
|
gdb_test_no_output "condition $trcpt $x - 1 == $x / 2" \
|
|
"10.x: set condition for tracepoint $trcpt"
|
|
|
|
gdb_trace_setactions "10.x: set actions for tracepoint $x" \
|
|
"" \
|
|
"collect q$x" "^$" \
|
|
"while-stepping $x" "^$" \
|
|
"collect q$x" "^$" \
|
|
"end" "^$"
|
|
}
|
|
|
|
gdb_test_no_output "set default-collect gdb_char_test, gdb_long_test - 100" \
|
|
"10: set default-collect"
|
|
|
|
proc gdb_verify_tracepoints { testname } {
|
|
global gdb_prompt
|
|
|
|
set ws "\[\t \]+"
|
|
set nl "\[\r\n\]+"
|
|
set ourstate 1
|
|
set result "pass"
|
|
gdb_test_multiple "info tracepoints" "$testname" {
|
|
-re "\[0-9\]+\[\t \]+tracepoint\[\t \]+keep y\[\t \]+0x\[0-9a-fA-F\]+ in gdb_recursion_test\[^\r\n\]+\r\n\[ \t]+trace only if \[0-9\] - 1 == \[0-9\] / 2" {
|
|
# if { $expect_out(1,string) != $ourstate } {
|
|
# set result "fail"
|
|
# }
|
|
incr ourstate
|
|
exp_continue
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
if { $ourstate >= 6 } {
|
|
set result "pass"
|
|
} else {
|
|
set result "fail"
|
|
}
|
|
}
|
|
default {
|
|
set result "fail"
|
|
}
|
|
}
|
|
$result $testname
|
|
|
|
gdb_test "show default-collect" \
|
|
"The list of expressions to collect by default is \"gdb_char_test, gdb_long_test - 100\"..*" \
|
|
"10: show default-collect"
|
|
}
|
|
|
|
gdb_verify_tracepoints "10.x: verify trace setup"
|
|
|
|
# 10.1 Save current tracepoint definitions to a file
|
|
|
|
remote_file host delete savetrace.tr
|
|
gdb_test "save-tracepoints savetrace.tr" \
|
|
"Saved to file 'savetrace.tr'." \
|
|
"10.1: save tracepoint definitions"
|
|
|
|
# 10.2 Read back tracepoint definitions
|
|
|
|
gdb_delete_tracepoints
|
|
gdb_test_no_output "set default-collect" "10.2: clear default-collect"
|
|
gdb_test "info tracepoints" "No tracepoints." "10.2: delete tracepoints"
|
|
gdb_test "source savetrace.tr" \
|
|
"Tracepoint \[0-9\]+ at .*" \
|
|
"10.2: read back saved tracepoints"
|
|
gdb_verify_tracepoints "10.2: verify recovered tracepoints"
|
|
remote_file host delete savetrace.tr
|
|
|
|
# 10.3 repeat with a path to the file
|
|
|
|
set trace_file_name [standard_output_file savetrace.tr]
|
|
set escapedfilename [string_to_regexp $trace_file_name]
|
|
remote_file host delete $trace_file_name
|
|
gdb_test "save-tracepoints $trace_file_name" \
|
|
"Saved to file '${escapedfilename}'." \
|
|
"10.3: save tracepoint definitions, full path"
|
|
|
|
gdb_delete_tracepoints
|
|
gdb_test_no_output "set default-collect" "10.3: clear default-collect"
|
|
gdb_test "info tracepoints" "No tracepoints." "10.3: delete tracepoints"
|
|
gdb_test "source $trace_file_name" \
|
|
"Tracepoint \[0-9\]+ at .*" \
|
|
"10.4: read saved tracepoints, full path"
|
|
gdb_verify_tracepoints "10.3: verify recovered tracepoints, full path"
|
|
remote_file host delete $trace_file_name
|
|
|
|
# 10.5 invalid filename
|
|
# [deferred -- not sure what a good invalid filename would be]
|
|
|
|
# 10.6 save-trace (file already exists)
|
|
# [expect it to clobber the old one]
|
|
|
|
# 10.7 help save-tracepoints
|
|
|
|
gdb_test "help save-tracepoints" \
|
|
"Save current tracepoint definitions as a script.*" \
|
|
"10.7: help save-tracepoints"
|