Re-indent with Emacs' tcl-mode.indent-tcl-mode-after

29 files changed, 117 insertions, 117 deletions

diff --git a/baseboards/arm-sim.exp b/baseboards/arm-sim.exp
index 1372019..bf91d6e 100644
--- a/baseboards/arm-sim.exp
+++ b/baseboards/arm-sim.exp
@@ -7,12 +7,12 @@ process_multilib_options ""
 
 if { [board_info $board obj_format] == "pe" } {
     set additional_options "-Wl,-oformat,pe-arm-little,--image-base,0"
-#    set_board_info uses_underscores 1
+    #    set_board_info uses_underscores 1
 } else {
 
-#    if [istarget "*-*-coff"] {
-#        set_board_info uses_underscores 1
-#    }
+    #    if [istarget "*-*-coff"] {
+    #        set_board_info uses_underscores 1
+    #    }
 
     set additional_options ""
 }
diff --git a/baseboards/basic-sid.exp b/baseboards/basic-sid.exp
index 290c6f4..4f2e0c9 100644
--- a/baseboards/basic-sid.exp
+++ b/baseboards/basic-sid.exp
@@ -49,7 +49,7 @@ proc find_rawsid { } {
 	set tcl_library "$srcdir/tcl/library"
         global host_os
 	switch -glob $host_os {
-	  {cygwin*} { set tcl_library [exec cygpath -w $tcl_library] }
+	    {cygwin*} { set tcl_library [exec cygpath -w $tcl_library] }
         }
 	set env(TCL_LIBRARY) $tcl_library
     }
diff --git a/baseboards/linux-gdbserver.exp b/baseboards/linux-gdbserver.exp
index 6f541da..d22353d 100644
--- a/baseboards/linux-gdbserver.exp
+++ b/baseboards/linux-gdbserver.exp
@@ -12,7 +12,7 @@ set_board_info gdb_protocol "remote"
 
 # Path to the gdbserver executable, if required.
 set_board_info gdb_server_prog \
-	"../gdbserver/gdbserver"
+    "../gdbserver/gdbserver"
 
 # Name of the computer whose socket will be used, if required.
 set_board_info sockethost "localhost:"
diff --git a/baseboards/linux-libremote.exp b/baseboards/linux-libremote.exp
index 2c408c5..91ec2e9 100644
--- a/baseboards/linux-libremote.exp
+++ b/baseboards/linux-libremote.exp
@@ -12,7 +12,7 @@ set_board_info gdb_protocol "remote"
 
 # Path to the gdbserver executable, if required.
 set_board_info gdb_server_prog \
-	"../../libremote/native/server"
+    "../../libremote/native/server"
 
 # Name of the computer whose socket will be used, if required.
 # set_board_info sockethost "localhost"
diff --git a/baseboards/mcore-moto-sim.exp b/baseboards/mcore-moto-sim.exp
index 90f0c39..ac3ec74 100644
--- a/baseboards/mcore-moto-sim.exp
+++ b/baseboards/mcore-moto-sim.exp
@@ -43,7 +43,7 @@ proc sim_spawn { dest cmdline args } {
     ## multilib option.
     ## XXX - fixme - this should not be hardcoded.
     set sim "/home/nickc/bin/linux/sim-be"
-#   set sim "/home/nickc/bin/linux/sim-le"
+    #   set sim "/home/nickc/bin/linux/sim-le"
 
     set simflags "-m abi"
 
diff --git a/baseboards/mips-sim-idt32.exp b/baseboards/mips-sim-idt32.exp
index 72e3009..5b50f44 100644
--- a/baseboards/mips-sim-idt32.exp
+++ b/baseboards/mips-sim-idt32.exp
@@ -32,6 +32,6 @@ set_board_info gdb,nosignals 1
 
 # Tell gdb to assume no fpu for -msoft-float compilation
 if {[string match "*soft-float*" $current_target_name]} {
-  set_board_info gdb_init_command "set mipsfpu none"
+    set_board_info gdb_init_command "set mipsfpu none"
 }
 
diff --git a/baseboards/mips-sim-idt64.exp b/baseboards/mips-sim-idt64.exp
index 94042f2..81304f5 100644
--- a/baseboards/mips-sim-idt64.exp
+++ b/baseboards/mips-sim-idt64.exp
@@ -32,5 +32,5 @@ set_board_info gdb,nosignals 1
 
 # Tell gdb to assume no fpu for -msoft-float compilation
 if {[string match "*soft-float*" $current_target_name]} {
-  set_board_info gdb_init_command "set mipsfpu none"
+    set_board_info gdb_init_command "set mipsfpu none"
 }
diff --git a/baseboards/mips64-sim.exp b/baseboards/mips64-sim.exp
index d1924d5..b7a43a1 100644
--- a/baseboards/mips64-sim.exp
+++ b/baseboards/mips64-sim.exp
@@ -1,6 +1,6 @@
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {mips64vr4300-elf
-                               mips64-elf}
+    mips64-elf}
 
 # Load the generic configuration for this board. This will define a basic
 # set of routines needed by the tool to communicate with the board.
diff --git a/baseboards/mmixware-sim.exp b/baseboards/mmixware-sim.exp
index 1a94833..c5d1980 100644
--- a/baseboards/mmixware-sim.exp
+++ b/baseboards/mmixware-sim.exp
@@ -17,10 +17,10 @@ unset_board_info slow_simulator
 # override.
 if ![board_info $board exists sim] {
     if [info exists SIM] {
-      set_board_info sim $SIM
+	set_board_info sim $SIM
     } else {
-      # Has to exist in the users path.
-      set_board_info sim mmix
+	# Has to exist in the users path.
+	set_board_info sim mmix
     }
 }
 
diff --git a/baseboards/strongarm-cygmon.exp b/baseboards/strongarm-cygmon.exp
index c3ebecf..d48e625 100644
--- a/baseboards/strongarm-cygmon.exp
+++ b/baseboards/strongarm-cygmon.exp
@@ -16,7 +16,7 @@ set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $
 # CygMON linker script.
 
 if {[string compare [board_info $board boardtype] "sa1100dp"] == 0} {
-  set_board_info ldscript "-specs=sa1100dp.specs"
+    set_board_info ldscript "-specs=sa1100dp.specs"
 } elseif {[string compare [board_info $board boardtype] "sa1100mm"] == 0} {
     set_board_info ldscript "-specs=sa1100mm.specs"
 } elseif {[string compare [board_info $board boardtype] "sa-iop"] == 0} {
diff --git a/baseboards/unix.exp b/baseboards/unix.exp
index 38e43bb..e8ae7da 100644
--- a/baseboards/unix.exp
+++ b/baseboards/unix.exp
@@ -13,11 +13,11 @@ set_board_info bmk,use_alarm 1
 
 # Do not use -lm on Cygwin
 if { [istarget "*-*-cygwin*"] } {
-  set_board_info mathlib ""
+    set_board_info mathlib ""
 }
 
 # For the alpha, force use ieee
 if { [istarget "alpha*-*"] } {
-  set_board_info ieee_multilib_flags "-mieee"
+    set_board_info ieee_multilib_flags "-mieee"
 }
 
diff --git a/baseboards/xscale-cygmon.exp b/baseboards/xscale-cygmon.exp
index 113b098..8077ea9 100644
--- a/baseboards/xscale-cygmon.exp
+++ b/baseboards/xscale-cygmon.exp
@@ -16,7 +16,7 @@ set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $
 # CygMON linker script.
 
 if {[string compare [board_info $board boardtype] "xaret"] == 0} {
-  set_board_info ldscript "-specs=xaret.specs"
+    set_board_info ldscript "-specs=xaret.specs"
 } elseif {[string compare [board_info $board boardtype] "iq80310"] == 0} {
     set_board_info ldscript "-specs=iq80310.specs"
 }
diff --git a/config/base68k.exp b/config/base68k.exp
index 65db43c..fdd71d4 100644
--- a/config/base68k.exp
+++ b/config/base68k.exp
@@ -80,8 +80,8 @@ proc base68k_ld { dest prog } {
 	# dbug has problems if we go into binary mode, so this allows us to
 	# disable entry into binary mode.
 	if ![board_info $dest exists no_binary_mode] {
-	remote_binary $dest
-    }
+	    remote_binary $dest
+	}
     }
 
     # if we built the srecord on a remote host, copy it back here so we
@@ -147,8 +147,8 @@ proc base68k_ld { dest prog } {
 	remote_send $dest [board_info $dest download_command]
 	if [board_info $dest exists download_response] {
 	    remote_expect $dest 5 {
-		 [board_info $dest download_response] { }
-		 timeout {
+		[board_info $dest download_response] { }
+		timeout {
 		    perror "Download command never responded."
 		    return "unresolved"
 		}
diff --git a/config/ddb-ether.exp b/config/ddb-ether.exp
index 05912ab..526ee5c 100644
--- a/config/ddb-ether.exp
+++ b/config/ddb-ether.exp
@@ -92,8 +92,8 @@ proc ddb_ether_ld { dest prog } {
 
     remote_send $dest "\n"
     remote_expect $dest 10 {
-	 -re ".*${shell_prompt}$" { }
-	 default {
+	-re ".*${shell_prompt}$" { }
+	default {
 	    return "retry"
 	}
     }
diff --git a/config/gdb-comm.exp b/config/gdb-comm.exp
index 5f28393..5bff35f 100644
--- a/config/gdb-comm.exp
+++ b/config/gdb-comm.exp
@@ -107,7 +107,7 @@ proc gdb_comm_file_cmd { arg } {
         -re "$gdb_prompt $" {
             perror "couldn't load $arg into $GDB."
             return -1
-            }
+	}
         timeout {
             perror "couldn't load $arg into $GDB (timed out)."
             return -1
@@ -402,7 +402,7 @@ proc gdb_comm_load { dest prog args } {
     }
 
     set output ""
-	
+    
     # Now start up the program and look for our magic breakpoints.
     # And a whole lot of other magic stuff too.
 
diff --git a/config/netware.exp b/config/netware.exp
index 7fd79b5..211d9aa 100644
--- a/config/netware.exp
+++ b/config/netware.exp
@@ -151,7 +151,7 @@ proc ${board}_load { dest prog args } {
 
     # Wait a second for the file to "settle" on the NetWare server.
     # I've encountered unexplained failures without this delay.
-#    sleep 1
+    #    sleep 1
 
 
     # The NetWare remote console expects to be connected to a vt100
diff --git a/config/sim.exp b/config/sim.exp
index 50cc508..db935e4 100644
--- a/config/sim.exp
+++ b/config/sim.exp
@@ -82,13 +82,13 @@ proc sim_load { dest prog args } {
 
     set output ""
 
-     if { [board_info target sim,protocol] == "sid" } {
-       set cmd "-e \"set cpu-loader file [list $prog]\""
-     } elseif { [board_info target sim,protocol] == "rawsid" } {
-       set cmd "--load=$prog"
-     } else {
-       set cmd $prog
-     }
+    if { [board_info target sim,protocol] == "sid" } {
+	set cmd "-e \"set cpu-loader file [list $prog]\""
+    } elseif { [board_info target sim,protocol] == "rawsid" } {
+	set cmd "--load=$prog"
+    } else {
+	set cmd $prog
+    }
 
     # Run the program with a limited amount of real time. While
     # this isn't as nice as limiting the amount of CPU time, it
diff --git a/example/calc/testsuite/calc.test/calc.exp b/example/calc/testsuite/calc.test/calc.exp
index 038736b..f95dc65 100644
--- a/example/calc/testsuite/calc.test/calc.exp
+++ b/example/calc/testsuite/calc.test/calc.exp
@@ -27,17 +27,17 @@ set timeout 3
 # ever be triggered.
 #
 expect_after {
-	-re "\[^\n\r\]*$prompt$" {
-		fail "$test (bad match)"
-		if { $verbose > 0 } {
-			regexp ".*\r\n(\[^\r\n\]+)(\[\r\n\])+$prompt$" \
-						$expect_out(buffer) "" output
-			send_user "\tUnmatched output: \"$output\"\n"
-		}
-	}
-	timeout {
-		fail "$test (timeout)"
+    -re "\[^\n\r\]*$prompt$" {
+	fail "$test (bad match)"
+	if { $verbose > 0 } {
+	    regexp ".*\r\n(\[^\r\n\]+)(\[\r\n\])+$prompt$" \
+		$expect_out(buffer) "" output
+	    send_user "\tUnmatched output: \"$output\"\n"
 	}
+    }
+    timeout {
+	fail "$test (timeout)"
+    }
 }
 #
 # Here are the tests
@@ -45,35 +45,35 @@ expect_after {
 set test "version"
 send "version\n"
 expect {
-	-re "Version:.*$prompt$"	{ pass "version" }
+    -re "Version:.*$prompt$"	{ pass "version" }
 }
 
 set test add1
 send "add 3 4\n"
 expect {
-	-re "7+.*$prompt$"		{ pass "$test" }
+    -re "7+.*$prompt$"		{ pass "$test" }
 }
 
 set test add2
 send "add 1 2 3\n"
 expect {
-	-re "Usage: add #1 #2.*$prompt$" { pass "$test" }
+    -re "Usage: add #1 #2.*$prompt$" { pass "$test" }
 }
 
 set test multiply1
 send "multiply 3 4\n"
 expect {
-	-re "12.*$prompt$"		{ pass "$test" }
+    -re "12.*$prompt$"		{ pass "$test" }
 }
 
 set test multiply2
 send "multiply 2 4\n"
 expect {
-	-re "8.*$prompt$"		{ pass "$test" }
+    -re "8.*$prompt$"		{ pass "$test" }
 }
 
 set test multiply3
 send "multiply 1 2 3\n"
 expect {
-	-re "Usage: multiply #1 #2.*$prompt$" { pass "$test" }
+    -re "Usage: multiply #1 #2.*$prompt$" { pass "$test" }
 }
diff --git a/example/calc/testsuite/config/unix.exp b/example/calc/testsuite/config/unix.exp
index 1d9d9e4..26a7060 100644
--- a/example/calc/testsuite/config/unix.exp
+++ b/example/calc/testsuite/config/unix.exp
@@ -25,44 +25,44 @@ if ![info exists prompt] then {
 #
 
 proc calc_version {} {
-	global CALC
-	global prompt
-	set tmp [exec echo "version" | $CALC]
-	regexp "$prompt *(\[^\n\]*)\n.*" $tmp tmp version
-	clone_output "[which $CALC] version $version\n"
+    global CALC
+    global prompt
+    set tmp [exec echo "version" | $CALC]
+    regexp "$prompt *(\[^\n\]*)\n.*" $tmp tmp version
+    clone_output "[which $CALC] version $version\n"
 }
 #
 # calc_load -- loads the program
 #
 proc calc_load { arg } {
-	#
+    #
 }
 
 #
 # calc_exit -- quit and cleanup
 #
 proc calc_exit {} {
-	send "quit\n"
+    send "quit\n"
 }
 
 #
 # calc_start -- start calc running
 #
 proc calc_start {} {
-	global CALC
-	global prompt
-	global spawn_id
-	global verbose
+    global CALC
+    global prompt
+    global spawn_id
+    global verbose
 
-	if { $verbose > 1 } {
-		send_user "starting $CALC\n"
-	}
-	spawn $CALC
-	expect {
-		-re "No such file.*" { perror "Can't start $CALC"; exit 1 }
-		-re "$prompt$" { }
-		timeout { perror "Failed to spawn $CALC (timeout)"; exit 1 }
-	}
+    if { $verbose > 1 } {
+	send_user "starting $CALC\n"
+    }
+    spawn $CALC
+    expect {
+	-re "No such file.*" { perror "Can't start $CALC"; exit 1 }
+	-re "$prompt$" { }
+	timeout { perror "Failed to spawn $CALC (timeout)"; exit 1 }
+    }
 }
 
 calc_start
diff --git a/lib/debugger.exp b/lib/debugger.exp
index 1409f2c..bb2e10d 100644
--- a/lib/debugger.exp
+++ b/lib/debugger.exp
@@ -32,7 +32,7 @@ proc dumpvars { args } {
 	    }
 	}
     }
-       ]
+	      ]
 }
 
 #
@@ -48,7 +48,7 @@ proc dumplocals { args } {
 	    }
 	}
     }
-       ]
+	      ]
 }
 #
 # Dump the body of procedures specified by a regexp.
@@ -204,15 +204,15 @@ proc bt { } {
 # create some stub procedures since we can't alias the command names
 #
 proc dp { args } {
-  uplevel 1 dumprocs $args
+    uplevel 1 dumprocs $args
 }
 
 proc dv { args } {
-  uplevel 1 dumpvars $args
+    uplevel 1 dumpvars $args
 }
 
 proc dl { args } {
-  uplevel 1 dumplocals $args
+    uplevel 1 dumplocals $args
 }
 
 proc dw { args } {
diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp
index 1224f36..4f79f70 100755
--- a/lib/dejagnu.exp
+++ b/lib/dejagnu.exp
@@ -177,9 +177,9 @@ proc host_execute {args} {
 	    verbose "All done" 2
 	}
 	eof {
-#	    unresolved "${executable} died prematurely"
-#	    catch close
-#	    return "${executable} died prematurely"
+	    #	    unresolved "${executable} died prematurely"
+	    #	    catch close
+	    #	    return "${executable} died prematurely"
 	}
 	timeout {
 	    warning "Timed out executing test case"
@@ -187,7 +187,7 @@ proc host_execute {args} {
 		incr timetol
 		exp_continue
 	    } else {
--		catch close
+		-		catch close
 		return "Timed out executing test case"
 	    }
 	}
diff --git a/lib/framework.exp b/lib/framework.exp
index 04a4ceb..b82b7e3 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -76,8 +76,8 @@ proc open_logs { } {
     catch "exec rm -f $outdir/$tool.sum"
     set sum_file [open "$outdir/$tool.sum" w]
     if { $xml } {
-       catch "exec rm -f $outdir/$tool.xml"
-       set xml_file [open "$outdir/$tool.xml" w]
+	catch "exec rm -f $outdir/$tool.xml"
+	set xml_file [open "$outdir/$tool.xml" w]
         xml_output "<?xml version=\"1.0\"?>"
         insertdtd
         xml_output "<testsuite>"
@@ -379,7 +379,7 @@ proc log_and_exit {} {
 proc xml_output { message } {
     global xml_file
     if { $xml_file != "" } {
-       puts $xml_file "$message"
+	puts $xml_file "$message"
     }
 }
 
@@ -726,7 +726,7 @@ proc record_test { type message args } {
         global expect_out
 	set rio { "" "" }
 	if { [catch { set rio [split $expect_out(buffer) "\n"] } result]} {
-		#do nothing - leave as { "" "" }
+	    #do nothing - leave as { "" "" }
 	}
 	
         set output ""
@@ -740,7 +740,7 @@ proc record_test { type message args } {
         xml_output "  </test>"
     }
 
-   switch $type {
+    switch $type {
 	PASS {
 	    if $prms_id {
 		set message [concat $message "\t(PRMS $prms_id)"]
diff --git a/lib/libgloss.exp b/lib/libgloss.exp
index 13d30d0..a8edc52 100644
--- a/lib/libgloss.exp
+++ b/lib/libgloss.exp
@@ -449,10 +449,10 @@ proc get_multilibs { args } {
     # extract the options and their directory names as know by gcc
     foreach i "[exec $compiler --print-multi-lib]" {
     	if {$extra != ""} {
-          # string trimright would do the wrong thing if we included
-          # the leading @@ in $extra
- 	  set i [string trimright $i $extra]
-          set i [string trimright $i "@@"]
+	    # string trimright would do the wrong thing if we included
+	    # the leading @@ in $extra
+	    set i [string trimright $i $extra]
+	    set i [string trimright $i "@@"]
 	}
 	set opts ""
 	set dir ""
@@ -847,7 +847,7 @@ proc build_wrapper { gluefile } {
 	lappend flags "additional_flags=[target_info wrap_compile_flags]"
     }
     if { [target_compile ${libdir}/testglue.c ${gluefile} object $flags] == "" } {
-      set gluefile [remote_download host ${gluefile} ${tool}_tg.o]
+	set gluefile [remote_download host ${gluefile} ${tool}_tg.o]
 	return [list $gluefile $result]
     } else {
 	return ""
diff --git a/lib/remote.exp b/lib/remote.exp
index 8fc011e..8864a7c 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -1143,9 +1143,9 @@ proc check_for_board_status  { variable } {
     # crashed, regardless of status found elsewhere (e.g. simulator exit
     # code).
     if { [target_info needs_status_wrapper] != "" } then {
-       set nomatch_return 2
+	set nomatch_return 2
     } else {
-       set nomatch_return -1
+	set nomatch_return -1
     }
 
     if [regexp "(^|\[\r\n\])\\*\\*\\* EXIT code" $output] {
diff --git a/lib/rsh.exp b/lib/rsh.exp
index 4c91cec..f0a49d6 100644
--- a/lib/rsh.exp
+++ b/lib/rsh.exp
@@ -124,7 +124,7 @@ proc rsh_open { hostname } {
 		warning "$RSH: already connected."
 	    }
 	    timeout {
-	       warning "$RSH: timed out trying to connect."
+		warning "$RSH: timed out trying to connect."
 	    }
 	    eof {
 		perror "$RSH: got EOF while trying to connect."
@@ -135,7 +135,7 @@ proc rsh_open { hostname } {
     }
 
     if { $result < 0 } {
-#	perror "$RSH: couldn't connect after $tries tries."
+	#	perror "$RSH: couldn't connect after $tries tries."
 	close -i $spawn_id
 	set spawn_id -1
     } else {
diff --git a/lib/utils.exp b/lib/utils.exp
index c3df545..14fdbc4 100644
--- a/lib/utils.exp
+++ b/lib/utils.exp
@@ -362,8 +362,8 @@ proc diff { file_1 file_2 } {
         set line_a [lindex ${list_a} ${i}]
         set line_b [lindex ${list_b} ${i}]
 
-#        verbose "\t${file_1}: ${i}: ${line_a}\n" 3
-#        verbose "\t${file_2}: ${i}: ${line_b}\n" 3
+	#        verbose "\t${file_1}: ${i}: ${line_a}\n" 3
+	#        verbose "\t${file_2}: ${i}: ${line_b}\n" 3
         if [string compare ${line_a} ${line_b}] {
 	    verbose "line #${i}\n" 2
             verbose "\< ${line_a}\n" 2
diff --git a/runtest.exp b/runtest.exp
index aff9108..aa26fd4 100755
--- a/runtest.exp
+++ b/runtest.exp
@@ -69,7 +69,7 @@ set configfile  site.exp	;# (local to this file)
 set multipass   ""		;# list of passes and var settings
 set errno	"";		;#
 set exit_error  0		;# Toggle for whether to set the exit status
-				;# on Tcl bugs in test case drivers.
+;# on Tcl bugs in test case drivers.
 #
 # These describe the host and target environments.
 #
@@ -1177,9 +1177,9 @@ for { set i 0 } { $i < $argc } { incr i } {
 	    exit 0	
 	}
 
-       "[A-Z0-9_-.]*=*" { # skip makefile style args like CC=gcc, etc... (processed in first pass)
-               continue
-       }
+	"[A-Z0-9_-.]*=*" { # skip makefile style args like CC=gcc, etc... (processed in first pass)
+	    continue
+	}
 
 	default {
 	    if [info exists tool] {
@@ -1311,8 +1311,8 @@ proc load_tool_target_config { name } {
 	# If we can't load the tool init file, this must be a simple natively hosted
 	# test suite, so we use the default procs for Unix.
 	if { [search_and_load_file "library file" default.exp [list $libdir $libdir/config [file dirname [file dirname $srcdir]]/dejagnu/config $srcdir/config . [file dirname [file dirname [file dirname $srcdir]]]/dejagnu/config]] == 0 } {
-	send_error "ERROR: Couldn't find default tool init file.\n"
-	exit 1
+	    send_error "ERROR: Couldn't find default tool init file.\n"
+	    exit 1
 	}
     }
 }
@@ -1505,10 +1505,10 @@ if ![exp_debug] {
              {SIGINT  {interrupted by user}} \
              {SIGQUIT {interrupted by user}} \
              {SIGSEGV {segmentation violation}}" {
-	 set signal [lindex $sig 0]
-	 set str [lindex $sig 1]
-	 trap "send_error \"got a \[trap -name\] signal, $str \\n\"; log_and_exit;" $signal
-	 verbose "setting trap for $signal to $str" 1
+	set signal [lindex $sig 0]
+	set str [lindex $sig 1]
+	trap "send_error \"got a \[trap -name\] signal, $str \\n\"; log_and_exit;" $signal
+	verbose "setting trap for $signal to $str" 1
     }
     unset signal str sig
 }
@@ -1599,8 +1599,8 @@ if [info exists errorInfo] {
 regsub -all "\(\[^/\]\)//*" $srcdir "\\1/" srcdir
 
 if ![info exists target_list] {
-# Make sure there is at least one target machine. It's probably a Unix box,
-# but that's just a guess.
+    # Make sure there is at least one target machine. It's probably a Unix box,
+    # but that's just a guess.
     set target_list { "unix" }
 } else {
     verbose "target list is $target_list"
@@ -1635,10 +1635,10 @@ foreach current_target $target_list {
 
     setup_target_hook $current_target_name $current_target
 
-# If multiple passes requested, set them up.  Otherwise prepare just one.
-# The format of `MULTIPASS' is a list of elements containing
-# "{ name var1=value1 ... }" where `name' is a generic name for the pass and
-# currently has no other meaning.
+    # If multiple passes requested, set them up.  Otherwise prepare just one.
+    # The format of `MULTIPASS' is a list of elements containing
+    # "{ name var1=value1 ... }" where `name' is a generic name for the pass and
+    # currently has no other meaning.
 
     global env
 
@@ -1649,9 +1649,9 @@ foreach current_target $target_list {
 	set multipass { "" }
     }
 
-# If PASS is specified, we want to run only the tests specified.
-# Its value should be a number or a list of numbers that specify
-# the passes that we want to run.
+    # If PASS is specified, we want to run only the tests specified.
+    # Its value should be a number or a list of numbers that specify
+    # the passes that we want to run.
     if [info exists PASS] {
 	set pass $PASS
     } else {
diff --git a/testsuite/config/default.exp b/testsuite/config/default.exp
index d0acac6..02a910e 100644
--- a/testsuite/config/default.exp
+++ b/testsuite/config/default.exp
@@ -75,5 +75,5 @@ proc runtest_start { } {
 	perror "Can't find $RUNTEST"
     }
 
-#    return [open [concat "$RUNTEST $RUNTESTFLAGS"] r]
+    #    return [open [concat "$RUNTEST $RUNTESTFLAGS"] r]
 }
diff --git a/testsuite/lib/libsup.exp b/testsuite/lib/libsup.exp
index 136ae92..07b89db 100644
--- a/testsuite/lib/libsup.exp
+++ b/testsuite/lib/libsup.exp
@@ -87,8 +87,8 @@ proc start_expect { } {
 	verbose "EXPECT defaulting to $EXPECT" 2
     }
 
-#    catch close
-#    catch wait
+    #    catch close
+    #    catch wait
 
     # Start expect runing
     spawn "$EXPECT"