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.
190 lines
5.4 KiB
Text
190 lines
5.4 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/>.
|
|
|
|
load_lib "trace-support.exp"
|
|
|
|
|
|
gdb_exit
|
|
gdb_start
|
|
standard_testfile actions.c
|
|
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
|
|
executable {debug nowarnings}] != "" } {
|
|
untested tsv.exp
|
|
return -1
|
|
}
|
|
gdb_load $binfile
|
|
|
|
gdb_test "tvariable \$tvar1" \
|
|
"Trace state variable \\\$tvar1 created, with initial value 0." \
|
|
"Create a trace state variable"
|
|
|
|
gdb_test "tvariable \$tvar2 = 45" \
|
|
"Trace state variable \\\$tvar2 created, with initial value 45." \
|
|
"Create a trace state variable with initial value"
|
|
|
|
gdb_test "tvariable \$tvar2 = -92" \
|
|
"Trace state variable \\\$tvar2 now has initial value -92." \
|
|
"Change initial value of a trace state variable"
|
|
|
|
gdb_test "tvariable \$tvar3 = 2 + 3" \
|
|
"Trace state variable \\\$tvar3 created, with initial value 5." \
|
|
"Create a trace state variable with expression"
|
|
|
|
gdb_test "tvariable \$tvar3 = 1234567000000" \
|
|
"Trace state variable \\\$tvar3 now has initial value 1234567000000." \
|
|
"Init trace state variable to a 64-bit value"
|
|
|
|
gdb_test "tvariable $" \
|
|
"Must supply a non-empty variable name" \
|
|
"tvariable syntax error, not empty variable name"
|
|
|
|
gdb_test "tvariable main" \
|
|
"Name of trace variable should start with '\\\$'" \
|
|
"tvariable syntax error, bad name"
|
|
|
|
gdb_test "tvariable \$\$" \
|
|
"Syntax must be \\\$NAME \\\[ = EXPR \\\]" \
|
|
"tvariable syntax error, bad name 2"
|
|
|
|
gdb_test "tvariable \$123" \
|
|
"\\\$123 is not a valid trace state variable name" \
|
|
"tvariable syntax error, bad name 3"
|
|
|
|
gdb_test "tvariable \$tvar1 - 93" \
|
|
"Syntax must be \\\$NAME \\\[ = EXPR \\\]" \
|
|
"tvariable syntax error, not an assignment"
|
|
|
|
gdb_test "tvariable \$tvar0 = 1 = 1" \
|
|
"Left operand of assignment is not an lvalue\." \
|
|
"tvariable creation fails with invalid expression"
|
|
|
|
gdb_test "info tvariables" \
|
|
"Name\[\t \]+Initial\[\t \]+Current.*
|
|
\\\$tvar1\[\t \]+0\[\t \]+<undefined>.*
|
|
\\\$tvar2\[\t \]+-92\[\t \]+<undefined>.*
|
|
\\\$tvar3\[\t \]+1234567000000\[\t \]+.*<undefined>.*" \
|
|
"List tvariables"
|
|
|
|
gdb_test "print \$tvar2" " = void" \
|
|
"Print a trace state variable before run"
|
|
|
|
gdb_test_no_output "delete tvariable \$tvar2" \
|
|
"delete trace state variable"
|
|
|
|
gdb_test "info tvariables" \
|
|
"Name\[\t \]+Initial\[\t \]+Current.*
|
|
\\\$tvar1\[\t \]+0\[\t \]+<undefined>.*
|
|
\\\$tvar3\[\t \]+1234567000000\[\t \]+.*<undefined>.*" \
|
|
"List tvariables after deletion"
|
|
|
|
gdb_test "delete tvariable" \
|
|
"" \
|
|
"Delete all trace state variables" \
|
|
"Delete all trace state variables.*y or n.*$" \
|
|
"y"
|
|
|
|
gdb_test "info tvariables" \
|
|
"No trace state variables.*" \
|
|
"List tvariables after deleting all"
|
|
|
|
# Now try running a trace.
|
|
|
|
runto_main
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
|
|
# The rest of the testing needs actual tracing to work.
|
|
if { ![gdb_target_supports_trace] } then {
|
|
unsupported "Current target does not support trace"
|
|
return 1
|
|
}
|
|
|
|
gdb_delete_tracepoints
|
|
set trcpt1 [gdb_gettpnum gdb_c_test]
|
|
|
|
if { $trcpt1 <= 0 } then {
|
|
fail "setting tracepoints"
|
|
return
|
|
}
|
|
|
|
gdb_test "tvariable \$tvar5 = 15" \
|
|
"Trace state variable \\\$tvar5 created, with initial value 15." \
|
|
"Create a trace state variable tvar5"
|
|
|
|
gdb_trace_setactions "collect tsv for first tracepoint" \
|
|
"$trcpt1" \
|
|
"collect \$tvar5 += 1" "^$"
|
|
|
|
gdb_test_no_output "tstart" ""
|
|
|
|
gdb_test "print \$tvar5" " = 15" \
|
|
"Print a trace state variable at start of run"
|
|
|
|
# Be sure not to fall off the end of the program.
|
|
gdb_test "break end" ".*" ""
|
|
gdb_test "continue" \
|
|
"Continuing.*Breakpoint $decimal, end.*" \
|
|
"run trace experiment"
|
|
|
|
gdb_test "print \$tvar5" " = 16" \
|
|
"Print a trace state variable during run"
|
|
|
|
gdb_test_no_output "tstop" ""
|
|
|
|
# Save trace frames to tfile.
|
|
set tracefile [standard_output_file ${testfile}]
|
|
gdb_test "tsave ${tracefile}.tf" \
|
|
"Trace data saved to file '${tracefile}.tf'.*" \
|
|
"save tfile trace file"
|
|
# Save trace frames to ctf.
|
|
gdb_test "tsave -ctf ${tracefile}.ctf" \
|
|
"Trace data saved to directory '${tracefile}.ctf'.*" \
|
|
"save ctf trace file"
|
|
|
|
proc check_tsv { data_source } {
|
|
with_test_prefix "${data_source}" {
|
|
gdb_test "tfind 0"
|
|
gdb_test "print \$tvar5" " = 16" \
|
|
"Print a trace state variable"
|
|
gdb_test "tfind" \
|
|
"Target failed to find requested trace frame.*"
|
|
}
|
|
}
|
|
|
|
# Check the tsv from the live inferior.
|
|
check_tsv "live"
|
|
|
|
# Change target to tfile.
|
|
set test "change to tfile target"
|
|
gdb_test_multiple "target tfile ${tracefile}.tf" "$test" {
|
|
-re "A program is being debugged already. Kill it. .y or n. " {
|
|
send_gdb "y\n"
|
|
exp_continue
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
pass "$test"
|
|
}
|
|
}
|
|
|
|
# Check the tsv from tfile.
|
|
|
|
check_tsv "tfile"
|
|
# Try to read ctf data if GDB supports.
|
|
gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
|
|
-re "Undefined target command: \"ctf ${tracefile}.ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
|
|
}
|
|
-re ".*\r\n$gdb_prompt $" {
|
|
check_tsv "ctf"
|
|
}
|
|
}
|