aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/config/monitor.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/config/monitor.exp
parentc5da8c7d174e38282889094b86153721fe3f5aca (diff)
downloadgdb-4ec7020176a1aaae1adeeb1e1695975ebdc172ea.zip
gdb-4ec7020176a1aaae1adeeb1e1695975ebdc172ea.tar.gz
gdb-4ec7020176a1aaae1adeeb1e1695975ebdc172ea.tar.bz2
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/config/monitor.exp')
-rw-r--r--gdb/testsuite/config/monitor.exp94
1 files changed, 47 insertions, 47 deletions
diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp
index 5e229ee..c8b1676 100644
--- a/gdb/testsuite/config/monitor.exp
+++ b/gdb/testsuite/config/monitor.exp
@@ -28,26 +28,26 @@ proc gdb_target_cmd { targetname serialport } {
send_gdb "target $targetname $serialport\n"
gdb_expect 60 {
-re "A program is being debugged already.*ill it.*y or n. $" {
- send_gdb "y\n";
- exp_continue;
+ send_gdb "y\n"
+ exp_continue
}
-re "Couldn't establish connection to remote.*$gdb_prompt" {
- verbose "Connection failed";
+ verbose "Connection failed"
}
-re "Remote MIPS debugging.*$gdb_prompt" {
- verbose "Set target to $targetname";
+ verbose "Set target to $targetname"
return 0
}
-re "Remote debugging using .*$serialport.*$gdb_prompt" {
- verbose "Set target to $targetname";
+ verbose "Set target to $targetname"
return 0
}
-re "Remote target $targetname connected to.*$gdb_prompt" {
- verbose "Set target to $targetname";
+ verbose "Set target to $targetname"
return 0
}
-re "Connected to.*$gdb_prompt" {
- verbose "Set target to $targetname";
+ verbose "Set target to $targetname"
return 0
}
-re "Ending remote.*$gdb_prompt" { }
@@ -57,10 +57,10 @@ proc gdb_target_cmd { targetname serialport } {
continue
}
-re "Timeout reading from remote system.*$gdb_prompt" {
- verbose "Got timeout error from gdb.";
+ verbose "Got timeout error from gdb."
}
timeout {
- send_gdb "";
+ send_gdb ""
break
}
}
@@ -82,7 +82,7 @@ proc gdb_target_monitor { exec_file } {
if [target_info exists gdb_protocol] {
set targetname "[target_info gdb_protocol]"
} else {
- perror "No protocol specified for [target_info name].";
+ perror "No protocol specified for [target_info name]."
return -1
}
if [target_info exists baud] {
@@ -98,7 +98,7 @@ proc gdb_target_monitor { exec_file } {
gdb_test "set remote Z-packet disable" ""
}
if [target_info exists gdb_serial] {
- set serialport "[target_info gdb_serial]";
+ set serialport "[target_info gdb_serial]"
} elseif [target_info exists netport] {
set serialport "[target_info netport]"
} else {
@@ -110,14 +110,14 @@ proc gdb_target_monitor { exec_file } {
if ![gdb_target_cmd $targetname $serialport] { return 0 }
- gdb_target_exec;
+ gdb_target_exec
if { $j == 1 && ![reboot_target] } {
- break;
+ break
}
}
- perror "Couldn't set target for $targetname, port is $serialport.";
+ perror "Couldn't set target for $targetname, port is $serialport."
return -1
}
@@ -136,44 +136,44 @@ proc gdb_load { arg } {
global GDB
global gdb_prompt
global timeout
- global last_gdb_file;
+ global last_gdb_file
if { $arg == "" } {
if [info exists last_gdb_file] {
- set arg $last_gdb_file;
+ set arg $last_gdb_file
} else {
- send_gdb "info files\n";
+ send_gdb "info files\n"
gdb_expect 30 {
-re "Symbols from \"(\[^\"\]+)\"" {
- set arg $expect_out(1,string);
- exp_continue;
+ set arg $expect_out(1,string)
+ exp_continue
}
-re "Local exec file:\[\r\n\]+\[ \t\]*`(\[^'\]+)'," {
- set arg $expect_out(1,string);
- exp_continue;
+ set arg $expect_out(1,string)
+ exp_continue
}
-re "$gdb_prompt $" { }
}
}
}
- set last_gdb_file $arg;
+ set last_gdb_file $arg
for { set j 1 } { $j <= 2 } {incr j } {
if [target_info exists gdb,use_standard_load] {
- gdb_target_exec;
+ gdb_target_exec
if ![target_info exists gdb,no_push_conn] {
- remote_push_conn host;
+ remote_push_conn host
}
- set state [remote_ld target $arg];
+ set state [remote_ld target $arg]
if ![target_info exists gdb,no_push_conn] {
- remote_close target;
- remote_pop_conn host;
+ remote_close target
+ remote_pop_conn host
}
if { $state == "pass" } {
if [gdb_target_monitor $arg] { return -1 }
gdb_test "list main" ".*" ""
- verbose "Loaded $arg into $GDB\n";
+ verbose "Loaded $arg into $GDB\n"
return 0
}
} else {
@@ -182,32 +182,32 @@ proc gdb_load { arg } {
if [is_remote host] {
# FIXME: Multiple downloads. bleah.
- set farg [remote_download host $arg];
+ set farg [remote_download host $arg]
} else {
- set farg $arg;
+ set farg $arg
}
if { $arg != "" && [target_info exists gdb_sect_offset] } {
- set textoff [target_info gdb_sect_offset];
- send_gdb "sect .text $textoff\n";
+ set textoff [target_info gdb_sect_offset]
+ send_gdb "sect .text $textoff\n"
gdb_expect 30 {
-re "(0x\[0-9a-z]+) - 0x\[0-9a-z\]+ is \\.data" {
- set dataoff $expect_out(1,string);
- exp_continue;
+ set dataoff $expect_out(1,string)
+ exp_continue
}
-re "(0x\[0-9a-z\]+) - 0x\[0-9a-z\]+ is \\.bss" {
- set bssoff $expect_out(1,string);
- exp_continue;
+ set bssoff $expect_out(1,string)
+ exp_continue
}
-re "$gdb_prompt" { }
}
- set dataoff [format 0x%x [expr $dataoff + $textoff]];
- set bssoff [format 0x%x [expr $bssoff + $textoff]];
- send_gdb "sect .data $dataoff\n";
+ set dataoff [format 0x%x [expr $dataoff + $textoff]]
+ set bssoff [format 0x%x [expr $bssoff + $textoff]]
+ send_gdb "sect .data $dataoff\n"
gdb_expect 30 {
-re "$gdb_prompt" { }
}
- send_gdb "sect .bss $bssoff\n";
+ send_gdb "sect .bss $bssoff\n"
gdb_expect 30 {
-re "$gdb_prompt" { }
}
@@ -215,9 +215,9 @@ proc gdb_load { arg } {
verbose "Loading $farg"
if [target_info exists gdb_load_offset] {
- set command "load $farg [target_info gdb_load_offset]\n";
+ set command "load $farg [target_info gdb_load_offset]\n"
} else {
- set command "load $farg\n";
+ set command "load $farg\n"
}
if [target_info exists gdb_load_timeout] {
set loadtimeout [target_info gdb_load_timeout]
@@ -231,10 +231,10 @@ proc gdb_load { arg } {
}
set load_ok 0
- send_gdb $command;
+ send_gdb $command
gdb_expect $loadtimeout {
-re "\[Ff\]ailed.*$gdb_prompt $" {
- verbose "load failed";
+ verbose "load failed"
}
-re "Timeout reading from remote.*$gdb_prompt" {
}
@@ -259,14 +259,14 @@ proc gdb_load { arg } {
}
# Make sure we don't have an open connection to the target.
- gdb_target_exec;
+ gdb_target_exec
if { $j == 1 } {
if { ![reboot_target] } {
- break;
+ break
}
}
}
- perror "Couldn't load file into GDB.";
+ perror "Couldn't load file into GDB."
return -1
}