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.
98 lines
3 KiB
Text
98 lines
3 KiB
Text
# Copyright 2009-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/>.
|
|
|
|
if [is_remote target] {
|
|
# The test always runs locally.
|
|
return 0
|
|
}
|
|
|
|
set test valgrind-db-attach
|
|
set srcfile $test.c
|
|
set executable $test
|
|
set binfile ${objdir}/${subdir}/${executable}
|
|
if {[build_executable $test.exp $executable $srcfile {debug}] == -1} {
|
|
return -1
|
|
}
|
|
|
|
gdb_exit
|
|
|
|
# remote_spawn breaks the command on each whitespace despite possible quoting.
|
|
# Use backslash-escaped whitespace there instead:
|
|
|
|
set db_command "--db-command=$GDB $INTERNAL_GDBFLAGS $GDBFLAGS [host_info gdb_opts] %f %p"
|
|
regsub -all " " $db_command "\\ " db_command
|
|
|
|
set test "spawn valgrind"
|
|
set cmd "valgrind --db-attach=yes $db_command $binfile"
|
|
set res [remote_spawn host $cmd]
|
|
if { $res < 0 || $res == "" } {
|
|
verbose -log "Spawning $cmd failed."
|
|
unsupported $test
|
|
return -1
|
|
}
|
|
pass $test
|
|
# Declare GDB now as running.
|
|
set gdb_spawn_id -1
|
|
|
|
# GDB spawned by `valgrind --db-attach=yes' stops already after the startup is
|
|
# executed, like with non-extended gdbserver. It is also not correct to
|
|
# run/attach the inferior.
|
|
set use_gdb_stub 1
|
|
|
|
set test "valgrind started"
|
|
# The trailing '.' differs for different memcheck versions.
|
|
gdb_test_multiple "" $test {
|
|
-re "Memcheck, a memory error detector\\.?\r\n" {
|
|
pass $test
|
|
}
|
|
-re "valgrind: failed to start tool 'memcheck' for platform '.*': No such file or directory" {
|
|
unsupported $test
|
|
return -1
|
|
}
|
|
-re "valgrind: wrong ELF executable class" {
|
|
unsupported $test
|
|
return -1
|
|
}
|
|
-re "command not found" {
|
|
# The spawn succeeded, but then valgrind was not found - e.g. if
|
|
# we spawned SSH to a remote system.
|
|
unsupported $test
|
|
return -1
|
|
}
|
|
}
|
|
|
|
set double_free [gdb_get_line_number "double-free"]
|
|
|
|
set test "attach to debugger"
|
|
gdb_test_multiple "" $test {
|
|
-re "Invalid free\\(\\).*: main \\(${srcfile}:$double_free\\)\r\n.*---- Attach to debugger \\? --- \[^\r\n\]* ---- " {
|
|
send_gdb "y\r"
|
|
}
|
|
-re "---- Attach to debugger \\? --- \[^\r\n\]* ---- " {
|
|
send_gdb "n\r"
|
|
exp_continue
|
|
}
|
|
}
|
|
|
|
gdb_test "" ".*" "eat first prompt"
|
|
|
|
# Initialization from default_gdb_start.
|
|
gdb_test_no_output "set height 0"
|
|
gdb_test_no_output "set width 0"
|
|
|
|
gdb_test "bt" "in main \\(.*\\) at .*${srcfile}:$double_free"
|
|
|
|
# Explicitly kill the program so it doesn't dump core when we quit->detach.
|
|
gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
|