Index: gdb/testsuite/config/vx.exp |
diff --git a/gdb/testsuite/config/vx.exp b/gdb/testsuite/config/vx.exp |
index 335287f17d007db195e6ac5f31cdec905a8022f1..df822e2caa4b12c00dc303de3023f8b0f8320c1f 100644 |
--- a/gdb/testsuite/config/vx.exp |
+++ b/gdb/testsuite/config/vx.exp |
@@ -1,5 +1,4 @@ |
-# Copyright 1988, 1990-1992, 1995, 1997, 2007-2012 Free Software |
-# Foundation, Inc. |
+# Copyright 1988-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 |
@@ -59,7 +58,7 @@ proc gdb_start { } { |
global reboot |
# get a connection to the board |
- for { set x 0; } { $x < 3 } { incr x } { |
+ for { set x 0 } { $x < 3 } { incr x } { |
set shell_id [remote_open target] |
if { $shell_id > 0 } { |
verbose "Spawn id for remote shell is $shell_id" |
@@ -67,15 +66,15 @@ proc gdb_start { } { |
set timeout 10 |
verbose "Timeout is now $timeout seconds" 2 |
- set state [spawn_vxgdb]; |
+ set state [spawn_vxgdb] |
if { $state == "pass" } { |
- return 0; |
+ return 0 |
} |
if { $state == "fail" } { |
- return -1; |
+ return -1 |
} |
} |
- remote_reboot target; |
+ remote_reboot target |
} |
} |
@@ -97,8 +96,8 @@ proc spawn_vxgdb { } { |
gdb_expect { |
-re "Done\..*$gdb_prompt $" { |
verbose "Set target to [target_info hostname]" 1 |
- set timeout 10; |
- return "pass"; |
+ set timeout 10 |
+ return "pass" |
} |
-re "net_connect: RPC: (Program not registered|.*Timed out).*$" { |
warning "Couldn't set GDB to target [target_info netport]." |
@@ -107,11 +106,11 @@ proc spawn_vxgdb { } { |
warning "Couldn't set target for vxworks." |
} |
} |
- return "retry"; |
+ return "retry" |
} |
proc gdb_exit { } { |
- remote_close target; |
+ remote_close target |
catch default_gdb_exit |
} |