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.
179 lines
4.7 KiB
Text
179 lines
4.7 KiB
Text
# Copyright 1993-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 Ian Lance Taylor <ian@cygnus.com>.
|
||
|
||
# GDB support routines for a board using the MIPS remote debugging
|
||
# protocol. These are actually pretty generic.
|
||
|
||
# DejaGnu currently assumes that debugging is being done over the main
|
||
# console port. It would probably be more convenient for people using
|
||
# IDT boards to permit the debugging port and the connected port to be
|
||
# different, since an IDT board has two ports. This would require
|
||
# extending some of the tests in a fashion similar to that done for
|
||
# VxWorks, because the test output would appear on the other port,
|
||
# rather than being displayed by gdb.
|
||
|
||
load_lib remote.exp
|
||
load_lib gdb.exp
|
||
set gdb_prompt "\\(gdb\\)"
|
||
|
||
#
|
||
# gdb_load -- load a file into the GDB.
|
||
# Returns a 0 if there was an error,
|
||
# 1 if it load successfully.
|
||
#
|
||
proc gdb_load { arg } {
|
||
global verbose
|
||
global loadpath
|
||
global loadfile
|
||
global gdb_prompt
|
||
global GDB
|
||
global expect_out
|
||
|
||
set loadfile [file tail $arg]
|
||
set loadpath [file dirname $arg]
|
||
|
||
gdb_file_cmd $arg
|
||
|
||
if [target_info exists gdb_protocol] {
|
||
set protocol [target_info gdb_protocol]
|
||
} else {
|
||
set protocol "sparclite"
|
||
}
|
||
|
||
if [target_info exists serial] {
|
||
set targetname [target_info serial]
|
||
set command "target $protocol [target_info serial]\n"
|
||
} else {
|
||
if ![target_info exists netport] {
|
||
perror "Need either netport or gdb_serial entry for [target_info name]."
|
||
return -1
|
||
}
|
||
set targetname [target_info netport]
|
||
set command "target $protocol udp [target_info netport]\n"
|
||
}
|
||
set timeout 60
|
||
verbose "Timeout is now $timeout seconds" 2
|
||
set try_count 0
|
||
send_gdb $command
|
||
gdb_expect {
|
||
-re "Unknown response.*resetting the board.|remote timeout" {
|
||
incr try_count
|
||
if { $try_count > 3 } {
|
||
set try_count 0
|
||
reboot_target
|
||
sleep 5
|
||
}
|
||
sleep 1
|
||
send_gdb $command
|
||
exp_continue
|
||
}
|
||
-re "Remote target.*$gdb_prompt $" { }
|
||
-re ".*SPARClite appears to be alive.*$gdb_prompt $" {
|
||
if $verbose>1 then {
|
||
send_user "Set target to $targetname\n"
|
||
}
|
||
}
|
||
timeout {
|
||
perror "Couldn't set SLITE target."
|
||
set timeout 10
|
||
verbose "Timeout is now $timeout seconds" 2
|
||
return -1
|
||
}
|
||
}
|
||
|
||
if [target_info exists gdb_load_offset] {
|
||
set offset "[target_info gdb_load_offset]"
|
||
} else {
|
||
set offset ""
|
||
}
|
||
if { 1 } {
|
||
if [is_remote host] {
|
||
set arg [remote_download host $arg]
|
||
if { $arg == "" } {
|
||
error "download failed"
|
||
return -1
|
||
}
|
||
}
|
||
send_gdb "load $arg $offset\n"
|
||
verbose "Loading $arg into $GDB" 2
|
||
set timeout 2400
|
||
verbose "Timeout is now $timeout seconds" 2
|
||
gdb_expect {
|
||
-re "Loading.*$gdb_prompt $" {
|
||
verbose "Loaded $arg into $GDB" 1
|
||
set timeout 30
|
||
verbose "Timeout is now $timeout seconds" 2
|
||
}
|
||
-re "$gdb_prompt $" {
|
||
if $verbose>1 then {
|
||
perror "GDB couldn't load."
|
||
}
|
||
}
|
||
timeout {
|
||
if $verbose>1 then {
|
||
perror "Timed out trying to load $arg."
|
||
}
|
||
}
|
||
}
|
||
}
|
||
# Some SPARClite boards automagically do a run after the program is
|
||
# loaded.
|
||
if [target_info exists need_monitor_run] {
|
||
set timeout 10
|
||
verbose "Timeout is now $timeout seconds, doing monitor run" 2
|
||
send_gdb "monitor run\n"
|
||
sleep 2
|
||
send_gdb ""
|
||
gdb_expect {
|
||
-re ".*$gdb_prompt $" { verbose "Run command succeded" }
|
||
default {
|
||
perror "error sending monitor run command"
|
||
}
|
||
}
|
||
} else {
|
||
sleep 2
|
||
}
|
||
|
||
if [target_info exists gdb_serial] {
|
||
set serial [target_info gdb_serial]
|
||
} else {
|
||
set serial [target_info serial]
|
||
}
|
||
send_gdb "target remote $serial\n"
|
||
set timeout 60
|
||
verbose "Timeout is now $timeout seconds" 2
|
||
gdb_expect {
|
||
-re ".*Kill it?.*y or n.*" {
|
||
send_gdb "y\n"
|
||
exp_continue
|
||
}
|
||
-re ".*$gdb_prompt $" {
|
||
verbose "Set remote target to [target_info serial]" 2
|
||
}
|
||
timeout {
|
||
perror "Couldn't set remote target."
|
||
set timeout 10
|
||
verbose "Timeout is now $timeout seconds" 2
|
||
return -1
|
||
}
|
||
}
|
||
|
||
if [info exists expect_out(buffer)] then {
|
||
send_log $expect_out(buffer)
|
||
}
|
||
return 0
|
||
}
|