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.
144 lines
4.1 KiB
Text
144 lines
4.1 KiB
Text
# Copyright (C) 2007-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 Chris Demetriou (cgd@google.com).
|
|
# It tests printing of thread event (start, exit) information, and
|
|
# disabling of those messages.
|
|
#
|
|
# Note: the format of thread event messages (and also whether or not
|
|
# messages are printed and can be disabled) is dependent on the target
|
|
# thread support code.
|
|
|
|
# This test has only been verified with Linux targets, and would need
|
|
# to be generalized to support other targets
|
|
if ![istarget *-*-linux*] then {
|
|
return
|
|
}
|
|
|
|
# When using gdbserver, even on Linux, we don't get notifications
|
|
# about new threads. This is expected, so don't test for that.
|
|
if [is_remote target] then {
|
|
return
|
|
}
|
|
|
|
|
|
standard_testfile
|
|
|
|
if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
|
|
return -1
|
|
}
|
|
|
|
proc gdb_test_thread_start {messages_enabled command pattern message} {
|
|
global gdb_prompt
|
|
|
|
if { $messages_enabled } {
|
|
set events_expected 1
|
|
} else {
|
|
set events_expected 0
|
|
}
|
|
set events_seen 0
|
|
|
|
return [gdb_test_multiple $command $message {
|
|
-re "\\\[New Thread \[^\]\]*\\\]\r\n" {
|
|
incr events_seen
|
|
exp_continue
|
|
}
|
|
-re "\[\r\n\]*($pattern)\[\r\n\]+$gdb_prompt $" {
|
|
if { $events_seen != $events_expected } {
|
|
fail "$message (saw $events_seen, expected $events_expected)"
|
|
} else {
|
|
pass "$message"
|
|
}
|
|
}
|
|
}]
|
|
}
|
|
|
|
proc gdb_test_thread_exit {messages_enabled command pattern message} {
|
|
global gdb_prompt
|
|
|
|
if { $messages_enabled } {
|
|
set events_expected 1
|
|
} else {
|
|
set events_expected 0
|
|
}
|
|
set events_seen 0
|
|
|
|
return [gdb_test_multiple $command $message {
|
|
-re "\\\[Thread \[^\]\]* exited\\\]\r\n" {
|
|
incr events_seen
|
|
exp_continue
|
|
}
|
|
-re "\[\r\n\]*($pattern)\[\r\n\]+$gdb_prompt $" {
|
|
if { $events_seen != $events_expected } {
|
|
fail "$message (saw $events_seen, expected $events_expected)"
|
|
} else {
|
|
pass "$message"
|
|
}
|
|
}
|
|
}]
|
|
}
|
|
|
|
proc test_thread_messages {enabled} {
|
|
global srcdir subdir binfile srcfile
|
|
|
|
if { $enabled } {
|
|
set enabled_string "with messages enabled"
|
|
} else {
|
|
set enabled_string "with messages disabled"
|
|
}
|
|
|
|
gdb_start
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
gdb_load ${binfile}
|
|
|
|
if { $enabled } {
|
|
gdb_test "set print thread-events on"
|
|
} else {
|
|
gdb_test "set print thread-events off"
|
|
}
|
|
|
|
# The initial thread may log a 'New Thread' message, but we don't
|
|
# check for it.
|
|
if ![runto_main] then {
|
|
fail "Can't run to main $enabled_string"
|
|
return 1
|
|
}
|
|
|
|
gdb_test "break threadfunc" \
|
|
"Breakpoint.*at.* file .*$srcfile, line.*" \
|
|
"breakpoint at threadfunc $enabled_string"
|
|
gdb_test "break after_join_func" \
|
|
"Breakpoint.*at.* file .*$srcfile, line.*" \
|
|
"breakpoint at after_join_func $enabled_string"
|
|
|
|
# continue to threadfunc breakpoint. A thread will start.
|
|
# Expect to see a thread start message, if messages are enabled.
|
|
gdb_test_thread_start $enabled "continue" \
|
|
".*Breakpoint .*,.*threadfunc.*at.*$srcfile:.*" \
|
|
"continue to threadfunc $enabled_string"
|
|
|
|
# continue to after_join_func breakpoint. A thread will exit.
|
|
# Expect to see a thread exit message, if messages are enabled.
|
|
gdb_test_thread_exit $enabled "continue" \
|
|
".*Breakpoint .*,.*after_join_func.*at.*$srcfile:.*" \
|
|
"continue to after_join_func $enabled_string"
|
|
|
|
delete_breakpoints
|
|
|
|
gdb_exit
|
|
}
|
|
|
|
test_thread_messages 0
|
|
test_thread_messages 1
|