old-cross-binutils/gdb/testsuite/lib/trace-support.exp
Pedro Alves 4ec7020176 Remove superfluous semicolons from testsuite throughout.
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.
2013-06-07 17:31:09 +00:00

329 lines
7.8 KiB
Text

# Copyright (C) 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/>.
#
# Support procedures for trace testing
#
#
# Procedure: gdb_target_supports_trace
# Returns true if GDB is connected to a target that supports tracing.
# Allows tests to abort early if not running on a trace-aware target.
#
proc gdb_target_supports_trace { } {
global gdb_prompt
send_gdb "tstatus\n"
gdb_expect {
-re "\[Tt\]race can only be run on.*$gdb_prompt $" {
return 0
}
-re "\[Tt\]race can not be run on.*$gdb_prompt $" {
return 0
}
-re "\[Tt\]arget does not support.*$gdb_prompt $" {
return 0
}
-re ".*\[Ee\]rror.*$gdb_prompt $" {
return 0
}
-re ".*\[Ww\]arning.*$gdb_prompt $" {
return 0
}
-re ".*$gdb_prompt $" {
return 1
}
timeout {
return 0
}
}
}
#
# Procedure: gdb_delete_tracepoints
# Many of the tests depend on setting tracepoints at various places and
# running until that tracepoint is reached. At times, we want to start
# with a clean slate with respect to tracepoints, so this utility proc
# lets us do this without duplicating this code everywhere.
#
proc gdb_delete_tracepoints {} {
global gdb_prompt
send_gdb "delete tracepoints\n"
gdb_expect 30 {
-re "Delete all tracepoints.*y or n.*$" {
send_gdb "y\n"
exp_continue
}
-re ".*$gdb_prompt $" { # This happens if there were no tracepoints }
timeout {
perror "Delete all tracepoints in delete_tracepoints (timeout)"
return
}
}
send_gdb "info tracepoints\n"
gdb_expect 30 {
-re "No tracepoints.*$gdb_prompt $" {}
-re "$gdb_prompt $" { perror "tracepoints not deleted" ; return }
timeout { perror "info tracepoints (timeout)" ; return }
}
}
# Define actions for a tracepoint.
# Arguments:
# actions_command -- the command used to create the actions.
# either "actions" or "commands".
# testname -- identifying string for pass/fail output
# tracepoint -- to which tracepoint(s) do these actions apply? (optional)
# args -- list of actions to be defined.
# Returns:
# zero -- success
# non-zero -- failure
proc gdb_trace_setactions_command { actions_command testname tracepoint args } {
global gdb_prompt
set state 0
set passfail "pass"
send_gdb "$actions_command $tracepoint\n"
set expected_result ""
gdb_expect 5 {
-re "No tracepoint number .*$gdb_prompt $" {
fail $testname
return 1
}
-re "Enter actions for tracepoint $tracepoint.*>" {
if { [llength $args] > 0 } {
set lastcommand "[lindex $args $state]"
send_gdb "[lindex $args $state]\n"
incr state
set expected_result [lindex $args $state]
incr state
} else {
send_gdb "end\n"
}
exp_continue
}
-re "\(.*\)\[\r\n\]+\[ \t]*>$" {
if { $expected_result != "" } {
regsub "^\[^\r\n\]+\[\r\n\]+" "$expect_out(1,string)" "" out
if ![regexp $expected_result $out] {
set passfail "fail"
}
set expected_result ""
}
if { $state < [llength $args] } {
send_gdb "[lindex $args $state]\n"
incr state
set expected_result [lindex $args $state]
incr state
} else {
send_gdb "end\n"
set expected_result ""
}
exp_continue
}
-re "\(.*\)$gdb_prompt $" {
if { $expected_result != "" } {
if ![regexp $expected_result $expect_out(1,string)] {
set passfail "fail"
}
set expected_result ""
}
if { [llength $args] < $state } {
set passfail "fail"
}
}
default {
set passfail "fail"
}
}
if { $testname != "" } {
$passfail $testname
}
if { $passfail == "pass" } then {
return 0
} else {
return 1
}
}
# Define actions for a tracepoint, using the "actions" command. See
# gdb_trace_setactions_command.
#
proc gdb_trace_setactions { testname tracepoint args } {
eval gdb_trace_setactions_command "actions" {$testname} {$tracepoint} $args
}
# Define actions for a tracepoint, using the "commands" command. See
# gdb_trace_setactions_command.
#
proc gdb_trace_setcommands { testname tracepoint args } {
eval gdb_trace_setactions_command "commands" {$testname} {$tracepoint} $args
}
#
# Procedure: gdb_tfind_test
# Find a specified trace frame.
# Arguments:
# testname -- identifying string for pass/fail output
# tfind_arg -- frame (line, PC, etc.) identifier
# exp_res -- Expected result of frame test
# args -- Test expression
# Returns:
# zero -- success
# non-zero -- failure
#
proc gdb_tfind_test { testname tfind_arg exp_res args } {
global gdb_prompt
if { "$args" != "" } {
set expr "$exp_res"
set exp_res "$args"
} else {
set expr "(int) \$trace_frame"
}
set passfail "fail"
gdb_test "tfind $tfind_arg" "" ""
send_gdb "printf \"x \%d x\\n\", $expr\n"
gdb_expect 10 {
-re "x (-*\[0-9\]+) x" {
if { $expect_out(1,string) == $exp_res } {
set passfail "pass"
}
exp_continue
}
-re "$gdb_prompt $" { }
}
$passfail "$testname"
if { $passfail == "pass" } then {
return 0
} else {
return 1
}
}
#
# Procedure: gdb_readexpr
# Arguments:
# gdb_expr -- the expression whose value is desired
# Returns:
# the value of gdb_expr, as evaluated by gdb.
# [FIXME: returns -1 on error, which is sometimes a legit value]
#
proc gdb_readexpr { gdb_expr } {
global gdb_prompt
set result -1
send_gdb "print $gdb_expr\n"
gdb_expect 5 {
-re "\[$\].*= (\[0-9\]+).*$gdb_prompt $" {
set result $expect_out(1,string)
}
-re "$gdb_prompt $" { }
default { }
}
return $result
}
#
# Procedure: gdb_gettpnum
# Arguments:
# tracepoint (optional): if supplied, set a tracepoint here.
# Returns:
# the tracepoint ID of the most recently set tracepoint.
#
proc gdb_gettpnum { tracepoint } {
global gdb_prompt
if { $tracepoint != "" } {
gdb_test "trace $tracepoint" "" ""
}
return [gdb_readexpr "\$tpnum"]
}
#
# Procedure: gdb_find_function_baseline
# Arguments:
# func_name -- name of source function
# Returns:
# Sourcefile line of function definition (open curly brace),
# or -1 on failure. Caller must check return value.
# Note:
# Works only for open curly brace at beginning of source line!
#
proc gdb_find_function_baseline { func_name } {
global gdb_prompt
set baseline -1
send_gdb "list $func_name\n"
# gdb_expect {
# -re "\[\r\n\]\[\{\].*$gdb_prompt $" {
# set baseline 1
# }
# }
}
#
# Procedure: gdb_find_function_baseline
# Arguments:
# filename: name of source file of desired function.
# Returns:
# Sourcefile line of function definition (open curly brace),
# or -1 on failure. Caller must check return value.
# Note:
# Works only for open curly brace at beginning of source line!
#
proc gdb_find_recursion_test_baseline { filename } {
global gdb_prompt
set baseline -1
gdb_test "list $filename:1" "" ""
send_gdb "search gdb_recursion_test line 0\n"
gdb_expect {
-re "(\[0-9\]+)\[\t \]+\{.*line 0.*$gdb_prompt $" {
set baseline $expect_out(1,string)
}
-re "$gdb_prompt $" { }
default { }
}
return $baseline
}
# Return the location of the IPA library.
proc get_in_proc_agent {} {
global objdir
if [target_info exists in_proc_agent] {
return [target_info in_proc_agent]
} else {
return $objdir/../gdbserver/libinproctrace.so
}
}