summaryrefslogtreecommitdiff
path: root/gdb/testsuite/lib/trace-support.exp
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2013-06-07 17:31:09 +0000
committerPedro Alves <palves@redhat.com>2013-06-07 17:31:09 +0000
commit4ec7020176a1aaae1adeeb1e1695975ebdc172ea (patch)
tree45b9789c9f3b5f7f6fb1cd87bc1be0744cd5730c /gdb/testsuite/lib/trace-support.exp
parentc5da8c7d174e38282889094b86153721fe3f5aca (diff)
downloadbinutils-gdb-4ec7020176a1aaae1adeeb1e1695975ebdc172ea.tar.gz
Remove superfluous semicolons from testsuite throughout.
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.
Diffstat (limited to 'gdb/testsuite/lib/trace-support.exp')
-rw-r--r--gdb/testsuite/lib/trace-support.exp92
1 files changed, 46 insertions, 46 deletions
diff --git a/gdb/testsuite/lib/trace-support.exp b/gdb/testsuite/lib/trace-support.exp
index 2601ad837d9..4ffd01cdb75 100644
--- a/gdb/testsuite/lib/trace-support.exp
+++ b/gdb/testsuite/lib/trace-support.exp
@@ -69,7 +69,7 @@ proc gdb_delete_tracepoints {} {
send_gdb "delete tracepoints\n"
gdb_expect 30 {
-re "Delete all tracepoints.*y or n.*$" {
- send_gdb "y\n";
+ send_gdb "y\n"
exp_continue
}
-re ".*$gdb_prompt $" { # This happens if there were no tracepoints }
@@ -98,12 +98,12 @@ proc gdb_delete_tracepoints {} {
# non-zero -- failure
proc gdb_trace_setactions_command { actions_command testname tracepoint args } {
- global gdb_prompt;
+ global gdb_prompt
- set state 0;
- set passfail "pass";
- send_gdb "$actions_command $tracepoint\n";
- set expected_result "";
+ set state 0
+ set passfail "pass"
+ send_gdb "$actions_command $tracepoint\n"
+ set expected_result ""
gdb_expect 5 {
-re "No tracepoint number .*$gdb_prompt $" {
fail $testname
@@ -111,52 +111,52 @@ proc gdb_trace_setactions_command { actions_command testname tracepoint args } {
}
-re "Enter actions for tracepoint $tracepoint.*>" {
if { [llength $args] > 0 } {
- set lastcommand "[lindex $args $state]";
- send_gdb "[lindex $args $state]\n";
- incr state;
- set expected_result [lindex $args $state];
- incr state;
+ set lastcommand "[lindex $args $state]"
+ send_gdb "[lindex $args $state]\n"
+ incr state
+ set expected_result [lindex $args $state]
+ incr state
} else {
- send_gdb "end\n";
+ send_gdb "end\n"
}
- exp_continue;
+ exp_continue
}
-re "\(.*\)\[\r\n\]+\[ \t]*>$" {
if { $expected_result != "" } {
- regsub "^\[^\r\n\]+\[\r\n\]+" "$expect_out(1,string)" "" out;
+ regsub "^\[^\r\n\]+\[\r\n\]+" "$expect_out(1,string)" "" out
if ![regexp $expected_result $out] {
- set passfail "fail";
+ set passfail "fail"
}
- set expected_result "";
+ set expected_result ""
}
if { $state < [llength $args] } {
- send_gdb "[lindex $args $state]\n";
- incr state;
- set expected_result [lindex $args $state];
- incr state;
+ send_gdb "[lindex $args $state]\n"
+ incr state
+ set expected_result [lindex $args $state]
+ incr state
} else {
- send_gdb "end\n";
- set expected_result "";
+ send_gdb "end\n"
+ set expected_result ""
}
- exp_continue;
+ exp_continue
}
-re "\(.*\)$gdb_prompt $" {
if { $expected_result != "" } {
if ![regexp $expected_result $expect_out(1,string)] {
- set passfail "fail";
+ set passfail "fail"
}
- set expected_result "";
+ set expected_result ""
}
if { [llength $args] < $state } {
- set passfail "fail";
+ set passfail "fail"
}
}
default {
- set passfail "fail";
+ set passfail "fail"
}
}
if { $testname != "" } {
- $passfail $testname;
+ $passfail $testname
}
if { $passfail == "pass" } then {
return 0
@@ -193,28 +193,28 @@ proc gdb_trace_setcommands { testname tracepoint args } {
#
proc gdb_tfind_test { testname tfind_arg exp_res args } {
- global gdb_prompt;
+ global gdb_prompt
if { "$args" != "" } {
- set expr "$exp_res";
- set exp_res "$args";
+ set expr "$exp_res"
+ set exp_res "$args"
} else {
- set expr "(int) \$trace_frame";
+ set expr "(int) \$trace_frame"
}
- set passfail "fail";
+ set passfail "fail"
gdb_test "tfind $tfind_arg" "" ""
- send_gdb "printf \"x \%d x\\n\", $expr\n";
+ send_gdb "printf \"x \%d x\\n\", $expr\n"
gdb_expect 10 {
-re "x (-*\[0-9\]+) x" {
if { $expect_out(1,string) == $exp_res } {
- set passfail "pass";
+ set passfail "pass"
}
- exp_continue;
+ exp_continue
}
-re "$gdb_prompt $" { }
}
- $passfail "$testname";
+ $passfail "$testname"
if { $passfail == "pass" } then {
return 0
} else {
@@ -232,13 +232,13 @@ proc gdb_tfind_test { testname tfind_arg exp_res args } {
#
proc gdb_readexpr { gdb_expr } {
- global gdb_prompt;
+ global gdb_prompt
- set result -1;
+ set result -1
send_gdb "print $gdb_expr\n"
gdb_expect 5 {
-re "\[$\].*= (\[0-9\]+).*$gdb_prompt $" {
- set result $expect_out(1,string);
+ set result $expect_out(1,string)
}
-re "$gdb_prompt $" { }
default { }
@@ -255,7 +255,7 @@ proc gdb_readexpr { gdb_expr } {
#
proc gdb_gettpnum { tracepoint } {
- global gdb_prompt;
+ global gdb_prompt
if { $tracepoint != "" } {
gdb_test "trace $tracepoint" "" ""
@@ -276,9 +276,9 @@ proc gdb_gettpnum { tracepoint } {
#
proc gdb_find_function_baseline { func_name } {
- global gdb_prompt;
+ global gdb_prompt
- set baseline -1;
+ set baseline -1
send_gdb "list $func_name\n"
# gdb_expect {
@@ -300,15 +300,15 @@ proc gdb_find_function_baseline { func_name } {
#
proc gdb_find_recursion_test_baseline { filename } {
- global gdb_prompt;
+ global gdb_prompt
- set baseline -1;
+ set baseline -1
gdb_test "list $filename:1" "" ""
send_gdb "search gdb_recursion_test line 0\n"
gdb_expect {
-re "(\[0-9\]+)\[\t \]+\{.*line 0.*$gdb_prompt $" {
- set baseline $expect_out(1,string);
+ set baseline $expect_out(1,string)
}
-re "$gdb_prompt $" { }
default { }