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.
126 lines
3.2 KiB
Text
126 lines
3.2 KiB
Text
# Copyright 1988-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 Rob Savoye. (rob@cygnus.com)
|
|
|
|
#
|
|
# load support libraries
|
|
#
|
|
load_lib remote.exp
|
|
load_lib gdb.exp
|
|
|
|
set shell_prompt "->"
|
|
set gdb_prompt "\\(vxgdb\\)"
|
|
|
|
#
|
|
# gdb_version -- extract and print the version number of gcc
|
|
#
|
|
proc gdb_version {} {
|
|
default_gdb_version
|
|
}
|
|
|
|
#
|
|
# gdb_load -- load a file into the debugger.
|
|
# We have to stop and start gdb each time we do this, because when
|
|
# vxgdb loads two files in a row, the symbols in the first file loaded
|
|
# take precedence. Returns -1 on error, else 0.
|
|
#
|
|
proc gdb_load { arg } {
|
|
set result 0
|
|
|
|
if { [remote_ld target $arg] != 0 } {
|
|
perror "Couldn't load $arg"
|
|
return -1
|
|
}
|
|
|
|
return [gdb_file_cmd $arg]
|
|
}
|
|
|
|
#
|
|
# gdb_start -- start gdb running
|
|
#
|
|
proc gdb_start { } {
|
|
global gdb_prompt
|
|
global verbose
|
|
global connectmode
|
|
global reboot
|
|
|
|
# get a connection to the board
|
|
for { set x 0 } { $x < 3 } { incr x } {
|
|
set shell_id [remote_open target]
|
|
if { $shell_id > 0 } {
|
|
verbose "Spawn id for remote shell is $shell_id"
|
|
|
|
set timeout 10
|
|
verbose "Timeout is now $timeout seconds" 2
|
|
|
|
set state [spawn_vxgdb]
|
|
if { $state == "pass" } {
|
|
return 0
|
|
}
|
|
if { $state == "fail" } {
|
|
return -1
|
|
}
|
|
}
|
|
remote_reboot target
|
|
}
|
|
}
|
|
|
|
proc spawn_vxgdb { } {
|
|
global gdb_prompt
|
|
|
|
default_gdb_start
|
|
|
|
# set the default arguments to "main", so that "run" with no
|
|
# arguments will work correctly.
|
|
send_gdb "set args main\n"
|
|
gdb_expect -re ".*$gdb_prompt $" {}
|
|
|
|
verbose "Setting up target, Please wait..."
|
|
# set targets hostname
|
|
send_gdb "target vxworks [target_info hostname]\n"
|
|
set timeout 60
|
|
verbose "Timeout is now $timeout seconds" 2
|
|
gdb_expect {
|
|
-re "Done\..*$gdb_prompt $" {
|
|
verbose "Set target to [target_info hostname]" 1
|
|
set timeout 10
|
|
return "pass"
|
|
}
|
|
-re "net_connect: RPC: (Program not registered|.*Timed out).*$" {
|
|
warning "Couldn't set GDB to target [target_info netport]."
|
|
}
|
|
timeout {
|
|
warning "Couldn't set target for vxworks."
|
|
}
|
|
}
|
|
return "retry"
|
|
}
|
|
|
|
proc gdb_exit { } {
|
|
remote_close target
|
|
catch default_gdb_exit
|
|
}
|
|
|
|
#expect_after {
|
|
# "<return>" { send "\n"; perror "Window too small." }
|
|
# -re "\(y or n\) " { send "n\n"; perror "Got interactive prompt." }
|
|
# buffer_full { perror "internal buffer is full." }
|
|
# eof { perror "eof -- pty is hosed." }
|
|
# timeout { perror "timeout." }
|
|
# "virtual memory exhausted" { perror "virtual memory exhausted." }
|
|
# "Undefined command" { perror "send string probably wrong." }
|
|
#}
|
|
|