From 6b5cde5bf1dfa159ed178e024f81006c5c507cf2 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Sat, 16 Aug 2003 13:08:57 +0000 Subject: Whitespace fixes. --- config/ddb-ether.exp | 8 ++++---- config/gdb_stub.exp | 26 +++++++++++++------------- config/netware.exp | 8 ++++---- config/sim.exp | 6 +++--- config/unix.exp | 8 ++++---- config/vxworks.exp | 18 +++++++++--------- 6 files changed, 37 insertions(+), 37 deletions(-) (limited to 'config') diff --git a/config/ddb-ether.exp b/config/ddb-ether.exp index 336763c..05912ab 100644 --- a/config/ddb-ether.exp +++ b/config/ddb-ether.exp @@ -4,12 +4,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 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, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -118,7 +118,7 @@ proc ddb_ether_ld { dest prog } { exp_continue } } - -re ".*${shell_prompt}$" { + -re ".*${shell_prompt}$" { set state "fail" } default { @@ -131,7 +131,7 @@ proc ddb_ether_ld { dest prog } { } return "pass" } - + proc ddb_ether_spawn { dest prog args } { set state [ddb_ether_ld $dest $prog] diff --git a/config/gdb_stub.exp b/config/gdb_stub.exp index 4f88b7a..95b8ec8 100644 --- a/config/gdb_stub.exp +++ b/config/gdb_stub.exp @@ -4,12 +4,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 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, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -188,7 +188,7 @@ proc gdb_stub_startup { dest } { } -re "Reading symbols from.*done..*$gdb_prompt $" {} -re "$gdb_prompt $" { warning "GDB couldn't find loader" } - timeout { + timeout { warning "(timeout) read symbol file" return -1 } @@ -203,7 +203,7 @@ proc gdb_stub_startup { dest } { remote_expect host 60 { -re "appears to be alive.*$gdb_prompt" { } -re "Remote target.*connected to.*$gdb_prompt" { } - -re "$gdb_prompt" { + -re "$gdb_prompt" { warning "Error reconnecting to stub." return -1 } @@ -262,12 +262,12 @@ proc gdb_stub_startup { dest } { remote_send host "y\n" exp_continue } - -re "Starting program:.*loader.*$" { + -re "Starting program:.*loader.*$" { verbose "Starting loader succeeded" } - timeout { + timeout { warning "(timeout) starting the loader" - return -1 + return -1 } default { warning "error starting the loader" @@ -286,9 +286,9 @@ proc gdb_stub_startup { dest } { -re "$gdb_prompt $" { verbose "Running loader succeeded" } - timeout { + timeout { warning "(timeout) interrupting the loader" - return -1 + return -1 } default { warning "error interrupting the loader" @@ -369,7 +369,7 @@ proc gdb_stub_start { dest } { } remote_send host "break copyloop\n" remote_expect host 10 { - -re "Breakpoint.*$gdb_prompt $" { + -re "Breakpoint.*$gdb_prompt $" { set start_comm "continue\n" } -re "Function.*not defined.*$gdb_prompt $" { } @@ -491,7 +491,7 @@ proc gdb_stub_load { dest prog args } { set result [remote_wait $dest 120] set status [lindex $result 0] set output [lindex $result 1] - + if { $status == 0 } { return [list "pass" $output] } else if { $status > 0 } { @@ -546,7 +546,7 @@ proc gdb_stub_ld { dest prog } { warning "GDB couldn't read file" return [gdb_stub_retry_ld "$dest" "$prog"] } - timeout { + timeout { warning "(timeout) read symbol file" return [gdb_stub_retry_ld "$dest" "$prog"] } @@ -572,7 +572,7 @@ proc gdb_stub_ld { dest prog } { -re "$gdb_prompt $" { verbose "Set remote target to $serial" 2 } - timeout { + timeout { warning "Couldn't set remote target." return 0 } diff --git a/config/netware.exp b/config/netware.exp index af670b1..7fd79b5 100644 --- a/config/netware.exp +++ b/config/netware.exp @@ -4,12 +4,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 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, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -107,9 +107,9 @@ proc ${board}_load { dest prog args } { return "untested" } - # + # set exe [file tail $prog] - + # We can't blindly append a suffix to the object name, because the # result may not be valid on netware's 8.3 filesystem. set nlm "$tmpdir/x.nlm" diff --git a/config/sim.exp b/config/sim.exp index 3471f27..50cc508 100644 --- a/config/sim.exp +++ b/config/sim.exp @@ -4,12 +4,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 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, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -36,7 +36,7 @@ proc sim_spawn { dest cmdline args } { } else { set simflags "" } - + if ![is_remote host] { if { [which $sim] == 0 } { verbose -log "Simulator $sim missing." 3 diff --git a/config/unix.exp b/config/unix.exp index c8263d7..2de2299 100644 --- a/config/unix.exp +++ b/config/unix.exp @@ -4,12 +4,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 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, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -90,7 +90,7 @@ proc unix_load { dest prog args } { setenv LD_LIBRARY_PATH $orig_ld_library_path setenv SHLIB_PATH $orig_ld_library_path } - } else { + } else { set remotefile "/tmp/[file tail $prog].[pid]" set remotefile [remote_download $dest $prog $remotefile] if { $remotefile == "" } { @@ -123,7 +123,7 @@ proc unix_load { dest prog args } { set output [lindex $status 1] set status [lindex $status 0] } - + setenv LD_LIBRARY_PATH $orig_ld_library_path setenv SHLIB_PATH $orig_ld_library_path diff --git a/config/vxworks.exp b/config/vxworks.exp index 233ae5a..e05c175 100644 --- a/config/vxworks.exp +++ b/config/vxworks.exp @@ -4,15 +4,15 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 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, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Please email any bugs, comments, and/or additions to this file to: # bug-dejagnu@gnu.org @@ -30,7 +30,7 @@ proc ${board}_init { dest } { set do_reboot 0 set desired_kernel [board_info $dest "kernel,$target_os"] - + if { $desired_kernel == "" } { vxworks_final_init $dest # Nothing to see here, nothing to do. Move along. @@ -47,7 +47,7 @@ proc ${board}_init { dest } { remote_send $dest "\n" exp_continue } - -re "VxWorks Boot" { + -re "VxWorks Boot" { set boot_mon 0 set boot_mon_prompt "VxWorks Boot" } @@ -264,7 +264,7 @@ proc vxworks_open { dest args } { # 1 - failed (eg: link failed so testcase should fail) # -1 - unresolved (eg: timeout), may be fixed by rebooting # -proc vxworks_ld { dest prog } { +proc vxworks_ld { dest prog } { global decimal hex global board_info @@ -312,7 +312,7 @@ proc vxworks_ld { dest prog } { perror "Need to set the user and password." set result 1 } - -re "Stale NFS file handle.*$shell_prompt $" { + -re "Stale NFS file handle.*$shell_prompt $" { # Need to retry. } -re "undefined symbol:.*$shell_prompt $" { @@ -336,13 +336,13 @@ proc vxworks_ld { dest prog } { -re "(.*)$shell_prompt $" { warning "Load failed: $expect_out(1,string)" } - timeout { + timeout { warning "Timed out trying load $prog." set result -1 } } } - + if { $result && [info exists expect_out(buffer)] } { send_log "$expect_out(buffer)" } -- cgit v1.1