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
5.3 KiB
Text
171 lines
5.3 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 tracecmd.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 + 1]
|
|
set testline2 [expr $baseline + 3]
|
|
|
|
#
|
|
# test "help tracepoints"
|
|
#
|
|
|
|
set helpcnt 0
|
|
test_class_help "tracepoints" {
|
|
"Tracing of program execution without stopping the program\.[\r\n\]+"
|
|
} "1.0: help tracepoints"
|
|
|
|
#
|
|
# test trace command:
|
|
#
|
|
|
|
# 1.1 trace source line
|
|
gdb_delete_tracepoints
|
|
gdb_test "trace $srcfile:$testline2" \
|
|
"Tracepoint $decimal at $hex: file.*$srcfile, line $testline2." \
|
|
"1.1a: set tracepoint at sourceline"
|
|
gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline2.
|
|
\[\t \]+not installed on target." \
|
|
"1.1b: trace sourcefile:line"
|
|
|
|
# 1.2 trace invalid source line
|
|
gdb_delete_tracepoints
|
|
gdb_test_no_output "set breakpoint pending off"
|
|
gdb_test "trace $srcfile:99999" "No line 99999 in file \".*$srcfile\"." \
|
|
"1.2a: trace invalid line in sourcefile"
|
|
gdb_test "info trace" "No tracepoints.*" \
|
|
"1.2b: reject invalid line in srcfile"
|
|
|
|
# 1.3 trace line in invalid source file
|
|
gdb_delete_tracepoints
|
|
gdb_test "trace NoSuChFiLe.c:1" "No source file named NoSuChFiLe.c." \
|
|
"1.3a: trace invalid source file"
|
|
gdb_test "info trace" "No tracepoints.*" \
|
|
"1.3b: reject invalid srcfile"
|
|
|
|
# 1.4 trace function by name
|
|
gdb_delete_tracepoints
|
|
gdb_test "trace gdb_recursion_test" \
|
|
"Tracepoint $decimal at $hex: file.*$srcfile, line $testline1." \
|
|
"1.4a: trace function by name"
|
|
gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1.
|
|
\[\t \]+not installed on target." \
|
|
"1.4b: trace function by name"
|
|
|
|
# 1.5 trace non-existant function
|
|
gdb_delete_tracepoints
|
|
gdb_test "trace NoSuChFuNc" "Function \"NoSuChFuNc\" not defined." \
|
|
"1.5a: trace invalid function"
|
|
gdb_test "info trace" "No tracepoints.*" \
|
|
"1.5b: reject invalid srcfile"
|
|
|
|
# 1.6 trace at a specific address
|
|
# Collect the address of "gdb_asm_test", and use that.
|
|
gdb_test_multiple "print gdb_asm_test" "" {
|
|
-re "\[$\]\[0-9\].*0x(\[0-9a-fA-F\]+).*$gdb_prompt $" {
|
|
set asm_test_addr $expect_out(1,string)
|
|
}
|
|
}
|
|
|
|
gdb_delete_tracepoints
|
|
gdb_test "trace \*0x$asm_test_addr" \
|
|
"Tracepoint $decimal at .*$asm_test_addr.*" \
|
|
"1.6a: trace at specific address"
|
|
gdb_test "info trace" "$asm_test_addr.*gdb_asm_test.*" \
|
|
"1.6b: verify trace at specific address"
|
|
|
|
# 1.7 trace at function's exact address
|
|
# Collect the address of the function for comparison
|
|
gdb_test_multiple "print gdb_recursion_test" "" {
|
|
-re "\[$\]\[0-9\].*0x(\[0-9a-fA-F\]+).*$gdb_prompt $" {
|
|
set c_test_addr $expect_out(1,string)
|
|
}
|
|
}
|
|
|
|
gdb_delete_tracepoints
|
|
gdb_test "trace \*gdb_recursion_test" \
|
|
"Tracepoint $decimal at .*$c_test_addr.*" \
|
|
"1.7a: trace at function label (before prologue)"
|
|
gdb_test "info trace" "$c_test_addr.*in gdb_recursion_test.*:$baseline.
|
|
\[\t \]+not installed on target." \
|
|
"1.7b: verify trace at specific address"
|
|
|
|
# 1.8 trace at invalid address
|
|
# no address is invalid
|
|
|
|
# 1.9 trace no arguments
|
|
gdb_test "trace" "No default breakpoint address now." \
|
|
"1.9: trace <no arguments>"
|
|
|
|
# 1.10 there's no 1.10.
|
|
|
|
# 1.11 tracepoint conditions
|
|
gdb_delete_tracepoints
|
|
gdb_test "trace gdb_recursion_test if q1 > 0" \
|
|
"Tracepoint $decimal at $hex: file.*$srcfile, line $testline1." \
|
|
"1.11a: conditional tracepoint"
|
|
gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1.
|
|
\[\t \]+trace only if q1 > 0.
|
|
\[\t \]+not installed on target." \
|
|
"1.11b: verify conditional tracepoint"
|
|
|
|
# 1.12 set tracepoint in prologue
|
|
# [see tfind.exp]
|
|
|
|
# 1.13 trace on recursion
|
|
# interesting only in "live" session: see backtrace.exp for live test.
|
|
|
|
# 1.14 help trace
|
|
gdb_test "help trace" "Set a tracepoint at .*" "1.14: help trace"
|
|
|
|
# 1.15 ftrace
|
|
|
|
gdb_delete_tracepoints
|
|
|
|
# Acceptance vs rejection of a location are target-specific, so allow both.
|
|
gdb_test_multiple "ftrace gdb_recursion_test" "Set a fast tracepoint" {
|
|
-re "Fast tracepoint $decimal at $hex: file.*$srcfile, line $testline1.*$gdb_prompt $" {
|
|
pass "Set a fast tracepoint"
|
|
}
|
|
-re ".*May not have a fast tracepoint at $hex.*$gdb_prompt $" {
|
|
pass "Declined to set a fast tracepoint"
|
|
}
|
|
}
|