From e8df4c5fe0ca8dfa8df81f1c61eb5e337d8ba62b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 10 Mar 2016 11:56:23 +0000
Subject: Eliminate exess spacings in many test-cases

---
 tests/README             |   6 +-
 tests/apply.test         |   2 +-
 tests/assemble.test      |  66 +++----
 tests/assemble1.bench    |  19 +-
 tests/autoMkindex.test   |   2 +-
 tests/basic.test         |  22 +--
 tests/chan.test          |   4 +-
 tests/chanio.test        |  48 ++---
 tests/clock.test         |  80 ++++----
 tests/compile.test       |  20 +-
 tests/coroutine.test     |   8 +-
 tests/encoding.test      |  10 +-
 tests/execute.test       |   6 +-
 tests/expr-old.test      |   8 +-
 tests/expr.test          |   6 +-
 tests/fileSystem.test    |   4 +-
 tests/history.test       |   2 +-
 tests/httpd              |   2 +-
 tests/httpold.test       |   2 +-
 tests/info.test          |   8 +-
 tests/init.test          |  10 +-
 tests/interp.test        |  52 ++---
 tests/io.test            |  74 +++----
 tests/ioTrans.test       |   2 +-
 tests/iogt.test          |   2 +-
 tests/lindex.test        |   4 +-
 tests/lmap.test          |   6 +-
 tests/lrange.test        |   2 +-
 tests/lrepeat.test       |   4 +-
 tests/lsearch.test       |  14 +-
 tests/lsetComp.test      | 506 +++++++++++++++++++++++------------------------
 tests/main.test          |   2 +-
 tests/misc.test          |   4 +-
 tests/msgcat.test        |  48 ++---
 tests/namespace.test     |  32 +--
 tests/nre.test           |   6 +-
 tests/obj.test           |   6 +-
 tests/oo.test            |   8 +-
 tests/parse.test         |   2 +-
 tests/parseExpr.test     |   4 +-
 tests/pkgMkIndex.test    |   2 +-
 tests/platform.test      |   4 +-
 tests/proc.test          |   6 +-
 tests/reg.test           |   6 +-
 tests/regexp.test        |  10 +-
 tests/regexpComp.test    |  12 +-
 tests/set-old.test       |   2 +-
 tests/set.test           |   2 +-
 tests/split.test         |   2 +-
 tests/stack.test         |   2 +-
 tests/string.test        |   6 +-
 tests/stringObj.test     |   4 +-
 tests/subst.test         |  14 +-
 tests/tailcall.test      |  12 +-
 tests/tm.test            |   2 +-
 tests/trace.test         |  60 +++---
 tests/unixForkEvent.test |   2 +-
 tests/unixNotfy.test     |   4 +-
 tests/unknown.test       |   2 +-
 tests/uplevel.test       |   6 +-
 tests/upvar.test         |   2 +-
 tests/util.test          |   6 +-
 tests/var.test           |  12 +-
 tests/winPipe.test       |   4 +-
 64 files changed, 648 insertions(+), 649 deletions(-)

diff --git a/tests/README b/tests/README
index ce2382e..e86100f 100644
--- a/tests/README
+++ b/tests/README
@@ -59,7 +59,7 @@ should correspond to the Tcl or C code file that they are testing.
 For example, the test file for the C file "tclCmdAH.c" is
 "cmdAH.test".  Test files that contain black-box tests may not
 correspond to any Tcl or C code file so they should match the pattern
-"*_bb.test". 
+"*_bb.test".
 
 Be sure your new test file can be run from any working directory.
 
@@ -72,12 +72,12 @@ as well as an installation environment.  If your test file contains
 tests that should not be run in one or more of those cases, please use
 the constraints mechanism to skip those tests.
 
-4. Incompatibilities of package tcltest 2.1 with 
+4. Incompatibilities of package tcltest 2.1 with
    testing machinery of very old versions of Tcl:
 ------------------------------------------------
 
 1) Global variables such as VERBOSE, TESTS, and testConfig of the
-   old machinery correspond to the [configure -verbose], 
+   old machinery correspond to the [configure -verbose],
    [configure -match], and [testConstraint] commands of tcltest 2.1,
    respectively.
 
diff --git a/tests/apply.test b/tests/apply.test
index ba19b81..597cd97 100644
--- a/tests/apply.test
+++ b/tests/apply.test
@@ -228,7 +228,7 @@ test apply-8.3 {args treatment} {
     apply [list {x args} $applyBody] 1 2 3
 } {{x 1} {args {2 3}}}
 test apply-8.4 {default values} {
-    apply [list {{x 1} {y 2}} $applyBody] 
+    apply [list {{x 1} {y 2}} $applyBody]
 } {{x 1} {y 2}}
 test apply-8.5 {default values} {
     apply [list {{x 1} {y 2}} $applyBody] 3 4
diff --git a/tests/assemble.test b/tests/assemble.test
index b0487e6..5c226cd 100644
--- a/tests/assemble.test
+++ b/tests/assemble.test
@@ -301,12 +301,12 @@ test assemble-7.1 {add, wrong # args} {
     -result {wrong # args*}
 }
 test assemble-7.2 {add} {
-    -body { 
+    -body {
 	assemble {
 	    push 2
 	    push 2
 	    add
-	} 
+	}
     }
     -result {4}
 }
@@ -349,7 +349,7 @@ test assemble-7.5 {bitwise ops} {
 }
 test assemble-7.6 {div} {
     -body {
-	assemble {push 999999; push 7; div} 
+	assemble {push 999999; push 7; div}
     }
     -result 142857
 }
@@ -360,7 +360,7 @@ test assemble-7.7 {dup} {
 	}
     }
     -result 9
-}	
+}
 test assemble-7.8 {eq} {
     -body {
 	list \
@@ -638,7 +638,7 @@ test assemble-7.24 {lsetList} {
 test assemble-7.25 {lshift} {
     -body {
 	assemble {push 16; push 4; lshift}
-    } 
+    }
     -result 256
 }
 test assemble-7.26 {mod} {
@@ -678,7 +678,7 @@ test assemble-7.30 {pop} {
 test assemble-7.31 {rshift} {
     -body {
 	assemble {push 257; push 4; rshift}
-    } 
+    }
     -result 16
 }
 test assemble-7.32 {storeArrayStk} {
@@ -1201,7 +1201,7 @@ test assemble-10.7 {expr - noncompilable} {
 
 # assemble-11 - ASSEM_LVT4 (exist, existArray, dictAppend, dictLappend,
 #			    nsupvar, variable, upvar)
-		
+
 test assemble-11.1 {exist - wrong # args} {
     -body {
 	assemble {exist}
@@ -1310,7 +1310,7 @@ test assemble-11.10 {variable} {
 }
 
 # assemble-12 - ASSEM_LVT1 (incr and incrArray)
-		
+
 test assemble-12.1 {incr - wrong # args} {
     -body {
 	assemble {incr}
@@ -1743,16 +1743,16 @@ test assemble-17.9 {jump - resolve a label multiple times} {
 	    set result {}
 	    assemble {
 		jump common
-		
+
 		label zero
-		pop		
+		pop
 		incrImm case 1
 		pop
 		push a
 		append result
 		pop
 		jump common
-		
+
 		label one
 		pop
 		incrImm case 1
@@ -1761,7 +1761,7 @@ test assemble-17.9 {jump - resolve a label multiple times} {
 		append result
 		pop
 		jump common
-		
+
 		label common
 		load case
 		dup
@@ -1780,7 +1780,7 @@ test assemble-17.9 {jump - resolve a label multiple times} {
 		push 3
 		eq
 		jumpTrue three
-		
+
 		label two
 		pop
 		incrImm case 1
@@ -1789,7 +1789,7 @@ test assemble-17.9 {jump - resolve a label multiple times} {
 		append result
 		pop
 		jump common
-		
+
 		label three
 		pop
 		incrImm case 1
@@ -1887,7 +1887,7 @@ test assemble-17.15 {multiple passes of code resizing} {
 	append body {label b15; push b; concat 2; nop; nop; jump c} \n
 	append body {label d}
 	proc x {} [list assemble $body]
-    }	
+    }
     -body {
 	x
     }
@@ -2080,7 +2080,7 @@ test assemble-20.5 {lsetFlat - negative operand count} {
 test assemble-20.6 {lsetFlat} {
     -body {
 	assemble {push b; push a; lsetFlat 2}
-    } 
+    }
     -result b
 }
 test assemble-20.7 {lsetFlat} {
@@ -3066,12 +3066,12 @@ test assemble-40.1 {unbalanced stack} {
 	    [catch {
 		assemble {
 		    push 3
-		    dup 
-		    mult 
+		    dup
+		    mult
 		    push 4
-		    dup 
-		    mult 
-		    pop 
+		    dup
+		    mult
+		    pop
 		    expon
 		}
 	    } result] $result $::errorInfo
@@ -3170,7 +3170,7 @@ test assemble-50.1 {Ulam's 3n+1 problem, TAL implementation} {
 		load n;		# max
 		dup;		# max n
 		jump start;     # max n
-	    
+
 		label loop;	# max n
 		over 1;         # max n max
 		over 1;		# max in max n
@@ -3180,29 +3180,29 @@ test assemble-50.1 {Ulam's 3n+1 problem, TAL implementation} {
 		reverse 2;      # n max
 		pop;            # n
 		dup;            # n n
-	    
+
 		label skip;	# max n
 		dup;            # max n n
 		push 2;         # max n n 2
 		mod;            # max n n%2
 		jumpTrue odd;   # max n
-	    
+
 		push 2;         # max n 2
 		div;            # max n/2 -> max n
 		jump start;     # max n
-	     
+
 		label odd;	# max n
 		push 3;         # max n 3
 		mult;           # max 3*n
 		push 1;         # max 3*n 1
 		add;            # max 3*n+1
-	    
+
 		label start;	# max n
 		dup;		# max n n
 		push 1;		# max n n 1
 		neq;		# max n n>1
 		jumpTrue loop;	# max n
-	    
+
 		pop;		# max
 	    }
 	}
@@ -3232,7 +3232,7 @@ test assemble-51.3 {memory leak testing} memory {
 		load n;		# max
 		dup;		# max n
 		jump start;     # max n
-	    
+
 		label loop;	# max n
 		over 1;         # max n max
 		over 1;		# max in max n
@@ -3242,29 +3242,29 @@ test assemble-51.3 {memory leak testing} memory {
 		reverse 2;      # n max
 		pop;            # n
 		dup;            # n n
-	    
+
 		label skip;	# max n
 		dup;            # max n n
 		push 2;         # max n n 2
 		mod;            # max n n%2
 		jumpTrue odd;   # max n
-	    
+
 		push 2;         # max n 2
 		div;            # max n/2 -> max n
 		jump start;     # max n
-	     
+
 		label odd;	# max n
 		push 3;         # max n 3
 		mult;           # max 3*n
 		push 1;         # max 3*n 1
 		add;            # max 3*n+1
-	    
+
 		label start;	# max n
 		dup;		# max n n
 		push 1;		# max n n 1
 		neq;		# max n n>1
 		jumpTrue loop;	# max n
-	    
+
 		pop;		# max
 	    }
 	}} 1
diff --git a/tests/assemble1.bench b/tests/assemble1.bench
index 18fd3a9..e294108 100644
--- a/tests/assemble1.bench
+++ b/tests/assemble1.bench
@@ -20,7 +20,7 @@ proc ulam2 {n} {
 	load n;		# max
 	dup;		# max n
 	jump start;     # max n
-	
+
 	label loop;	# max n
 	over 1;         # max n max
 	over 1;		# max in max n
@@ -30,29 +30,29 @@ proc ulam2 {n} {
 	reverse 2;      # n max
 	pop;            # n
 	dup;            # n n
-	
+
 	label skip;	# max n
 	dup;            # max n n
 	push 2;         # max n n 2
 	mod;            # max n n%2
 	jumpTrue odd;   # max n
-	
+
 	push 2;         # max n 2
 	div;            # max n/2 -> max n
 	jump start;     # max n
-	
+
 	label odd;	# max n
 	push 3;         # max n 3
 	mult;           # max 3*n
 	push 1;         # max 3*n 1
 	add;            # max 3*n+1
-	
+
 	label start;	# max n
 	dup;		# max n n
 	push 1;		# max n n 1
 	neq;		# max n n>1
 	jumpTrue loop;	# max n
-	
+
 	pop;		# max
     }
 }
@@ -60,12 +60,12 @@ set tcl_traceCompile 2; ulam2 1; set tcl_traceCompile 0
 
 proc test1 {n} {
     for {set i 1} {$i <= $n} {incr i} {
-	ulam1 $i  
+	ulam1 $i
     }
 }
 proc test2 {n} {
     for {set i 1} {$i <= $n} {incr i} {
-	ulam2 $i  
+	ulam2 $i
     }
 }
 
@@ -75,11 +75,10 @@ for {set j 0} {$j < 10} {incr j} {
     test1 30000
     set after [clock microseconds]
     puts "compiled: [expr {1e-6 * ($after - $before)}]"
-    
+
     test2 1
     set before [clock microseconds]
     test2 30000
     set after [clock microseconds]
     puts "assembled: [expr {1e-6 * ($after - $before)}]"
 }
-    
\ No newline at end of file
diff --git a/tests/autoMkindex.test b/tests/autoMkindex.test
index 4721553..b42d50d 100644
--- a/tests/autoMkindex.test
+++ b/tests/autoMkindex.test
@@ -180,7 +180,7 @@ test autoMkindex-3.1 {slaveHook} -setup {
 } -cleanup {
     # Reset initCommands to avoid trashing other tests
     AutoMkindexTestReset
-} -result 1 
+} -result 1
 # The auto_mkindex_parser::command is used to register commands that create
 # new commands.
 test autoMkindex-3.2 {auto_mkindex_parser::command} -setup {
diff --git a/tests/basic.test b/tests/basic.test
index 1a0037c..bff9a95 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -241,7 +241,7 @@ test basic-18.1 {TclRenameCommand, name of existing cmd can have namespace quali
     }
     list [test_ns_basic::p] \
          [rename test_ns_basic::p test_ns_basic::q] \
-         [test_ns_basic::q] 
+         [test_ns_basic::q]
 } {{p in ::test_ns_basic} {} {p in ::test_ns_basic}}
 test basic-18.2 {TclRenameCommand, existing cmd must be found} {
     catch {namespace delete {*}[namespace children :: test_ns_*]}
@@ -454,11 +454,11 @@ test basic-26.2 {Tcl_EvalObjEx, pure-list branch: preserve "objv"} -body {
     #   a - the pure-list internal rep is destroyed by shimmering
     #   b - the command returns an error
     # As the error code in Tcl_EvalObjv accesses the list elements, this will
-    # cause a segfault if [Bug 1119369] has not been fixed. 
+    # cause a segfault if [Bug 1119369] has not been fixed.
     # NOTE: a MEM_DEBUG build may be necessary to guarantee the segfault.
     #
 
-    set SRC [list foo 1] ;# pure-list command 
+    set SRC [list foo 1] ;# pure-list command
     proc foo str {
 	# Shimmer pure-list to cmdName, cleanup and error
 	proc $::SRC {} {}; $::SRC
@@ -476,11 +476,11 @@ test basic-26.3 {Tcl_EvalObjEx, pure-list branch: preserve "objv"} -body {
     # Follow the pure-list branch in a manner that
     #   a - the pure-list internal rep is destroyed by shimmering
     #   b - the command accesses its command line
-    # This will cause a segfault if [Bug 1119369] has not been fixed. 
+    # This will cause a segfault if [Bug 1119369] has not been fixed.
     # NOTE: a MEM_DEBUG build may be necessary to guarantee the segfault.
     #
 
-    set SRC [list foo 1] ;# pure-list command 
+    set SRC [list foo 1] ;# pure-list command
     proc foo str {
 	# Shimmer pure-list to cmdName, cleanup and error
 	proc $::SRC {} {}; $::SRC
@@ -592,7 +592,7 @@ test basic-46.2 {Tcl_AllowExceptions: exception return not allowed} -setup {
 invoked "break" outside of a loop
     while executing
 "break"
-    (file "*BREAKtest" line 3)}    
+    (file "*BREAKtest" line 3)}
 
 test basic-46.3 {Tcl_AllowExceptions: exception return not allowed} -setup {
     set fName [makeFile {
@@ -609,7 +609,7 @@ test basic-46.3 {Tcl_AllowExceptions: exception return not allowed} -setup {
 } -returnCodes error -match glob -result {invoked "break" outside of a loop
     while executing
 "break"
-    (file "*BREAKtest" line 4)}    
+    (file "*BREAKtest" line 4)}
 
 test basic-46.4 {Tcl_AllowExceptions: exception return not allowed} -setup {
     set fName [makeFile {
@@ -737,7 +737,7 @@ test basic-48.1.$noComp {expansion: parsing} $constraints {
 		# Another comment
 		list 1  2\
 			3   {*}$::l1
-            
+
 		# Comment again
 	}
 } {1 2 3 a {b b} c d}
@@ -810,7 +810,7 @@ test basic-48.13.$noComp {expansion: odd usage} $constraints {
 test basic-48.14.$noComp {expansion: hash command} -setup {
         catch {rename \# ""}
         set cmd "#"
-    } -constraints $constraints -body { 
+    } -constraints $constraints -body {
            run { {*}$cmd apa bepa }
     } -cleanup {
 	unset cmd
@@ -870,7 +870,7 @@ test basic-48.16.$noComp {expansion: testing for leaks} -setup {
             stress
             set tmp $end
             set end [getbytes]
-        }    
+        }
         set leak [expr {$end - $tmp}]
     } -cleanup {
 	unset end i tmp
@@ -881,7 +881,7 @@ test basic-48.16.$noComp {expansion: testing for leaks} -setup {
 test basic-48.17.$noComp {expansion: object safety} -setup {
         set old_precision $::tcl_precision
         set ::tcl_precision 4
-    } -constraints $constraints -body { 
+    } -constraints $constraints -body {
             set third [expr {1.0/3.0}]
             set l [list $third $third]
             set x [run {list $third {*}$l $third}]
diff --git a/tests/chan.test b/tests/chan.test
index d8390e2..6808453 100644
--- a/tests/chan.test
+++ b/tests/chan.test
@@ -135,7 +135,7 @@ test chan-16.4 {chan command: pending subcommand} -body {
     chan pending {input output} stdout
 } -returnCodes error -result "bad mode \"input output\": must be input or output"
 test chan-16.5 {chan command: pending input subcommand} -body {
-    chan pending input stdout 
+    chan pending input stdout
 } -result -1
 test chan-16.6 {chan command: pending input subcommand} -body {
     chan pending input stdin
@@ -194,7 +194,7 @@ test chan-16.9 {chan command: pending input subcommand} -setup {
     set ::chan-16.9-data [list]
     set ::chan-16.9-done 0
 } -body {
-    after idle chan-16.9-client 
+    after idle chan-16.9-client
     vwait ::chan-16.9-done
     set ::chan-16.9-data
 } -result {-1 0 0 1 36 -1 0 0 1 72 -1 0 0 1 108 -1 0 0 1 144 ABC 890} -cleanup {
diff --git a/tests/chanio.test b/tests/chanio.test
index 2738fc6..3017e81 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -37,7 +37,7 @@ namespace eval ::tcl::test::io {
 
     ::tcltest::loadTestedCommands
     catch [list package require -exact Tcltest [info patchlevel]]
-    
+
     testConstraint testchannel      [llength [info commands testchannel]]
     testConstraint exec             [llength [info commands exec]]
     testConstraint openpipe         1
@@ -130,10 +130,10 @@ test chan-io-1.8 {Tcl_WriteChars: WriteChars} {
     # Executing this test without the fix for the referenced bug applied to
     # tcl will cause tcl, more specifically WriteChars, to go into an infinite
     # loop.
-    set f [open $path(test2) w] 
-    chan configure      $f -encoding iso2022-jp 
-    chan puts -nonewline $f [format %s%c [string repeat " " 4] 12399] 
-    chan close           $f 
+    set f [open $path(test2) w]
+    chan configure      $f -encoding iso2022-jp
+    chan puts -nonewline $f [format %s%c [string repeat " " 4] 12399]
+    chan close           $f
     contents $path(test2)
 } "    \x1b\$B\$O\x1b(B"
 test chan-io-1.9 {Tcl_WriteChars: WriteChars} {
@@ -248,7 +248,7 @@ test chan-io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} -bod
 test chan-io-3.4 {WriteChars: loop over stage buffer} {
     # stage buffer maps to more than can be queued at once.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 16 
+    chan configure $f -encoding jis0208 -buffersize 16
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -259,7 +259,7 @@ test chan-io-3.5 {WriteChars: saved != 0} {
     # be moved to beginning of next channel buffer to preserve requested
     # buffersize.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17 
+    chan configure $f -encoding jis0208 -buffersize 17
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -288,7 +288,7 @@ test chan-io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} {
     # on flush. The truncated bytes are moved to the beginning of the next
     # channel buffer.
     set f [open $path(test1) w]
-    chan configure $f -encoding jis0208 -buffersize 17 
+    chan configure $f -encoding jis0208 -buffersize 17
     chan puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -353,7 +353,7 @@ test chan-io-4.5 {TranslateOutputEOL: crlf} {
 
 test chan-io-5.1 {CheckFlush: not full} {
     set f [open $path(test1) w]
-    chan configure $f 
+    chan configure $f
     chan puts -nonewline $f "12345678901234567890"
     set x [list [contents $path(test1)]]
     chan close $f
@@ -441,7 +441,7 @@ set a "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
 append a $a
 append a $a
 test chan-io-6.6 {Tcl_GetsObj: loop test} -body {
-    # if (dst >= dstEnd) 
+    # if (dst >= dstEnd)
     set f [open $path(test1) w]
     chan puts $f $a
     chan puts $f hi
@@ -750,7 +750,7 @@ test chan-io-6.33 {Tcl_GetsObj: crlf mode: buffer exhausted, at eof} -body {
     chan close $f
 } -result [list 16 "123456789012345\r" 1]
 test chan-io-6.34 {Tcl_GetsObj: crlf mode: buffer exhausted, not followed by \n} -body {
-    # not (*eol == '\n') 
+    # not (*eol == '\n')
     set f [open $path(test1) w]
     chan configure $f -translation lf
     chan puts -nonewline $f "123456789012345\rabcd\r\nefg"
@@ -860,7 +860,7 @@ test chan-io-6.43 {Tcl_GetsObj: input saw cr} -setup {
     chan configure $f -buffersize 16
     lappend x [chan gets $f]
     chan configure $f -blocking 0
-    lappend x [chan gets $f line] $line [testchannel queuedcr $f] 
+    lappend x [chan gets $f line] $line [testchannel queuedcr $f]
     chan configure $f -blocking 1
     chan puts -nonewline $f "\nabcd\refg\x1a"
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
@@ -871,14 +871,14 @@ test chan-io-6.43 {Tcl_GetsObj: input saw cr} -setup {
 test chan-io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} -setup {
     set x ""
 } -constraints {stdio testchannel openpipe fileevent} -body {
-    # not (*eol == '\n') 
+    # not (*eol == '\n')
     set f [openpipe w+ $path(cat)]
     chan configure $f -translation {auto lf} -buffering none
     chan puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r"
     chan configure $f -buffersize 16
     lappend x [chan gets $f]
     chan configure $f -blocking 0
-    lappend x [chan gets $f line] $line [testchannel queuedcr $f] 
+    lappend x [chan gets $f line] $line [testchannel queuedcr $f]
     chan configure $f -blocking 1
     chan puts -nonewline $f "abcd\refg\x1a"
     lappend x [chan gets $f line] $line [testchannel queuedcr $f]
@@ -957,7 +957,7 @@ test chan-io-6.49 {Tcl_GetsObj: auto mode: \r followed by \n} -constraints {test
     chan close $f
 } -result {123456 0 8 78901}
 test chan-io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} -constraints {testchannel} -body {
-    # not (*eol == '\n') 
+    # not (*eol == '\n')
     set f [open $path(test1) w]
     chan configure $f -translation lf
     chan puts -nonewline $f "123456\r78901"
@@ -1183,7 +1183,7 @@ test chan-io-8.5 {PeekAhead: don't peek if last read was short} -constraints {st
     chan close $f
 } -result {15 abcdefghijklmno 1}
 test chan-io-8.6 {PeekAhead: change to non-blocking mode} -constraints {stdio testchannel openpipe fileevent} -body {
-    # ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0) 
+    # ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0)
     set f [openpipe w+ $path(cat)]
     chan configure $f -translation {auto binary} -buffersize 16
     chan puts -nonewline $f "abcdefghijklmno\r"
@@ -1423,7 +1423,7 @@ test chan-io-13.2 {TranslateInputEOL: crlf mode} -body {
     chan close $f
 } -result "abcd\ndef\n"
 test chan-io-13.3 {TranslateInputEOL: crlf mode: naked cr} -body {
-    # (src >= srcMax) 
+    # (src >= srcMax)
     set f [open $path(test1) w]
     chan configure $f -translation lf
     chan puts -nonewline $f "abcd\r\ndef\r"
@@ -1435,7 +1435,7 @@ test chan-io-13.3 {TranslateInputEOL: crlf mode: naked cr} -body {
     chan close $f
 } -result "abcd\ndef\r"
 test chan-io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} -body {
-    # (src >= srcMax) 
+    # (src >= srcMax)
     set f [open $path(test1) w]
     chan configure $f -translation lf
     chan puts -nonewline $f "abcd\r\ndef\rfgh"
@@ -1447,7 +1447,7 @@ test chan-io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} -body {
     chan close $f
 } -result "abcd\ndef\rfgh"
 test chan-io-13.5 {TranslateInputEOL: crlf mode: naked lf} -body {
-    # (src >= srcMax) 
+    # (src >= srcMax)
     set f [open $path(test1) w]
     chan configure $f -translation lf
     chan puts -nonewline $f "abcd\r\ndef\nfgh"
@@ -1515,7 +1515,7 @@ test chan-io-13.9 {TranslateInputEOL: auto mode: \r followed by not \n} -body {
     chan close $f
 } -result "abcd\ndef"
 test chan-io-13.10 {TranslateInputEOL: auto mode: \n} -body {
-    # not (*src == '\r') 
+    # not (*src == '\r')
     set f [open $path(test1) w]
     chan configure $f -translation lf
     chan puts -nonewline $f "abcd\ndef"
@@ -3901,7 +3901,7 @@ test chan-io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} -setup {
     }
     chan close $f
     set f [open $path(test1) r]
-    chan configure $f -translation crlf 
+    chan configure $f -translation crlf
     while {[chan gets $f line] >= 0} {
 	append c $line\n
     }
@@ -5155,7 +5155,7 @@ test chan-io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]
-    chan configure $f -encoding {} 
+    chan configure $f -encoding {}
     chan puts -nonewline $f \xe7\x89\xa6
     chan close $f
     set f [open $path(test1) r]
@@ -5300,7 +5300,7 @@ test chan-io-39.23 {Tcl_GetChannelOption, server socket is not readable or\
 test chan-io-39.24 {Tcl_SetChannelOption, server socket is not readable or\
         writable so we can't change -eofchar or -translation} -setup {
     set l [list]
-} -body { 
+} -body {
     set sock [socket -server [namespace code accept] -myaddr 127.0.0.1 0]
     chan configure $sock -eofchar D -translation lf
     lappend l [chan configure $sock -eofchar] \
@@ -5453,7 +5453,7 @@ test chan-io-40.13 {POSIX open access modes: WRONLY} -body {
     set x [list [catch {chan gets $f} msg] $msg]
     chan close $f
     lappend x [viewFile test3]
-} -match glob -result {1 {channel "*" wasn't opened for reading} abzzy} 
+} -match glob -result {1 {channel "*" wasn't opened for reading} abzzy}
 test chan-io-40.14 {POSIX open access modes: RDWR} -match regexp -body {
     file delete $path(test3)
     open $path(test3) RDWR
diff --git a/tests/clock.test b/tests/clock.test
index 615f3a8..b2ccdf2 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -35,9 +35,9 @@ testConstraint y2038 \
 # TEST PLAN
 
 # clock-1:
-#	[clock format] - tests of bad and empty arguments 
+#	[clock format] - tests of bad and empty arguments
 #
-# clock-2 
+# clock-2
 #	formatting of year, month and day of month
 #
 # clock-3
@@ -195,7 +195,7 @@ namespace eval ::tcl::clock {
 	    l li lii liii liv lv lvi lvii lviii lix
 	    lx lxi lxii lxiii lxiv lxv lxvi lxvii lxviii lxix
 	    lxx lxxi lxxii lxxiii lxxiv lxxv lxxvi lxxvii lxxviii lxxix
-	    lxxx lxxxi lxxxii lxxxiii lxxxiv lxxxv lxxxvi lxxxvii lxxxviii 
+	    lxxx lxxxi lxxxii lxxxiii lxxxiv lxxxv lxxxvi lxxxvii lxxxviii
 	    lxxxix
 	    xc xci xcii xciii xciv xcv xcvi xcvii xcviii xcix
 	    c
@@ -271,7 +271,7 @@ test clock-1.3 "clock format - empty val" {
 test clock-1.4 "clock format - bad flag" {*}{
     -body {
     list [catch {clock format 0 -oops badflag} msg] $msg $::errorCode
-    } 
+    }
     -match glob
     -result {1 {bad option "-oops": must be -format, -gmt, -locale, or -timezone} {CLOCK badOption -oops}}
 }
@@ -35221,7 +35221,7 @@ test clock-30.25 {clock add seconds at DST conversion} {
 
 test clock-31.1 {system locale} \
     -constraints win \
-    -setup { 
+    -setup {
 	namespace eval ::tcl::clock {
 	    namespace import -force ::testClock::registry
 	}
@@ -35244,7 +35244,7 @@ test clock-31.1 {system locale} \
 
 test clock-31.2 {system locale} \
     -constraints win \
-    -setup { 
+    -setup {
 	namespace eval ::tcl::clock {
 	    namespace import -force ::testClock::registry
 	}
@@ -35267,7 +35267,7 @@ test clock-31.2 {system locale} \
 
 test clock-31.3 {system locale} \
     -constraints win \
-    -setup { 
+    -setup {
 	namespace eval ::tcl::clock {
 	    namespace import -force ::testClock::registry
 	}
@@ -35290,7 +35290,7 @@ test clock-31.3 {system locale} \
 
 test clock-31.4 {system locale} \
     -constraints win \
-    -setup { 
+    -setup {
 	namespace eval ::tcl::clock {
 	    namespace import -force ::testClock::registry
 	}
@@ -35327,7 +35327,7 @@ test clock-31.4 {system locale} \
 
 test clock-31.5 {system locale} \
     -constraints win \
-    -setup { 
+    -setup {
 	namespace eval ::tcl::clock {
 	    namespace import -force ::testClock::registry
 	}
@@ -35364,7 +35364,7 @@ test clock-31.5 {system locale} \
 
 test clock-31.6 {system locale} \
     -constraints win \
-    -setup { 
+    -setup {
 	namespace eval ::tcl::clock {
 	    namespace import -force ::testClock::registry
 	}
@@ -35434,7 +35434,7 @@ test clock-32.1 {scan/format across the Gregorian change} {
     }
     set problems
 } {}
-			 
+
 # Legacy tests
 
 # clock clicks
@@ -35468,7 +35468,7 @@ test clock-33.5 {clock clicks tests, millisecond timing test} {
     # 60 msecs seems to be the max time slice under Windows 95/98
     expr {
 	  ($end > $start) && (($end - $start) <= 60) ?
-	  "ok" : 
+	  "ok" :
 	  "test should have taken 0-60 ms, actually took [expr $end - $start]"}
 } {ok}
 test clock-33.5a {clock tests, millisecond timing test} {
@@ -35480,7 +35480,7 @@ test clock-33.5a {clock tests, millisecond timing test} {
     # 60 msecs seems to be the max time slice under Windows 95/98
     expr {
 	  ($end > $start) && (($end - $start) <= 60) ?
-	  "ok" : 
+	  "ok" :
 	  "test should have taken 0-60 ms, actually took [expr $end - $start]"}
 } {ok}
 test clock-33.6 {clock clicks, milli with too much abbreviation} {
@@ -35804,31 +35804,31 @@ test clock-34.47 {ago with multiple relative units} {
 } 180000
 
 test clock-34.48 {more than one ToD} {*}{
-    -body {clock scan {10:00 11:00}} 
+    -body {clock scan {10:00 11:00}}
     -returnCodes error
     -result {unable to convert date-time string "10:00 11:00": more than one time of day in string}
 }
 
 test clock-34.49 {more than one date} {*}{
-    -body {clock scan {1/1/2001 2/2/2002}} 
+    -body {clock scan {1/1/2001 2/2/2002}}
     -returnCodes error
     -result {unable to convert date-time string "1/1/2001 2/2/2002": more than one date in string}
 }
 
 test clock-34.50 {more than one time zone} {*}{
-    -body {clock scan {10:00 EST CST}} 
+    -body {clock scan {10:00 EST CST}}
     -returnCodes error
     -result {unable to convert date-time string "10:00 EST CST": more than one time zone in string}
 }
 
 test clock-34.51 {more than one weekday} {*}{
-    -body {clock scan {Monday Tuesday}} 
+    -body {clock scan {Monday Tuesday}}
     -returnCodes error
     -result {unable to convert date-time string "Monday Tuesday": more than one weekday in string}
 }
 
 test clock-34.52 {more than one ordinal month} {*}{
-    -body {clock scan {next January next March}} 
+    -body {clock scan {next January next March}}
     -returnCodes error
     -result {unable to convert date-time string "next January next March": more than one ordinal month in string}
 }
@@ -35924,7 +35924,7 @@ test clock-38.2 {make sure TZ is not cached after unset} \
         }
     } \
     -result 1
-        
+
 
 test clock-39.1 {regression - synonym timezones} {
     clock format 0 -format {%H:%M:%S} -timezone :US/Eastern
@@ -35996,7 +35996,7 @@ test clock-44.1 {regression test - time zone name containing hyphen } \
 	}
     } \
     -result {12:34:56-0500}
-    
+
 test clock-45.1 {regression test - time zone containing only two digits} \
     -body {
 	clock scan 1985-04-12T10:15:30+04 -format %Y-%m-%dT%H:%M:%S%Z
@@ -36041,7 +36041,7 @@ test clock-48.1 {Bug 1185933: 'i' destroyed by clock init} -setup {
 
 test clock-49.1 {regression test - localtime with negative arg (Bug 1237907)} \
     -body {
-	list [catch { 
+	list [catch {
 	    clock format -86400 -timezone :localtime -format %Y
 	} result] $result
     } \
@@ -36280,7 +36280,7 @@ test clock-56.1 {use of zoneinfo, version 1} {*}{
     }
     -result {2004-01-01 00:00:00 MST}
 }
-	    
+
 test clock-56.2 {use of zoneinfo, version 2} {*}{
     -setup {
 	clock format [clock seconds]
@@ -36330,7 +36330,7 @@ test clock-56.2 {use of zoneinfo, version 2} {*}{
 	removeFile PhoenixTwo $tzdir2
 	removeDirectory Test $tzdir
 	removeDirectory zoneinfo
-    } 
+    }
     -body {
 	clock format 1072940400 -timezone :Test/PhoenixTwo \
 	    -format {%Y-%m-%d %H:%M:%S %Z}
@@ -36540,7 +36540,7 @@ test clock-56.3 {use of zoneinfo, version 2, Y2038 compliance} {*}{
 	removeFile TijuanaTwo $tzdir2
 	removeDirectory Test $tzdir
 	removeDirectory zoneinfo
-    } 
+    }
     -body {
 	clock format 2224738800 -timezone :Test/TijuanaTwo \
 	    -format {%Y-%m-%d %H:%M:%S %Z}
@@ -36692,7 +36692,7 @@ test clock-56.4 {Bug 3470928} {*}{
 	removeFile Windhoek $tzdir2
 	removeDirectory Test $tzdir
 	removeDirectory zoneinfo
-    } 
+    }
     -result {Sun Jan 08 22:30:06 WAST 2012}
 }
 
@@ -36703,7 +36703,7 @@ test clock-57.1 {clock scan - abbreviated options} {
 test clock-58.1 {clock l10n - Japanese localisation} {*}{
     -setup {
 	proc backslashify { string } {
-	    
+
 	    set retval {}
 	    foreach char [split $string {}] {
 		scan $char %c ccode
@@ -36809,52 +36809,52 @@ test clock-59.1 {military time zones} {
 
 test clock-60.1 {case insensitive weekday names} {
     clock scan "2000-W01 monday" -gmt true -format "%G-W%V %a"
-} [clock scan "2000-W01-1" -gmt true -format "%G-W%V-%u"] 
+} [clock scan "2000-W01-1" -gmt true -format "%G-W%V-%u"]
 test clock-60.2 {case insensitive weekday names} {
     clock scan "2000-W01 Monday" -gmt true -format "%G-W%V %a"
-} [clock scan "2000-W01-1" -gmt true -format "%G-W%V-%u"] 
+} [clock scan "2000-W01-1" -gmt true -format "%G-W%V-%u"]
 test clock-60.3 {case insensitive weekday names} {
     clock scan "2000-W01 MONDAY" -gmt true -format "%G-W%V %a"
-} [clock scan "2000-W01-1" -gmt true -format "%G-W%V-%u"] 
+} [clock scan "2000-W01-1" -gmt true -format "%G-W%V-%u"]
 test clock-60.4 {case insensitive weekday names} {
     clock scan "2000-W01 friday" -gmt true -format "%G-W%V %a"
-} [clock scan "2000-W01-5" -gmt true -format "%G-W%V-%u"] 
+} [clock scan "2000-W01-5" -gmt true -format "%G-W%V-%u"]
 test clock-60.5 {case insensitive weekday names} {
     clock scan "2000-W01 Friday" -gmt true -format "%G-W%V %a"
-} [clock scan "2000-W01-5" -gmt true -format "%G-W%V-%u"] 
+} [clock scan "2000-W01-5" -gmt true -format "%G-W%V-%u"]
 test clock-60.6 {case insensitive weekday names} {
     clock scan "2000-W01 FRIDAY" -gmt true -format "%G-W%V %a"
-} [clock scan "2000-W01-5" -gmt true -format "%G-W%V-%u"] 
+} [clock scan "2000-W01-5" -gmt true -format "%G-W%V-%u"]
 test clock-60.7 {case insensitive month names} {
     clock scan "1 january 2000" -gmt true -format "%d %b %Y"
-} [clock scan "2000-01-01" -gmt true -format "%Y-%m-%d"] 
+} [clock scan "2000-01-01" -gmt true -format "%Y-%m-%d"]
 test clock-60.8 {case insensitive month names} {
     clock scan "1 January 2000" -gmt true -format "%d %b %Y"
-} [clock scan "2000-01-01" -gmt true -format "%Y-%m-%d"] 
+} [clock scan "2000-01-01" -gmt true -format "%Y-%m-%d"]
 test clock-60.9 {case insensitive month names} {
     clock scan "1 JANUARY 2000" -gmt true -format "%d %b %Y"
-} [clock scan "2000-01-01" -gmt true -format "%Y-%m-%d"] 
+} [clock scan "2000-01-01" -gmt true -format "%Y-%m-%d"]
 test clock-60.10 {case insensitive month names} {
     clock scan "1 december 2000" -gmt true -format "%d %b %Y"
-} [clock scan "2000-12-01" -gmt true -format "%Y-%m-%d"] 
+} [clock scan "2000-12-01" -gmt true -format "%Y-%m-%d"]
 test clock-60.11 {case insensitive month names} {
     clock scan "1 December 2000" -gmt true -format "%d %b %Y"
-} [clock scan "2000-12-01" -gmt true -format "%Y-%m-%d"] 
+} [clock scan "2000-12-01" -gmt true -format "%Y-%m-%d"]
 test clock-60.12 {case insensitive month names} {
     clock scan "1 DECEMBER 2000" -gmt true -format "%d %b %Y"
-} [clock scan "2000-12-01" -gmt true -format "%Y-%m-%d"] 
+} [clock scan "2000-12-01" -gmt true -format "%Y-%m-%d"]
 
 test clock-61.1 {overflow of a wide integer on output} {*}{
     -body {
 	clock format 0x8000000000000000 -format %s -gmt true
-    } 
+    }
     -result {integer value too large to represent}
     -returnCodes error
 }
 test clock-61.2 {overflow of a wide integer on output} {*}{
     -body {
 	clock format -0x8000000000000001 -format %s -gmt true
-    } 
+    }
     -result {integer value too large to represent}
     -returnCodes error
 }
diff --git a/tests/compile.test b/tests/compile.test
index 46e678a..6ef697c 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -122,7 +122,7 @@ test compile-3.4 {TclCompileCatchCmd: bcc'ed [return] is caught} {
     proc foo {} {
 	set fail [catch {
 	    return 1
-	}] ; # {}	
+	}] ; # {}
 	return 2
     }
     foo
@@ -132,8 +132,8 @@ test compile-3.5 {TclCompileCatchCmd: recover from error, [Bug 705406]} {
 	catch {
 	    if {[a]} {
 		if b {}
-	    }   
-	}   
+	    }
+	}
     }
     list [catch foo msg] $msg
 } {0 1}
@@ -333,13 +333,13 @@ test compile-11.9 {Tcl_Append*: ensure Tcl_ResetResult is used properly} -body {
     list [catch {p} msg] $msg
 } -returnCodes error -result {unmatched open brace in list}
 
-# 
+#
 # Special section for tests of tclLiteral.c
 # The following tests check for incorrect memory handling in
 # TclReleaseLiteral. They are only effective when tcl is compiled with
 # TCL_MEM_DEBUG
 #
-# Special test for leak on interp delete [Bug 467523]. 
+# Special test for leak on interp delete [Bug 467523].
 test compile-12.1 {testing literal leak on interp delete} -setup {
     proc getbytes {} {
 	set lines [split [memory info] "\n"]
@@ -348,10 +348,10 @@ test compile-12.1 {testing literal leak on interp delete} -setup {
 } -constraints memory -body {
     set end [getbytes]
     for {set i 0} {$i < 5} {incr i} {
-	interp create foo 
-	foo eval { 
+	interp create foo
+	foo eval {
 	    namespace eval bar {}
-	} 
+	}
 	interp delete foo
 	set tmp $end
 	set end [getbytes]
@@ -372,7 +372,7 @@ test compile-12.2 {testing error on literal deletion} -constraints {memory exec}
 	}
 	puts 0
     } source.file]
-    exec [interpreter] $sourceFile 
+    exec [interpreter] $sourceFile
 } -cleanup {
     catch {removeFile $sourceFile}
 } -result 0
@@ -465,7 +465,7 @@ test compile-14.1 {testing errors in element name; segfault?} {} {
 test compile-14.2 {testing element name "$"} -body {
     unset -nocomplain a
     set a() 1
-    set a(1) 2 
+    set a(1) 2
     set a($) 3
     list [set a()] [set a(1)] [set a($)] [unset a() a(1); lindex [array names a] 0]
 } -cleanup {unset a} -result [list 1 2 3 {$}]
diff --git a/tests/coroutine.test b/tests/coroutine.test
index 205da67..86fa6e3 100644
--- a/tests/coroutine.test
+++ b/tests/coroutine.test
@@ -66,7 +66,7 @@ test coroutine-1.3 {yield returns new arg} -setup {
 	    incr i
 	}
     }
-    coroutine foo ::apply [list {{start 2} {stop 10}} $body] 
+    coroutine foo ::apply [list {{start 2} {stop 10}} $body]
     set res {}
 } -body {
     for {set k 1} {$k < 4} {incr k} {
@@ -476,7 +476,7 @@ test coroutine-5.1 {right numLevels on coro return} -constraints {testnrelevels}
 	expr {[lindex [testnrelevels] 1] - 1}
     }
     proc relativeLevel base {
-	# remove the level for this proc's call	
+	# remove the level for this proc's call
 	expr {[getNumLevel] - $base - 1}
     }
     proc foo {} {
@@ -517,7 +517,7 @@ test coroutine-5.2 {right numLevels within coro} -constraints {testnrelevels} \
 	expr {[lindex [testnrelevels] 1] - 1}
     }
     proc relativeLevel base {
-	# remove the level for this proc's call	
+	# remove the level for this proc's call
 	expr {[getNumLevel] - $base - 1}
     }
     proc foo base {
@@ -588,7 +588,7 @@ test coroutine-7.2 {multi-argument yielding with yieldto} -body {
     coroutine a corobody
     coroutine b corobody
     list [a x] [a y z] [a \{p] [a \{q r] [a] [a] [rename a {}] \
-	[b ok] [rename b {}] 
+	[b ok] [rename b {}]
 } -cleanup {
     rename corobody {}
 } -result {x {y z 2} \{p {\{q r 2} {} 0 {} ok {}}
diff --git a/tests/encoding.test b/tests/encoding.test
index 0374e2d..4dddbb5 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -73,7 +73,7 @@ test encoding-2.2 {Tcl_FreeEncoding: refcount != 0} -setup {
 } -constraints {testencoding} -body {
     encoding system shiftjis		;# incr ref count
     encoding dirs [list [pwd]]
-    set x [encoding convertto shiftjis \u4e4e]	;# old one found   
+    set x [encoding convertto shiftjis \u4e4e]	;# old one found
     encoding system identity
     llength shiftjis		;# Shimmer away any cache of Tcl_Encoding
     lappend x [catch {encoding convertto shiftjis \u4e4e} msg] $msg
@@ -182,7 +182,7 @@ test encoding-8.1 {Tcl_ExternalToUtf} {
     puts -nonewline $f "ab\x8c\xc1g"
     close $f
     set f [open [file join [temporaryDirectory] dummy] r]
-    fconfigure $f -translation binary -encoding shiftjis    
+    fconfigure $f -translation binary -encoding shiftjis
     set x [read $f]
     close $f
     file delete [file join [temporaryDirectory] dummy]
@@ -265,7 +265,7 @@ test encoding-11.6 {LoadEncodingFile: invalid file} -constraints {testencoding}
     makeDirectory tmp
     makeDirectory [file join tmp encoding]
     set f [open [file join tmp encoding splat.enc] w]
-    fconfigure $f -translation binary 
+    fconfigure $f -translation binary
     puts $f "abcdefghijklmnop"
     close $f
     encoding convertto splat \u4e4e
@@ -286,11 +286,11 @@ test encoding-12.1 {LoadTableEncoding: normal encoding} {
     append x [encoding convertfrom iso8859-3 \xd5]
 } "\xd5?\u120"
 test encoding-12.2 {LoadTableEncoding: single-byte encoding} {
-    set x [encoding convertto iso8859-3 ab\u0120g] 
+    set x [encoding convertto iso8859-3 ab\u0120g]
     append x [encoding convertfrom iso8859-3 ab\xd5g]
 } "ab\xd5gab\u120g"
 test encoding-12.3 {LoadTableEncoding: multi-byte encoding} {
-    set x [encoding convertto shiftjis ab\u4e4eg] 
+    set x [encoding convertto shiftjis ab\u4e4eg]
     append x [encoding convertfrom shiftjis ab\x8c\xc1g]
 } "ab\x8c\xc1gab\u4e4eg"
 test encoding-12.4 {LoadTableEncoding: double-byte encoding} {
diff --git a/tests/execute.test b/tests/execute.test
index 9a2ffbd..5b8ce2d 100644
--- a/tests/execute.test
+++ b/tests/execute.test
@@ -698,7 +698,7 @@ test execute-6.12 {Tcl_ExprObj: exprcode interp validation} -setup {
     lappend result [e $e]
     interp delete slave
     interp create slave
-    interp alias {} e slave expr 
+    interp alias {} e slave expr
     lappend result [e $e]
 } -cleanup {
     interp delete slave
@@ -1013,8 +1013,8 @@ test execute-10.3 {Bug 3072640} -setup {
 	    yield $i
 	}
     }
-    proc t {args} { 
-	incr ::foo 
+    proc t {args} {
+	incr ::foo
     }
     trace add execution ::generate enterstep ::t
 } -body {
diff --git a/tests/expr-old.test b/tests/expr-old.test
index 06a00ba..3adfb63 100644
--- a/tests/expr-old.test
+++ b/tests/expr-old.test
@@ -420,13 +420,13 @@ test expr-old-21.3 {parenthesization} {expr +(3-4)} -1
 
 # Embedded commands and variable names.
 
-set a 16 
-test expr-old-22.1 {embedded variables} {expr {2*$a}} 32 
+set a 16
+test expr-old-22.1 {embedded variables} {expr {2*$a}} 32
 test expr-old-22.2 {embedded variables} {
     set x -5
     set y 10
     expr {$x + $y}
-} {5} 
+} {5}
 test expr-old-22.3 {embedded variables} {
     set x "  -5"
     set y "  +10"
@@ -1120,7 +1120,7 @@ test expr-old-37.25 {Tcl_ExprDouble and NaN} \
     {ieeeFloatingPoint testexprdouble} {
 	list [catch {testexprdouble 0.0/0.0} result] $result
     } {1 {domain error: argument not in valid range}}
-    
+
 test expr-old-38.1 {Verify Tcl_ExprString's basic operation} -constraints {testexprstring} -body {
     list [testexprstring "1+4"] [testexprstring "2*3+4.2"] \
 	    [catch {testexprstring "1+"} msg] $msg
diff --git a/tests/expr.test b/tests/expr.test
index 4c03262..4046411 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -1429,7 +1429,7 @@ test expr-23.74.3 {INST_EXPON: Bug 2798543} {
     expr {(-14)**17 == (-14)**65553}
 } 0
 
-	
+
 # Some compilers get this wrong; ensure that we work around it correctly
 test expr-24.1 {expr edge cases; shifting} {expr int(5)>>32} 0
 test expr-24.2 {expr edge cases; shifting} {expr int(5)>>63} 0
@@ -5777,7 +5777,7 @@ test expr-32.1 {expr mod basics} {
     0 1 0 3 3 \
     0 -1 0 -1 -2 \
     ]
-        
+
 test expr-32.2 {expr div basics} {
     set mod_nums [list \
         {-3 1} {-3 2} {-3 3} {-3 4} {-3 5} \
@@ -6776,7 +6776,7 @@ test expr-39.16 {Tcl_ExprLongObj handles overflows} \
 	list [catch {testexprlongobj 4294967296.} result] $result
     } \
     -result {1 {integer value too large to represent*}}
-    
+
 test expr-39.17 {Check that Tcl_ExprDoubleObj doesn't modify interpreter result if no error} testexprdoubleobj {
     testexprdoubleobj 4.+1.
 } {This is a result: 5.0}
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 9fe4fe9..1941936 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -146,7 +146,7 @@ test filesystem-1.10 {link normalisation: double link} -constraints {
 	[file normalize [file join dir2.link inside.file foo]]
 } -cleanup {
     file delete dir2.link
-} -result ok 
+} -result ok
 makeDirectory dir2.file
 test filesystem-1.11 {link normalisation: double link, back in tree} {unix hasLinks} {
     file link dir2.link dir.link
@@ -874,7 +874,7 @@ test filesystem-9.5 {path objects and file tail and object rep} -setup {
     }
     return $res
 } -cleanup {
-    file delete -force dgp 
+    file delete -force dgp
     cd $origdir
 } -result {test test}
 test filesystem-9.6 {path objects and file tail and object rep} win {
diff --git a/tests/history.test b/tests/history.test
index c562796..1a255a4 100644
--- a/tests/history.test
+++ b/tests/history.test
@@ -10,7 +10,7 @@
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
-  
+
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
     namespace import -force ::tcltest::*
diff --git a/tests/httpd b/tests/httpd
index 232e80a..c934fac 100644
--- a/tests/httpd
+++ b/tests/httpd
@@ -205,7 +205,7 @@ proc httpdRespond { sock } {
     }
 
     # Catch errors from premature client closes
-    
+
     catch {
 	if {$data(proto) == "HEAD"} {
 	    puts $sock "HTTP/1.0 200 OK"
diff --git a/tests/httpold.test b/tests/httpold.test
index aeba311..5995bed 100644
--- a/tests/httpold.test
+++ b/tests/httpold.test
@@ -36,7 +36,7 @@ if {[catch {package require http 1.0}]} {
 set bindata "This is binary data\x0d\x0amore\x0dmore\x0amore\x00null"
 catch {unset data}
 
-## 
+##
 ## The httpd script implement a stub http server
 ##
 source [file join [file dirname [info script]] httpd]
diff --git a/tests/info.test b/tests/info.test
index 3057dd2..60b9e66 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -2099,7 +2099,7 @@ proc foo::bar {} {
     foreach {*}{
 	x y
 	{set res [info frame 0]}
-    } 
+    }
     return $res
 }
 test info-33.13 {{*}, literal, simple, bytecompiled} -body {
@@ -2114,7 +2114,7 @@ proc foo::bar {} {
     if {*}{
 	{[return [info frame 0]]}
 	{}
-    } 
+    }
 }
 test info-33.14 {{*}, literal, simple, bytecompiled} -body {
     reduce [foo::bar]
@@ -2128,7 +2128,7 @@ proc foo::bar {} {
     if 0 {*}{
 	{} else
 	{return [info frame 0]}
-    } 
+    }
 }
 test info-33.15 {{*}, literal, simple, bytecompiled} -body {
     reduce [foo::bar]
@@ -2229,7 +2229,7 @@ namespace eval foo {}
 proc foo::bar {} {
     try {*}{
 	{set res [info frame 0]}
-    } 
+    }
     return $res
 }
 test info-33.23 {{*}, literal, simple, bytecompiled} -body {
diff --git a/tests/init.test b/tests/init.test
index 41b8624..0241283 100644
--- a/tests/init.test
+++ b/tests/init.test
@@ -28,7 +28,7 @@ test init-1.2 {auto_qualify - absolute cmd - global} {
 } global
 test init-1.3 {auto_qualify - no colons cmd - global} {
     auto_qualify nocolons ::
-} nocolons 
+} nocolons
 test init-1.4 {auto_qualify - no colons cmd - namespace} {
     auto_qualify nocolons ::sub
 } {::sub::nocolons nocolons}
@@ -93,11 +93,11 @@ test init-2.5 {load safe:::setLogCmd - stage 2} {
 auto_reset
 catch {rename ::safe::setLogCmd {}}
 test init-2.6 {load setLogCmd from safe:: - stage 1} {
-    namespace eval safe setLogCmd 
+    namespace eval safe setLogCmd
     rename ::safe::setLogCmd {}  ;# should not fail
 } {}
 test init-2.7 {oad setLogCmd from safe::  - stage 2} {
-    namespace eval safe setLogCmd 
+    namespace eval safe setLogCmd
     rename ::safe::setLogCmd {}  ;# should not fail
 } {}
 test init-2.8 {load tcl::HistAdd} -setup {
@@ -132,12 +132,12 @@ foreach arg [subst -nocommands -novariables {
                 and is long enough to be truncated and
 "               <- includes a false lead in the prune point search
                 and must be longer still to force truncation}
-                {contrived example: rare circumstance 
+                {contrived example: rare circumstance
 		where the point at which to prune the
 		error stack cannot be uniquely determined.
 		foo bar foo
 "}
-    {contrived example: rare circumstance 
+    {contrived example: rare circumstance
 		where the point at which to prune the
 		error stack cannot be uniquely determined.
 		foo bar
diff --git a/tests/interp.test b/tests/interp.test
index 4bc9fe2..6c9fb56 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -56,7 +56,7 @@ test interp-1.8 {options for interp command} -returnCodes error -body {
 } -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
 test interp-1.9 {options for interp command} -returnCodes error -body {
     interp -froboz -safe
-} -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer} 
+} -result {bad option "-froboz": must be alias, aliases, bgerror, cancel, create, debug, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, limit, marktrusted, recursionlimit, slaves, share, target, or transfer}
 test interp-1.10 {options for interp command} -returnCodes error -body {
     interp target
 } -result {wrong # args: should be "interp target path alias"}
@@ -70,7 +70,7 @@ test interp-2.2 {basic interpreter creation} {
 } 0
 test interp-2.3 {basic interpreter creation} {
     catch {interp create -safe}
-} 0 
+} 0
 test interp-2.4 {basic interpreter creation} {
     list [catch {interp create a} msg] $msg
 } {1 {interpreter named "a" already exists, cannot create}}
@@ -102,7 +102,7 @@ test interp-2.11 {anonymous interps vs existing procs} {
     set x [interp create]
     regexp "interp(\[0-9]+)" $x dummy anothernum
     expr $anothernum > $thenum
-} 1    
+} 1
 test interp-2.12 {anonymous interps vs existing procs} {
     set x [interp create -safe]
     regexp "interp(\[0-9]+)" $x dummy thenum
@@ -844,12 +844,12 @@ test interp-18.9 {eval in deleted interp, bug 495830} {
     interp create tst
     interp alias tst suicide {} interp delete tst
     list [catch {tst eval {suicide; set a 5}} msg] $msg
-} {1 {attempt to call eval in deleted interpreter}}     
+} {1 {attempt to call eval in deleted interpreter}}
 test interp-18.10 {eval in deleted interp, bug 495830} {
     interp create tst
     interp alias tst suicide {} interp delete tst
     list [catch {tst eval {set set set; suicide; $set a 5}} msg] $msg
-} {1 {attempt to call eval in deleted interpreter}}     
+} {1 {attempt to call eval in deleted interpreter}}
 
 # Test alias deletion
 
@@ -939,7 +939,7 @@ test interp-19.9 {alias deletion, renaming} {
     set l [interp eval a foo]
     interp delete a
     set l
-} 1156    
+} 1156
 
 test interp-20.1 {interp hide, interp expose and interp invokehidden} {
     set a [interp create]
@@ -1160,7 +1160,7 @@ test interp-20.21 {interp hide vs safety} {
     catch {interp delete a}
     interp create a -safe
     set l ""
-    lappend l [catch {a hide list} msg]    
+    lappend l [catch {a hide list} msg]
     lappend l $msg
     interp delete a
     set l
@@ -1169,7 +1169,7 @@ test interp-20.22 {interp hide vs safety} {
     catch {interp delete a}
     interp create a -safe
     set l ""
-    lappend l [catch {interp hide a list} msg]    
+    lappend l [catch {interp hide a list} msg]
     lappend l $msg
     interp delete a
     set l
@@ -1178,7 +1178,7 @@ test interp-20.23 {interp hide vs safety} {
     catch {interp delete a}
     interp create a -safe
     set l ""
-    lappend l [catch {a eval {interp hide {} list}} msg]    
+    lappend l [catch {a eval {interp hide {} list}} msg]
     lappend l $msg
     interp delete a
     set l
@@ -1188,7 +1188,7 @@ test interp-20.24 {interp hide vs safety} {
     interp create a -safe
     interp create {a b}
     set l ""
-    lappend l [catch {a eval {interp hide b list}} msg]    
+    lappend l [catch {a eval {interp hide b list}} msg]
     lappend l $msg
     interp delete a
     set l
@@ -1207,7 +1207,7 @@ test interp-20.26 {interp expoose vs safety} {
     catch {interp delete a}
     interp create a -safe
     set l ""
-    lappend l [catch {a hide list} msg]    
+    lappend l [catch {a hide list} msg]
     lappend l $msg
     lappend l [catch {a expose list} msg]
     lappend l $msg
@@ -1218,9 +1218,9 @@ test interp-20.27 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
     set l ""
-    lappend l [catch {interp hide a list} msg]    
+    lappend l [catch {interp hide a list} msg]
     lappend l $msg
-    lappend l [catch {interp expose a list} msg]    
+    lappend l [catch {interp expose a list} msg]
     lappend l $msg
     interp delete a
     set l
@@ -1229,7 +1229,7 @@ test interp-20.28 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
     set l ""
-    lappend l [catch {a hide list} msg]    
+    lappend l [catch {a hide list} msg]
     lappend l $msg
     lappend l [catch {a eval {interp expose {} list}} msg]
     lappend l $msg
@@ -1240,9 +1240,9 @@ test interp-20.29 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
     set l ""
-    lappend l [catch {interp hide a list} msg]    
+    lappend l [catch {interp hide a list} msg]
     lappend l $msg
-    lappend l [catch {a eval {interp expose {} list}} msg]    
+    lappend l [catch {a eval {interp expose {} list}} msg]
     lappend l $msg
     interp delete a
     set l
@@ -1252,9 +1252,9 @@ test interp-20.30 {interp expose vs safety} {
     interp create a -safe
     interp create {a b}
     set l ""
-    lappend l [catch {interp hide {a b} list} msg]    
+    lappend l [catch {interp hide {a b} list} msg]
     lappend l $msg
-    lappend l [catch {a eval {interp expose b list}} msg]    
+    lappend l [catch {a eval {interp expose b list}} msg]
     lappend l $msg
     interp delete a
     set l
@@ -1264,7 +1264,7 @@ test interp-20.31 {interp expose vs safety} {
     interp create a -safe
     interp create {a b}
     set l ""
-    lappend l [catch {interp hide {a b} list} msg]    
+    lappend l [catch {interp hide {a b} list} msg]
     lappend l $msg
     lappend l [catch {interp expose {a b} list} msg]
     lappend l $msg
@@ -1644,7 +1644,7 @@ test interp-21.5 {interp hidden} -setup {
     lsort [interp hidden a]
 } -cleanup {
     interp delete a
-} -result $hidden_cmds 
+} -result $hidden_cmds
 test interp-21.6 {interp hidden vs interp hide, interp expose} -setup {
     catch {interp delete a}
     set l ""
@@ -2168,7 +2168,7 @@ test interp-27.1 {interp aliases & namespaces} -setup {
     set i [interp create]
 } -body {
     set aliasTrace {}
-    proc tstAlias {args} { 
+    proc tstAlias {args} {
 	global aliasTrace
 	lappend aliasTrace [list [namespace current] $args]
     }
@@ -2182,7 +2182,7 @@ test interp-27.2 {interp aliases & namespaces} -setup {
     set i [interp create]
 } -body {
     set aliasTrace {}
-    proc tstAlias {args} { 
+    proc tstAlias {args} {
 	global aliasTrace
 	lappend aliasTrace [list [namespace current] $args]
     }
@@ -2196,7 +2196,7 @@ test interp-27.3 {interp aliases & namespaces} -setup {
     set i [interp create]
 } -body {
     set aliasTrace {}
-    proc tstAlias {args} { 
+    proc tstAlias {args} {
 	global aliasTrace
 	lappend aliasTrace [list [namespace current] $args]
     }
@@ -2212,7 +2212,7 @@ test interp-27.4 {interp aliases & namespaces} -setup {
 } -body {
     namespace eval foo2 {
 	variable aliasTrace {}
-	proc bar {args} { 
+	proc bar {args} {
 	    variable aliasTrace
 	    lappend aliasTrace [list [namespace current] $args]
 	}
@@ -3289,7 +3289,7 @@ test interp-34.9 {time limits trigger in blocking after} {
     } msg]
     set t1 [clock seconds]
     interp delete $i
-    list $code $msg [expr {($t1-$t0) < 3 ? "OK" : $t1-$t0}] 
+    list $code $msg [expr {($t1-$t0) < 3 ? "OK" : $t1-$t0}]
 } {1 {time limit exceeded} OK}
 test interp-34.10 {time limits trigger in vwaits: Bug 1221395} -body {
     set i [interp create]
@@ -3523,7 +3523,7 @@ test interp-35.24 {interp time limits can't touch current interp} -body {
 test interp-36.1 {interp bgerror syntax} -body {
     interp bgerror
 } -returnCodes error -result {wrong # args: should be "interp bgerror path ?cmdPrefix?"}
-test interp-36.2 {interp bgerror syntax} -body { 
+test interp-36.2 {interp bgerror syntax} -body {
     interp bgerror x y z
 } -returnCodes error -result {wrong # args: should be "interp bgerror path ?cmdPrefix?"}
 test interp-36.3 {interp bgerror syntax} -setup {
diff --git a/tests/io.test b/tests/io.test
index 6b6ad6d..46856b6 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -123,10 +123,10 @@ test io-1.8 {Tcl_WriteChars: WriteChars} {
     # applied to tcl will cause tcl, more specifically WriteChars, to
     # go into an infinite loop.
 
-    set f [open $path(test2) w] 
-    fconfigure      $f -encoding iso2022-jp 
-    puts -nonewline $f [format %s%c [string repeat " " 4] 12399] 
-    close           $f 
+    set f [open $path(test2) w]
+    fconfigure      $f -encoding iso2022-jp
+    puts -nonewline $f [format %s%c [string repeat " " 4] 12399]
+    close           $f
     contents $path(test2)
 } "    \x1b\$B\$O\x1b(B"
 
@@ -192,7 +192,7 @@ test io-1.9 {Tcl_WriteChars: WriteChars} {
 
 test io-2.1 {WriteBytes} {
     # loop until all bytes are written
-    
+
     set f [open $path(test1) w]
     fconfigure $f  -encoding binary -buffersize 16 -translation crlf
     puts $f "abcdefghijklmnopqrstuvwxyz"
@@ -214,7 +214,7 @@ test io-2.3 {WriteBytes: flush on line} {
     # Tcl "line" buffering has weird behavior: if current buffer contains
     # a \n, entire buffer gets flushed.  Logical behavior would be to flush
     # only up to the \n.
-    
+
     set f [open $path(test1) w]
     fconfigure $f -encoding binary -buffering line -translation crlf
     puts -nonewline $f "\n12"
@@ -234,7 +234,7 @@ test io-2.4 {WriteBytes: reset sawLF after each buffer} {
 
 test io-3.1 {WriteChars: compatibility with WriteBytes} {
     # loop until all bytes are written
-    
+
     set f [open $path(test1) w]
     fconfigure $f -encoding ascii -buffersize 16 -translation crlf
     puts $f "abcdefghijklmnopqrstuvwxyz"
@@ -256,7 +256,7 @@ test io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} {
     # Tcl "line" buffering has weird behavior: if current buffer contains
     # a \n, entire buffer gets flushed.  Logical behavior would be to flush
     # only up to the \n.
-    
+
     set f [open $path(test1) w]
     fconfigure $f -encoding ascii -buffering line -translation crlf
     puts -nonewline $f "\n12"
@@ -268,7 +268,7 @@ test io-3.4 {WriteChars: loop over stage buffer} {
     # stage buffer maps to more than can be queued at once.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 16 
+    fconfigure $f -encoding jis0208 -buffersize 16
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -280,7 +280,7 @@ test io-3.5 {WriteChars: saved != 0} {
     # requested buffersize.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17 
+    fconfigure $f -encoding jis0208 -buffersize 17
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -311,7 +311,7 @@ test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} {
     # of the next channel buffer.
 
     set f [open $path(test1) w]
-    fconfigure $f -encoding jis0208 -buffersize 17 
+    fconfigure $f -encoding jis0208 -buffersize 17
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
     set x [list [contents $path(test1)]]
     close $f
@@ -381,7 +381,7 @@ test io-4.5 {TranslateOutputEOL: crlf} {
 
 test io-5.1 {CheckFlush: not full} {
     set f [open $path(test1) w]
-    fconfigure $f 
+    fconfigure $f
     puts -nonewline $f "12345678901234567890"
     set x [list [contents $path(test1)]]
     close $f
@@ -470,7 +470,7 @@ set a "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
 append a $a
 append a $a
 test io-6.6 {Tcl_GetsObj: loop test} {
-    # if (dst >= dstEnd) 
+    # if (dst >= dstEnd)
 
     set f [open $path(test1) w]
     puts $f $a
@@ -769,7 +769,7 @@ test io-6.32 {Tcl_GetsObj: crlf mode: buffer exhausted, more data} {testchannel}
 } [list 15 "123456789012345" 17 3]
 test io-6.33 {Tcl_GetsObj: crlf mode: buffer exhausted, at eof} {
     # eol still equals dstEnd
-    
+
     set f [open $path(test1) w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\r"
@@ -781,8 +781,8 @@ test io-6.33 {Tcl_GetsObj: crlf mode: buffer exhausted, at eof} {
     set x
 } [list 16 "123456789012345\r" 1]
 test io-6.34 {Tcl_GetsObj: crlf mode: buffer exhausted, not followed by \n} {
-    # not (*eol == '\n') 
-    
+    # not (*eol == '\n')
+
     set f [open $path(test1) w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\rabcd\r\nefg"
@@ -889,7 +889,7 @@ test io-6.43 {Tcl_GetsObj: input saw cr} {stdio testchannel openpipe fileevent}
     fconfigure $f -buffersize 16
     set x [list [gets $f]]
     fconfigure $f -blocking 0
-    lappend x [gets $f line] $line [testchannel queuedcr $f] 
+    lappend x [gets $f line] $line [testchannel queuedcr $f]
     fconfigure $f -blocking 1
     puts -nonewline $f "\nabcd\refg\x1a"
     lappend x [gets $f line] $line [testchannel queuedcr $f]
@@ -898,7 +898,7 @@ test io-6.43 {Tcl_GetsObj: input saw cr} {stdio testchannel openpipe fileevent}
     set x
 } [list "bbbbbbbbbbbbbbb" 15 "123456789abcdef" 1 4 "abcd" 0 3 "efg"]
 test io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} {stdio testchannel openpipe fileevent} {
-    # not (*eol == '\n') 
+    # not (*eol == '\n')
 
     set f [open "|[list [interpreter] $path(cat)]" w+]
     fconfigure $f -translation {auto lf} -buffering none
@@ -906,7 +906,7 @@ test io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} {stdio testchannel
     fconfigure $f -buffersize 16
     set x [list [gets $f]]
     fconfigure $f -blocking 0
-    lappend x [gets $f line] $line [testchannel queuedcr $f] 
+    lappend x [gets $f line] $line [testchannel queuedcr $f]
     fconfigure $f -blocking 1
     puts -nonewline $f "abcd\refg\x1a"
     lappend x [gets $f line] $line [testchannel queuedcr $f]
@@ -959,10 +959,10 @@ test io-6.47 {Tcl_GetsObj: auto mode: \r at end of buffer, peek for \n} {testcha
     set x [list [gets $f] [testchannel inputbuffered $f]]
     close $f
     set x
-} [list "123456789012345" 15]    
+} [list "123456789012345" 15]
 test io-6.48 {Tcl_GetsObj: auto mode: \r at end of buffer, no more avail} {testchannel} {
     # PeekAhead() did not get any, so (eol >= dstEnd)
-    
+
     set f [open $path(test1) w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\r"
@@ -975,7 +975,7 @@ test io-6.48 {Tcl_GetsObj: auto mode: \r at end of buffer, no more avail} {testc
 } [list "123456789012345" 1]
 test io-6.49 {Tcl_GetsObj: auto mode: \r followed by \n} {testchannel} {
     # if (*eol == '\n') {skip++}
-    
+
     set f [open $path(test1) w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456\r\n78901"
@@ -986,8 +986,8 @@ test io-6.49 {Tcl_GetsObj: auto mode: \r followed by \n} {testchannel} {
     set x
 } [list "123456" 0 8 "78901"]
 test io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} {testchannel} {
-    # not (*eol == '\n') 
-    
+    # not (*eol == '\n')
+
     set f [open $path(test1) w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456\r78901"
@@ -999,7 +999,7 @@ test io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} {testchannel} {
 } [list "123456" 0 7 "78901"]
 test io-6.51 {Tcl_GetsObj: auto mode: \n} {
     # else if (*eol == '\n') {goto gotoeol;}
-    
+
     set f [open $path(test1) w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456\n78901"
@@ -1092,7 +1092,7 @@ test io-7.1 {FilterInputBytes: split up character at end of buffer} {
 } "1234567890123\uff10\uff11\uff12\uff13\uff14"
 test io-7.2 {FilterInputBytes: split up character in middle of buffer} {
     # (bufPtr->nextAdded < bufPtr->bufLength)
-    
+
     set f [open $path(test1) w]
     fconfigure $f -encoding binary
     puts -nonewline $f "1234567890\n123\x82\x4f\x82\x50\x82"
@@ -1201,7 +1201,7 @@ test io-8.4 {PeekAhead: cached data available in this buffer} {
 
     set x [gets $f]
     close $f
-    set x    
+    set x
 } $a
 unset a
 test io-8.5 {PeekAhead: don't peek if last read was short} {stdio testchannel openpipe fileevent} {
@@ -1217,7 +1217,7 @@ test io-8.5 {PeekAhead: don't peek if last read was short} {stdio testchannel op
     set x
 } {15 abcdefghijklmno 1}
 test io-8.6 {PeekAhead: change to non-blocking mode} {stdio testchannel openpipe fileevent} {
-    # ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0) 
+    # ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0)
 
     set f [open "|[list [interpreter] $path(cat)]" w+]
     fconfigure $f -translation {auto binary} -buffersize 16
@@ -1574,7 +1574,7 @@ test io-13.2 {TranslateInputEOL: crlf mode} {
     set x
 } "abcd\ndef\n"
 test io-13.3 {TranslateInputEOL: crlf mode: naked cr} {
-    # (src >= srcMax) 
+    # (src >= srcMax)
 
     set f [open $path(test1) w]
     fconfigure $f -translation lf
@@ -1587,7 +1587,7 @@ test io-13.3 {TranslateInputEOL: crlf mode: naked cr} {
     set x
 } "abcd\ndef\r"
 test io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} {
-    # (src >= srcMax) 
+    # (src >= srcMax)
 
     set f [open $path(test1) w]
     fconfigure $f -translation lf
@@ -1600,7 +1600,7 @@ test io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} {
     set x
 } "abcd\ndef\rfgh"
 test io-13.5 {TranslateInputEOL: crlf mode: naked lf} {
-    # (src >= srcMax) 
+    # (src >= srcMax)
 
     set f [open $path(test1) w]
     fconfigure $f -translation lf
@@ -1715,7 +1715,7 @@ test io-13.9 {TranslateInputEOL: auto mode: \r followed by not \n} {
     set x
 } "abcd\ndef"
 test io-13.10 {TranslateInputEOL: auto mode: \n} {
-    # not (*src == '\r') 
+    # not (*src == '\r')
 
     set f [open $path(test1) w]
     fconfigure $f -translation lf
@@ -2064,7 +2064,7 @@ test io-20.1 {Tcl_CreateChannel: initial settings} {
     encoding system $old
 	close $a
     set x
-} {ascii}    
+} {ascii}
 test io-20.2 {Tcl_CreateChannel: initial settings} {win} {
     set f [open $path(test1) w+]
     set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
@@ -2159,7 +2159,7 @@ test io-26.1 {Tcl_GetChannelInstanceData} {stdio openpipe} {
     set f [open "|[list [interpreter] << exit]"]
     expr [pid $f]
     close $f
-} {}    
+} {}
 
 # Test flushing. The functions tested here are FlushChannel.
 
@@ -3057,7 +3057,7 @@ test io-30.6 {Tcl_Write cr, Tcl_Read crlf} {
     fconfigure $f -translation crlf
     set x [read $f]
     close $f
-    set x 
+    set x
 } "hello\rthere\rand\rhere\r"
 test io-30.7 {Tcl_Write crlf, Tcl_Read crlf} {
     file delete $path(test1)
@@ -3985,7 +3985,7 @@ test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} {
     }
     close $f
     set f [open $path(test1) r]
-    fconfigure $f -translation crlf 
+    fconfigure $f -translation crlf
     set c ""
     while {[gets $f line] >= 0} {
 	append c $line\n
@@ -5467,7 +5467,7 @@ test io-39.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} {
 test io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} {
     file delete $path(test1)
     set f [open $path(test1) w]
-    fconfigure $f -encoding {} 
+    fconfigure $f -encoding {}
     puts -nonewline $f \xe7\x89\xa6
     close $f
     set f [open $path(test1) r]
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index e179eab..63a609f 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -1318,7 +1318,7 @@ proc inthread {chan script args} {
     # forwarded channel operations.
 
     set ::tres ""
-    thread::send -async $tid {	
+    thread::send -async $tid {
 	after 50
 	catch {s} res;	# This runs the script, 's' was defined at (*)
 	thread::send -async $mid [list set ::tres $res]
diff --git a/tests/iogt.test b/tests/iogt.test
index 1ed89f7..aa579bf 100644
--- a/tests/iogt.test
+++ b/tests/iogt.test
@@ -5,7 +5,7 @@
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
+#
 # Copyright (c) 2000 Ajuba Solutions.
 # Copyright (c) 2000 Andreas Kupries.
 # All rights reserved.
diff --git a/tests/lindex.test b/tests/lindex.test
index b86e2e0..29eb898 100644
--- a/tests/lindex.test
+++ b/tests/lindex.test
@@ -432,7 +432,7 @@ test lindex-16.7 {data reuse} {
 test lindex-17.0 {Bug 1718580} {*}{
     -body {
         lindex {} end foo
-    } 
+    }
     -match glob
     -result {bad index "foo"*}
     -returnCodes 1
@@ -441,7 +441,7 @@ test lindex-17.0 {Bug 1718580} {*}{
 test lindex-17.1 {Bug 1718580} {*}{
     -body {
         lindex a end foo
-    } 
+    }
     -match glob
     -result {bad index "foo"*}
     -returnCodes 1
diff --git a/tests/lmap.test b/tests/lmap.test
index 08035d9..641eac2 100644
--- a/tests/lmap.test
+++ b/tests/lmap.test
@@ -220,10 +220,10 @@ test lmap-4.14 {lmap errors} -returnCodes error -body {
 } -result {list element in braces followed by "3" instead of space}
 unset -nocomplain a
 test lmap-4.15 {lmap errors} {
-    apply {{} { 
+    apply {{} {
 	set a(0) 44
-	list [catch {lmap a {1 2 3} {}} msg o] $msg $::errorInfo 
-    }} 
+	list [catch {lmap a {1 2 3} {}} msg o] $msg $::errorInfo
+    }}
 } {1 {can't set "a": variable is array} {can't set "a": variable is array
     while executing
 "lmap a {1 2 3} {}"}}
diff --git a/tests/lrange.test b/tests/lrange.test
index 17a757e..02b9c65 100644
--- a/tests/lrange.test
+++ b/tests/lrange.test
@@ -63,7 +63,7 @@ test lrange-1.15 {range of list elements} {
 } {"a b \{\ "}
 # emacs highlighting bug workaround --> "
 test lrange-1.16 {list element quoting} {
-    lrange {[append a .b]} 0 end    
+    lrange {[append a .b]} 0 end
 } {{[append} a .b\]}
 
 test lrange-2.1 {error conditions} {
diff --git a/tests/lrepeat.test b/tests/lrepeat.test
index 788bb9b..e89f1b7 100644
--- a/tests/lrepeat.test
+++ b/tests/lrepeat.test
@@ -40,7 +40,7 @@ test lrepeat-1.4 {error cases} {
 	lrepeat -3 1
     }
     -returnCodes 1
-    -result {bad count "-3": must be integer >= 0} 
+    -result {bad count "-3": must be integer >= 0}
 }
 test lrepeat-1.5 {Accept zero repetitions (TIP 323)} {
     -body {
@@ -53,7 +53,7 @@ test lrepeat-1.6 {error cases} {
 	lrepeat 3.5 1
     }
     -returnCodes 1
-    -result {expected integer but got "3.5"} 
+    -result {expected integer but got "3.5"}
 }
 test lrepeat-1.7 {Accept zero repetitions (TIP 323)} {
     -body {
diff --git a/tests/lsearch.test b/tests/lsearch.test
index f36e987..b2c1812 100644
--- a/tests/lsearch.test
+++ b/tests/lsearch.test
@@ -404,16 +404,16 @@ test lsearch-17.2 {lsearch -index option, basic functionality} {
     lsearch -index 1 -exact {{a c} {a b} {a a}} a
 } 2
 test lsearch-17.3 {lsearch -index option, basic functionality} {
-    lsearch -index 1 -glob {{ab cb} {ab bb} {ab ab}} b* 
+    lsearch -index 1 -glob {{ab cb} {ab bb} {ab ab}} b*
 } 1
 test lsearch-17.4 {lsearch -index option, basic functionality} {
     lsearch -index 1 -regexp {{ab cb} {ab bb} {ab ab}} {[cb]b}
-} 0 
+} 0
 test lsearch-17.5 {lsearch -index option, basic functionality} {
     lsearch -all -index 0 -exact {{a c} {a b} {d a}} a
 } {0 1}
 test lsearch-17.6 {lsearch -index option, basic functionality} {
-    lsearch -all -index 1 -glob {{ab cb} {ab bb} {db bx}} b* 
+    lsearch -all -index 1 -glob {{ab cb} {ab bb} {db bx}} b*
 } {1 2}
 test lsearch-17.7 {lsearch -index option, basic functionality} {
     lsearch -all -index 1 -regexp {{ab cb} {ab bb} {ab ab}} {[cb]b}
@@ -426,11 +426,11 @@ test lsearch-18.2 {lsearch -index option, list as index basic functionality} {
     lsearch -index {2 0} -exact {{{x x} {x b} {a d}} {{a c} {a b} {a a}}} a
 } 0
 test lsearch-18.3 {lsearch -index option, list as index basic functionality} {
-    lsearch -index {1 1} -glob {{{ab cb} {ab bb} {ab ab}} {{ab cb} {ab bb} {ab ab}}} b* 
+    lsearch -index {1 1} -glob {{{ab cb} {ab bb} {ab ab}} {{ab cb} {ab bb} {ab ab}}} b*
 } 0
 test lsearch-18.4 {lsearch -index option, list as index basic functionality} {
     lsearch -index {0 1} -regexp {{{ab cb} {ab bb} {ab ab}} {{ab cb} {ab bb} {ab ab}}} {[cb]b}
-} 0 
+} 0
 test lsearch-18.5 {lsearch -index option, list as index basic functionality} {
     lsearch -all -index {0 0} -exact {{{a c} {a b} {d a}} {{a c} {a b} {d a}}} a
 } {0 1}
@@ -442,11 +442,11 @@ test lsearch-19.2 {lsearch -sunindices option} {
     lsearch -subindices -index {2 0} -exact {{{x x} {x b} {a d}} {{a c} {a b} {a a}}} a
 } {0 2 0}
 test lsearch-19.3 {lsearch -sunindices option} {
-    lsearch -subindices -index {1 1} -glob {{{ab cb} {ab bb} {ab ab}} {{ab cb} {ab bb} {ab ab}}} b* 
+    lsearch -subindices -index {1 1} -glob {{{ab cb} {ab bb} {ab ab}} {{ab cb} {ab bb} {ab ab}}} b*
 } {0 1 1}
 test lsearch-19.4 {lsearch -sunindices option} {
     lsearch -subindices -index {0 1} -regexp {{{ab cb} {ab bb} {ab ab}} {{ab cb} {ab bb} {ab ab}}} {[cb]b}
-} {0 0 1} 
+} {0 0 1}
 test lsearch-19.5 {lsearch -sunindices option} {
     lsearch -subindices -all -index {0 0} -exact {{{a c} {a b} {d a}} {{a c} {a b} {d a}}} a
 } {{0 0 0} {1 0 0}}
diff --git a/tests/lsetComp.test b/tests/lsetComp.test
index 6846cbf..6330de4 100644
--- a/tests/lsetComp.test
+++ b/tests/lsetComp.test
@@ -22,7 +22,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 proc evalInProc { script } {
     proc testProc {} $script
     set status [catch {
-	testProc 
+	testProc
     } result]
     rename testProc {}
     return [list $status $result]
@@ -60,69 +60,69 @@ test lsetComp-2.3 {lset, compiled, list of args, scalar, one-byte offset} {
 
 test lsetComp-2.4 {lset, compiled, list of args, scalar, four-byte offset} {
     evalInProc {
-	set x0 0; set x1 0; set x2 0; set x3 0; 
-	set x4 0; set x5 0; set x6 0; set x7 0; 
-	set x8 0; set x9 0; set x10 0; set x11 0; 
-	set x12 0; set x13 0; set x14 0; set x15 0; 
-	set x16 0; set x17 0; set x18 0; set x19 0; 
-	set x20 0; set x21 0; set x22 0; set x23 0; 
-	set x24 0; set x25 0; set x26 0; set x27 0; 
-	set x28 0; set x29 0; set x30 0; set x31 0; 
-	set x32 0; set x33 0; set x34 0; set x35 0; 
-	set x36 0; set x37 0; set x38 0; set x39 0; 
-	set x40 0; set x41 0; set x42 0; set x43 0; 
-	set x44 0; set x45 0; set x46 0; set x47 0; 
-	set x48 0; set x49 0; set x50 0; set x51 0; 
-	set x52 0; set x53 0; set x54 0; set x55 0; 
-	set x56 0; set x57 0; set x58 0; set x59 0; 
-	set x60 0; set x61 0; set x62 0; set x63 0; 
-	set x64 0; set x65 0; set x66 0; set x67 0; 
-	set x68 0; set x69 0; set x70 0; set x71 0; 
-	set x72 0; set x73 0; set x74 0; set x75 0; 
-	set x76 0; set x77 0; set x78 0; set x79 0; 
-	set x80 0; set x81 0; set x82 0; set x83 0; 
-	set x84 0; set x85 0; set x86 0; set x87 0; 
-	set x88 0; set x89 0; set x90 0; set x91 0; 
-	set x92 0; set x93 0; set x94 0; set x95 0; 
-	set x96 0; set x97 0; set x98 0; set x99 0; 
-	set x100 0; set x101 0; set x102 0; set x103 0; 
-	set x104 0; set x105 0; set x106 0; set x107 0; 
-	set x108 0; set x109 0; set x110 0; set x111 0; 
-	set x112 0; set x113 0; set x114 0; set x115 0; 
-	set x116 0; set x117 0; set x118 0; set x119 0; 
-	set x120 0; set x121 0; set x122 0; set x123 0; 
-	set x124 0; set x125 0; set x126 0; set x127 0; 
-	set x128 0; set x129 0; set x130 0; set x131 0; 
-	set x132 0; set x133 0; set x134 0; set x135 0; 
-	set x136 0; set x137 0; set x138 0; set x139 0; 
-	set x140 0; set x141 0; set x142 0; set x143 0; 
-	set x144 0; set x145 0; set x146 0; set x147 0; 
-	set x148 0; set x149 0; set x150 0; set x151 0; 
-	set x152 0; set x153 0; set x154 0; set x155 0; 
-	set x156 0; set x157 0; set x158 0; set x159 0; 
-	set x160 0; set x161 0; set x162 0; set x163 0; 
-	set x164 0; set x165 0; set x166 0; set x167 0; 
-	set x168 0; set x169 0; set x170 0; set x171 0; 
-	set x172 0; set x173 0; set x174 0; set x175 0; 
-	set x176 0; set x177 0; set x178 0; set x179 0; 
-	set x180 0; set x181 0; set x182 0; set x183 0; 
-	set x184 0; set x185 0; set x186 0; set x187 0; 
-	set x188 0; set x189 0; set x190 0; set x191 0; 
-	set x192 0; set x193 0; set x194 0; set x195 0; 
-	set x196 0; set x197 0; set x198 0; set x199 0; 
-	set x200 0; set x201 0; set x202 0; set x203 0; 
-	set x204 0; set x205 0; set x206 0; set x207 0; 
-	set x208 0; set x209 0; set x210 0; set x211 0; 
-	set x212 0; set x213 0; set x214 0; set x215 0; 
-	set x216 0; set x217 0; set x218 0; set x219 0; 
-	set x220 0; set x221 0; set x222 0; set x223 0; 
-	set x224 0; set x225 0; set x226 0; set x227 0; 
-	set x228 0; set x229 0; set x230 0; set x231 0; 
-	set x232 0; set x233 0; set x234 0; set x235 0; 
-	set x236 0; set x237 0; set x238 0; set x239 0; 
-	set x240 0; set x241 0; set x242 0; set x243 0; 
-	set x244 0; set x245 0; set x246 0; set x247 0; 
-	set x248 0; set x249 0; set x250 0; set x251 0; 
+	set x0 0; set x1 0; set x2 0; set x3 0;
+	set x4 0; set x5 0; set x6 0; set x7 0;
+	set x8 0; set x9 0; set x10 0; set x11 0;
+	set x12 0; set x13 0; set x14 0; set x15 0;
+	set x16 0; set x17 0; set x18 0; set x19 0;
+	set x20 0; set x21 0; set x22 0; set x23 0;
+	set x24 0; set x25 0; set x26 0; set x27 0;
+	set x28 0; set x29 0; set x30 0; set x31 0;
+	set x32 0; set x33 0; set x34 0; set x35 0;
+	set x36 0; set x37 0; set x38 0; set x39 0;
+	set x40 0; set x41 0; set x42 0; set x43 0;
+	set x44 0; set x45 0; set x46 0; set x47 0;
+	set x48 0; set x49 0; set x50 0; set x51 0;
+	set x52 0; set x53 0; set x54 0; set x55 0;
+	set x56 0; set x57 0; set x58 0; set x59 0;
+	set x60 0; set x61 0; set x62 0; set x63 0;
+	set x64 0; set x65 0; set x66 0; set x67 0;
+	set x68 0; set x69 0; set x70 0; set x71 0;
+	set x72 0; set x73 0; set x74 0; set x75 0;
+	set x76 0; set x77 0; set x78 0; set x79 0;
+	set x80 0; set x81 0; set x82 0; set x83 0;
+	set x84 0; set x85 0; set x86 0; set x87 0;
+	set x88 0; set x89 0; set x90 0; set x91 0;
+	set x92 0; set x93 0; set x94 0; set x95 0;
+	set x96 0; set x97 0; set x98 0; set x99 0;
+	set x100 0; set x101 0; set x102 0; set x103 0;
+	set x104 0; set x105 0; set x106 0; set x107 0;
+	set x108 0; set x109 0; set x110 0; set x111 0;
+	set x112 0; set x113 0; set x114 0; set x115 0;
+	set x116 0; set x117 0; set x118 0; set x119 0;
+	set x120 0; set x121 0; set x122 0; set x123 0;
+	set x124 0; set x125 0; set x126 0; set x127 0;
+	set x128 0; set x129 0; set x130 0; set x131 0;
+	set x132 0; set x133 0; set x134 0; set x135 0;
+	set x136 0; set x137 0; set x138 0; set x139 0;
+	set x140 0; set x141 0; set x142 0; set x143 0;
+	set x144 0; set x145 0; set x146 0; set x147 0;
+	set x148 0; set x149 0; set x150 0; set x151 0;
+	set x152 0; set x153 0; set x154 0; set x155 0;
+	set x156 0; set x157 0; set x158 0; set x159 0;
+	set x160 0; set x161 0; set x162 0; set x163 0;
+	set x164 0; set x165 0; set x166 0; set x167 0;
+	set x168 0; set x169 0; set x170 0; set x171 0;
+	set x172 0; set x173 0; set x174 0; set x175 0;
+	set x176 0; set x177 0; set x178 0; set x179 0;
+	set x180 0; set x181 0; set x182 0; set x183 0;
+	set x184 0; set x185 0; set x186 0; set x187 0;
+	set x188 0; set x189 0; set x190 0; set x191 0;
+	set x192 0; set x193 0; set x194 0; set x195 0;
+	set x196 0; set x197 0; set x198 0; set x199 0;
+	set x200 0; set x201 0; set x202 0; set x203 0;
+	set x204 0; set x205 0; set x206 0; set x207 0;
+	set x208 0; set x209 0; set x210 0; set x211 0;
+	set x212 0; set x213 0; set x214 0; set x215 0;
+	set x216 0; set x217 0; set x218 0; set x219 0;
+	set x220 0; set x221 0; set x222 0; set x223 0;
+	set x224 0; set x225 0; set x226 0; set x227 0;
+	set x228 0; set x229 0; set x230 0; set x231 0;
+	set x232 0; set x233 0; set x234 0; set x235 0;
+	set x236 0; set x237 0; set x238 0; set x239 0;
+	set x240 0; set x241 0; set x242 0; set x243 0;
+	set x244 0; set x245 0; set x246 0; set x247 0;
+	set x248 0; set x249 0; set x250 0; set x251 0;
 	set x252 0; set x253 0; set x254 0; set x255 0;
 	set x {{1 2} {3 4}}
 	lset x {1 1} 5
@@ -145,69 +145,69 @@ test lsetComp-2.6 {lset, compiled, list of args, array, one-byte offset} {
 
 test lsetComp-2.7 {lset, compiled, list of args, array, four-byte offset} {
     evalInProc {
-	set x0 0; set x1 0; set x2 0; set x3 0; 
-	set x4 0; set x5 0; set x6 0; set x7 0; 
-	set x8 0; set x9 0; set x10 0; set x11 0; 
-	set x12 0; set x13 0; set x14 0; set x15 0; 
-	set x16 0; set x17 0; set x18 0; set x19 0; 
-	set x20 0; set x21 0; set x22 0; set x23 0; 
-	set x24 0; set x25 0; set x26 0; set x27 0; 
-	set x28 0; set x29 0; set x30 0; set x31 0; 
-	set x32 0; set x33 0; set x34 0; set x35 0; 
-	set x36 0; set x37 0; set x38 0; set x39 0; 
-	set x40 0; set x41 0; set x42 0; set x43 0; 
-	set x44 0; set x45 0; set x46 0; set x47 0; 
-	set x48 0; set x49 0; set x50 0; set x51 0; 
-	set x52 0; set x53 0; set x54 0; set x55 0; 
-	set x56 0; set x57 0; set x58 0; set x59 0; 
-	set x60 0; set x61 0; set x62 0; set x63 0; 
-	set x64 0; set x65 0; set x66 0; set x67 0; 
-	set x68 0; set x69 0; set x70 0; set x71 0; 
-	set x72 0; set x73 0; set x74 0; set x75 0; 
-	set x76 0; set x77 0; set x78 0; set x79 0; 
-	set x80 0; set x81 0; set x82 0; set x83 0; 
-	set x84 0; set x85 0; set x86 0; set x87 0; 
-	set x88 0; set x89 0; set x90 0; set x91 0; 
-	set x92 0; set x93 0; set x94 0; set x95 0; 
-	set x96 0; set x97 0; set x98 0; set x99 0; 
-	set x100 0; set x101 0; set x102 0; set x103 0; 
-	set x104 0; set x105 0; set x106 0; set x107 0; 
-	set x108 0; set x109 0; set x110 0; set x111 0; 
-	set x112 0; set x113 0; set x114 0; set x115 0; 
-	set x116 0; set x117 0; set x118 0; set x119 0; 
-	set x120 0; set x121 0; set x122 0; set x123 0; 
-	set x124 0; set x125 0; set x126 0; set x127 0; 
-	set x128 0; set x129 0; set x130 0; set x131 0; 
-	set x132 0; set x133 0; set x134 0; set x135 0; 
-	set x136 0; set x137 0; set x138 0; set x139 0; 
-	set x140 0; set x141 0; set x142 0; set x143 0; 
-	set x144 0; set x145 0; set x146 0; set x147 0; 
-	set x148 0; set x149 0; set x150 0; set x151 0; 
-	set x152 0; set x153 0; set x154 0; set x155 0; 
-	set x156 0; set x157 0; set x158 0; set x159 0; 
-	set x160 0; set x161 0; set x162 0; set x163 0; 
-	set x164 0; set x165 0; set x166 0; set x167 0; 
-	set x168 0; set x169 0; set x170 0; set x171 0; 
-	set x172 0; set x173 0; set x174 0; set x175 0; 
-	set x176 0; set x177 0; set x178 0; set x179 0; 
-	set x180 0; set x181 0; set x182 0; set x183 0; 
-	set x184 0; set x185 0; set x186 0; set x187 0; 
-	set x188 0; set x189 0; set x190 0; set x191 0; 
-	set x192 0; set x193 0; set x194 0; set x195 0; 
-	set x196 0; set x197 0; set x198 0; set x199 0; 
-	set x200 0; set x201 0; set x202 0; set x203 0; 
-	set x204 0; set x205 0; set x206 0; set x207 0; 
-	set x208 0; set x209 0; set x210 0; set x211 0; 
-	set x212 0; set x213 0; set x214 0; set x215 0; 
-	set x216 0; set x217 0; set x218 0; set x219 0; 
-	set x220 0; set x221 0; set x222 0; set x223 0; 
-	set x224 0; set x225 0; set x226 0; set x227 0; 
-	set x228 0; set x229 0; set x230 0; set x231 0; 
-	set x232 0; set x233 0; set x234 0; set x235 0; 
-	set x236 0; set x237 0; set x238 0; set x239 0; 
-	set x240 0; set x241 0; set x242 0; set x243 0; 
-	set x244 0; set x245 0; set x246 0; set x247 0; 
-	set x248 0; set x249 0; set x250 0; set x251 0; 
+	set x0 0; set x1 0; set x2 0; set x3 0;
+	set x4 0; set x5 0; set x6 0; set x7 0;
+	set x8 0; set x9 0; set x10 0; set x11 0;
+	set x12 0; set x13 0; set x14 0; set x15 0;
+	set x16 0; set x17 0; set x18 0; set x19 0;
+	set x20 0; set x21 0; set x22 0; set x23 0;
+	set x24 0; set x25 0; set x26 0; set x27 0;
+	set x28 0; set x29 0; set x30 0; set x31 0;
+	set x32 0; set x33 0; set x34 0; set x35 0;
+	set x36 0; set x37 0; set x38 0; set x39 0;
+	set x40 0; set x41 0; set x42 0; set x43 0;
+	set x44 0; set x45 0; set x46 0; set x47 0;
+	set x48 0; set x49 0; set x50 0; set x51 0;
+	set x52 0; set x53 0; set x54 0; set x55 0;
+	set x56 0; set x57 0; set x58 0; set x59 0;
+	set x60 0; set x61 0; set x62 0; set x63 0;
+	set x64 0; set x65 0; set x66 0; set x67 0;
+	set x68 0; set x69 0; set x70 0; set x71 0;
+	set x72 0; set x73 0; set x74 0; set x75 0;
+	set x76 0; set x77 0; set x78 0; set x79 0;
+	set x80 0; set x81 0; set x82 0; set x83 0;
+	set x84 0; set x85 0; set x86 0; set x87 0;
+	set x88 0; set x89 0; set x90 0; set x91 0;
+	set x92 0; set x93 0; set x94 0; set x95 0;
+	set x96 0; set x97 0; set x98 0; set x99 0;
+	set x100 0; set x101 0; set x102 0; set x103 0;
+	set x104 0; set x105 0; set x106 0; set x107 0;
+	set x108 0; set x109 0; set x110 0; set x111 0;
+	set x112 0; set x113 0; set x114 0; set x115 0;
+	set x116 0; set x117 0; set x118 0; set x119 0;
+	set x120 0; set x121 0; set x122 0; set x123 0;
+	set x124 0; set x125 0; set x126 0; set x127 0;
+	set x128 0; set x129 0; set x130 0; set x131 0;
+	set x132 0; set x133 0; set x134 0; set x135 0;
+	set x136 0; set x137 0; set x138 0; set x139 0;
+	set x140 0; set x141 0; set x142 0; set x143 0;
+	set x144 0; set x145 0; set x146 0; set x147 0;
+	set x148 0; set x149 0; set x150 0; set x151 0;
+	set x152 0; set x153 0; set x154 0; set x155 0;
+	set x156 0; set x157 0; set x158 0; set x159 0;
+	set x160 0; set x161 0; set x162 0; set x163 0;
+	set x164 0; set x165 0; set x166 0; set x167 0;
+	set x168 0; set x169 0; set x170 0; set x171 0;
+	set x172 0; set x173 0; set x174 0; set x175 0;
+	set x176 0; set x177 0; set x178 0; set x179 0;
+	set x180 0; set x181 0; set x182 0; set x183 0;
+	set x184 0; set x185 0; set x186 0; set x187 0;
+	set x188 0; set x189 0; set x190 0; set x191 0;
+	set x192 0; set x193 0; set x194 0; set x195 0;
+	set x196 0; set x197 0; set x198 0; set x199 0;
+	set x200 0; set x201 0; set x202 0; set x203 0;
+	set x204 0; set x205 0; set x206 0; set x207 0;
+	set x208 0; set x209 0; set x210 0; set x211 0;
+	set x212 0; set x213 0; set x214 0; set x215 0;
+	set x216 0; set x217 0; set x218 0; set x219 0;
+	set x220 0; set x221 0; set x222 0; set x223 0;
+	set x224 0; set x225 0; set x226 0; set x227 0;
+	set x228 0; set x229 0; set x230 0; set x231 0;
+	set x232 0; set x233 0; set x234 0; set x235 0;
+	set x236 0; set x237 0; set x238 0; set x239 0;
+	set x240 0; set x241 0; set x242 0; set x243 0;
+	set x244 0; set x245 0; set x246 0; set x247 0;
+	set x248 0; set x249 0; set x250 0; set x251 0;
 	set x252 0; set x253 0; set x254 0; set x255 0;
 	set y(0) {{1 2} {3 4}}
 	lset y(0) {1 1} 5
@@ -253,69 +253,69 @@ test lsetComp-3.3 {lset, compiled, flat args, scalar, one-byte offset} {
 
 test lsetComp-3.4 {lset, compiled, scalar, four-byte offset} {
     evalInProc {
-	set x0 0; set x1 0; set x2 0; set x3 0; 
-	set x4 0; set x5 0; set x6 0; set x7 0; 
-	set x8 0; set x9 0; set x10 0; set x11 0; 
-	set x12 0; set x13 0; set x14 0; set x15 0; 
-	set x16 0; set x17 0; set x18 0; set x19 0; 
-	set x20 0; set x21 0; set x22 0; set x23 0; 
-	set x24 0; set x25 0; set x26 0; set x27 0; 
-	set x28 0; set x29 0; set x30 0; set x31 0; 
-	set x32 0; set x33 0; set x34 0; set x35 0; 
-	set x36 0; set x37 0; set x38 0; set x39 0; 
-	set x40 0; set x41 0; set x42 0; set x43 0; 
-	set x44 0; set x45 0; set x46 0; set x47 0; 
-	set x48 0; set x49 0; set x50 0; set x51 0; 
-	set x52 0; set x53 0; set x54 0; set x55 0; 
-	set x56 0; set x57 0; set x58 0; set x59 0; 
-	set x60 0; set x61 0; set x62 0; set x63 0; 
-	set x64 0; set x65 0; set x66 0; set x67 0; 
-	set x68 0; set x69 0; set x70 0; set x71 0; 
-	set x72 0; set x73 0; set x74 0; set x75 0; 
-	set x76 0; set x77 0; set x78 0; set x79 0; 
-	set x80 0; set x81 0; set x82 0; set x83 0; 
-	set x84 0; set x85 0; set x86 0; set x87 0; 
-	set x88 0; set x89 0; set x90 0; set x91 0; 
-	set x92 0; set x93 0; set x94 0; set x95 0; 
-	set x96 0; set x97 0; set x98 0; set x99 0; 
-	set x100 0; set x101 0; set x102 0; set x103 0; 
-	set x104 0; set x105 0; set x106 0; set x107 0; 
-	set x108 0; set x109 0; set x110 0; set x111 0; 
-	set x112 0; set x113 0; set x114 0; set x115 0; 
-	set x116 0; set x117 0; set x118 0; set x119 0; 
-	set x120 0; set x121 0; set x122 0; set x123 0; 
-	set x124 0; set x125 0; set x126 0; set x127 0; 
-	set x128 0; set x129 0; set x130 0; set x131 0; 
-	set x132 0; set x133 0; set x134 0; set x135 0; 
-	set x136 0; set x137 0; set x138 0; set x139 0; 
-	set x140 0; set x141 0; set x142 0; set x143 0; 
-	set x144 0; set x145 0; set x146 0; set x147 0; 
-	set x148 0; set x149 0; set x150 0; set x151 0; 
-	set x152 0; set x153 0; set x154 0; set x155 0; 
-	set x156 0; set x157 0; set x158 0; set x159 0; 
-	set x160 0; set x161 0; set x162 0; set x163 0; 
-	set x164 0; set x165 0; set x166 0; set x167 0; 
-	set x168 0; set x169 0; set x170 0; set x171 0; 
-	set x172 0; set x173 0; set x174 0; set x175 0; 
-	set x176 0; set x177 0; set x178 0; set x179 0; 
-	set x180 0; set x181 0; set x182 0; set x183 0; 
-	set x184 0; set x185 0; set x186 0; set x187 0; 
-	set x188 0; set x189 0; set x190 0; set x191 0; 
-	set x192 0; set x193 0; set x194 0; set x195 0; 
-	set x196 0; set x197 0; set x198 0; set x199 0; 
-	set x200 0; set x201 0; set x202 0; set x203 0; 
-	set x204 0; set x205 0; set x206 0; set x207 0; 
-	set x208 0; set x209 0; set x210 0; set x211 0; 
-	set x212 0; set x213 0; set x214 0; set x215 0; 
-	set x216 0; set x217 0; set x218 0; set x219 0; 
-	set x220 0; set x221 0; set x222 0; set x223 0; 
-	set x224 0; set x225 0; set x226 0; set x227 0; 
-	set x228 0; set x229 0; set x230 0; set x231 0; 
-	set x232 0; set x233 0; set x234 0; set x235 0; 
-	set x236 0; set x237 0; set x238 0; set x239 0; 
-	set x240 0; set x241 0; set x242 0; set x243 0; 
-	set x244 0; set x245 0; set x246 0; set x247 0; 
-	set x248 0; set x249 0; set x250 0; set x251 0; 
+	set x0 0; set x1 0; set x2 0; set x3 0;
+	set x4 0; set x5 0; set x6 0; set x7 0;
+	set x8 0; set x9 0; set x10 0; set x11 0;
+	set x12 0; set x13 0; set x14 0; set x15 0;
+	set x16 0; set x17 0; set x18 0; set x19 0;
+	set x20 0; set x21 0; set x22 0; set x23 0;
+	set x24 0; set x25 0; set x26 0; set x27 0;
+	set x28 0; set x29 0; set x30 0; set x31 0;
+	set x32 0; set x33 0; set x34 0; set x35 0;
+	set x36 0; set x37 0; set x38 0; set x39 0;
+	set x40 0; set x41 0; set x42 0; set x43 0;
+	set x44 0; set x45 0; set x46 0; set x47 0;
+	set x48 0; set x49 0; set x50 0; set x51 0;
+	set x52 0; set x53 0; set x54 0; set x55 0;
+	set x56 0; set x57 0; set x58 0; set x59 0;
+	set x60 0; set x61 0; set x62 0; set x63 0;
+	set x64 0; set x65 0; set x66 0; set x67 0;
+	set x68 0; set x69 0; set x70 0; set x71 0;
+	set x72 0; set x73 0; set x74 0; set x75 0;
+	set x76 0; set x77 0; set x78 0; set x79 0;
+	set x80 0; set x81 0; set x82 0; set x83 0;
+	set x84 0; set x85 0; set x86 0; set x87 0;
+	set x88 0; set x89 0; set x90 0; set x91 0;
+	set x92 0; set x93 0; set x94 0; set x95 0;
+	set x96 0; set x97 0; set x98 0; set x99 0;
+	set x100 0; set x101 0; set x102 0; set x103 0;
+	set x104 0; set x105 0; set x106 0; set x107 0;
+	set x108 0; set x109 0; set x110 0; set x111 0;
+	set x112 0; set x113 0; set x114 0; set x115 0;
+	set x116 0; set x117 0; set x118 0; set x119 0;
+	set x120 0; set x121 0; set x122 0; set x123 0;
+	set x124 0; set x125 0; set x126 0; set x127 0;
+	set x128 0; set x129 0; set x130 0; set x131 0;
+	set x132 0; set x133 0; set x134 0; set x135 0;
+	set x136 0; set x137 0; set x138 0; set x139 0;
+	set x140 0; set x141 0; set x142 0; set x143 0;
+	set x144 0; set x145 0; set x146 0; set x147 0;
+	set x148 0; set x149 0; set x150 0; set x151 0;
+	set x152 0; set x153 0; set x154 0; set x155 0;
+	set x156 0; set x157 0; set x158 0; set x159 0;
+	set x160 0; set x161 0; set x162 0; set x163 0;
+	set x164 0; set x165 0; set x166 0; set x167 0;
+	set x168 0; set x169 0; set x170 0; set x171 0;
+	set x172 0; set x173 0; set x174 0; set x175 0;
+	set x176 0; set x177 0; set x178 0; set x179 0;
+	set x180 0; set x181 0; set x182 0; set x183 0;
+	set x184 0; set x185 0; set x186 0; set x187 0;
+	set x188 0; set x189 0; set x190 0; set x191 0;
+	set x192 0; set x193 0; set x194 0; set x195 0;
+	set x196 0; set x197 0; set x198 0; set x199 0;
+	set x200 0; set x201 0; set x202 0; set x203 0;
+	set x204 0; set x205 0; set x206 0; set x207 0;
+	set x208 0; set x209 0; set x210 0; set x211 0;
+	set x212 0; set x213 0; set x214 0; set x215 0;
+	set x216 0; set x217 0; set x218 0; set x219 0;
+	set x220 0; set x221 0; set x222 0; set x223 0;
+	set x224 0; set x225 0; set x226 0; set x227 0;
+	set x228 0; set x229 0; set x230 0; set x231 0;
+	set x232 0; set x233 0; set x234 0; set x235 0;
+	set x236 0; set x237 0; set x238 0; set x239 0;
+	set x240 0; set x241 0; set x242 0; set x243 0;
+	set x244 0; set x245 0; set x246 0; set x247 0;
+	set x248 0; set x249 0; set x250 0; set x251 0;
 	set x252 0; set x253 0; set x254 0; set x255 0;
 	set x {{1 2} {3 4}}
 	lset x 1 1 5
@@ -338,69 +338,69 @@ test lsetComp-3.6 {lset, compiled, flat args, array, one-byte offset} {
 
 test lsetComp-3.7 {lset, compiled, flat args, array, four-byte offset} {
     evalInProc {
-	set x0 0; set x1 0; set x2 0; set x3 0; 
-	set x4 0; set x5 0; set x6 0; set x7 0; 
-	set x8 0; set x9 0; set x10 0; set x11 0; 
-	set x12 0; set x13 0; set x14 0; set x15 0; 
-	set x16 0; set x17 0; set x18 0; set x19 0; 
-	set x20 0; set x21 0; set x22 0; set x23 0; 
-	set x24 0; set x25 0; set x26 0; set x27 0; 
-	set x28 0; set x29 0; set x30 0; set x31 0; 
-	set x32 0; set x33 0; set x34 0; set x35 0; 
-	set x36 0; set x37 0; set x38 0; set x39 0; 
-	set x40 0; set x41 0; set x42 0; set x43 0; 
-	set x44 0; set x45 0; set x46 0; set x47 0; 
-	set x48 0; set x49 0; set x50 0; set x51 0; 
-	set x52 0; set x53 0; set x54 0; set x55 0; 
-	set x56 0; set x57 0; set x58 0; set x59 0; 
-	set x60 0; set x61 0; set x62 0; set x63 0; 
-	set x64 0; set x65 0; set x66 0; set x67 0; 
-	set x68 0; set x69 0; set x70 0; set x71 0; 
-	set x72 0; set x73 0; set x74 0; set x75 0; 
-	set x76 0; set x77 0; set x78 0; set x79 0; 
-	set x80 0; set x81 0; set x82 0; set x83 0; 
-	set x84 0; set x85 0; set x86 0; set x87 0; 
-	set x88 0; set x89 0; set x90 0; set x91 0; 
-	set x92 0; set x93 0; set x94 0; set x95 0; 
-	set x96 0; set x97 0; set x98 0; set x99 0; 
-	set x100 0; set x101 0; set x102 0; set x103 0; 
-	set x104 0; set x105 0; set x106 0; set x107 0; 
-	set x108 0; set x109 0; set x110 0; set x111 0; 
-	set x112 0; set x113 0; set x114 0; set x115 0; 
-	set x116 0; set x117 0; set x118 0; set x119 0; 
-	set x120 0; set x121 0; set x122 0; set x123 0; 
-	set x124 0; set x125 0; set x126 0; set x127 0; 
-	set x128 0; set x129 0; set x130 0; set x131 0; 
-	set x132 0; set x133 0; set x134 0; set x135 0; 
-	set x136 0; set x137 0; set x138 0; set x139 0; 
-	set x140 0; set x141 0; set x142 0; set x143 0; 
-	set x144 0; set x145 0; set x146 0; set x147 0; 
-	set x148 0; set x149 0; set x150 0; set x151 0; 
-	set x152 0; set x153 0; set x154 0; set x155 0; 
-	set x156 0; set x157 0; set x158 0; set x159 0; 
-	set x160 0; set x161 0; set x162 0; set x163 0; 
-	set x164 0; set x165 0; set x166 0; set x167 0; 
-	set x168 0; set x169 0; set x170 0; set x171 0; 
-	set x172 0; set x173 0; set x174 0; set x175 0; 
-	set x176 0; set x177 0; set x178 0; set x179 0; 
-	set x180 0; set x181 0; set x182 0; set x183 0; 
-	set x184 0; set x185 0; set x186 0; set x187 0; 
-	set x188 0; set x189 0; set x190 0; set x191 0; 
-	set x192 0; set x193 0; set x194 0; set x195 0; 
-	set x196 0; set x197 0; set x198 0; set x199 0; 
-	set x200 0; set x201 0; set x202 0; set x203 0; 
-	set x204 0; set x205 0; set x206 0; set x207 0; 
-	set x208 0; set x209 0; set x210 0; set x211 0; 
-	set x212 0; set x213 0; set x214 0; set x215 0; 
-	set x216 0; set x217 0; set x218 0; set x219 0; 
-	set x220 0; set x221 0; set x222 0; set x223 0; 
-	set x224 0; set x225 0; set x226 0; set x227 0; 
-	set x228 0; set x229 0; set x230 0; set x231 0; 
-	set x232 0; set x233 0; set x234 0; set x235 0; 
-	set x236 0; set x237 0; set x238 0; set x239 0; 
-	set x240 0; set x241 0; set x242 0; set x243 0; 
-	set x244 0; set x245 0; set x246 0; set x247 0; 
-	set x248 0; set x249 0; set x250 0; set x251 0; 
+	set x0 0; set x1 0; set x2 0; set x3 0;
+	set x4 0; set x5 0; set x6 0; set x7 0;
+	set x8 0; set x9 0; set x10 0; set x11 0;
+	set x12 0; set x13 0; set x14 0; set x15 0;
+	set x16 0; set x17 0; set x18 0; set x19 0;
+	set x20 0; set x21 0; set x22 0; set x23 0;
+	set x24 0; set x25 0; set x26 0; set x27 0;
+	set x28 0; set x29 0; set x30 0; set x31 0;
+	set x32 0; set x33 0; set x34 0; set x35 0;
+	set x36 0; set x37 0; set x38 0; set x39 0;
+	set x40 0; set x41 0; set x42 0; set x43 0;
+	set x44 0; set x45 0; set x46 0; set x47 0;
+	set x48 0; set x49 0; set x50 0; set x51 0;
+	set x52 0; set x53 0; set x54 0; set x55 0;
+	set x56 0; set x57 0; set x58 0; set x59 0;
+	set x60 0; set x61 0; set x62 0; set x63 0;
+	set x64 0; set x65 0; set x66 0; set x67 0;
+	set x68 0; set x69 0; set x70 0; set x71 0;
+	set x72 0; set x73 0; set x74 0; set x75 0;
+	set x76 0; set x77 0; set x78 0; set x79 0;
+	set x80 0; set x81 0; set x82 0; set x83 0;
+	set x84 0; set x85 0; set x86 0; set x87 0;
+	set x88 0; set x89 0; set x90 0; set x91 0;
+	set x92 0; set x93 0; set x94 0; set x95 0;
+	set x96 0; set x97 0; set x98 0; set x99 0;
+	set x100 0; set x101 0; set x102 0; set x103 0;
+	set x104 0; set x105 0; set x106 0; set x107 0;
+	set x108 0; set x109 0; set x110 0; set x111 0;
+	set x112 0; set x113 0; set x114 0; set x115 0;
+	set x116 0; set x117 0; set x118 0; set x119 0;
+	set x120 0; set x121 0; set x122 0; set x123 0;
+	set x124 0; set x125 0; set x126 0; set x127 0;
+	set x128 0; set x129 0; set x130 0; set x131 0;
+	set x132 0; set x133 0; set x134 0; set x135 0;
+	set x136 0; set x137 0; set x138 0; set x139 0;
+	set x140 0; set x141 0; set x142 0; set x143 0;
+	set x144 0; set x145 0; set x146 0; set x147 0;
+	set x148 0; set x149 0; set x150 0; set x151 0;
+	set x152 0; set x153 0; set x154 0; set x155 0;
+	set x156 0; set x157 0; set x158 0; set x159 0;
+	set x160 0; set x161 0; set x162 0; set x163 0;
+	set x164 0; set x165 0; set x166 0; set x167 0;
+	set x168 0; set x169 0; set x170 0; set x171 0;
+	set x172 0; set x173 0; set x174 0; set x175 0;
+	set x176 0; set x177 0; set x178 0; set x179 0;
+	set x180 0; set x181 0; set x182 0; set x183 0;
+	set x184 0; set x185 0; set x186 0; set x187 0;
+	set x188 0; set x189 0; set x190 0; set x191 0;
+	set x192 0; set x193 0; set x194 0; set x195 0;
+	set x196 0; set x197 0; set x198 0; set x199 0;
+	set x200 0; set x201 0; set x202 0; set x203 0;
+	set x204 0; set x205 0; set x206 0; set x207 0;
+	set x208 0; set x209 0; set x210 0; set x211 0;
+	set x212 0; set x213 0; set x214 0; set x215 0;
+	set x216 0; set x217 0; set x218 0; set x219 0;
+	set x220 0; set x221 0; set x222 0; set x223 0;
+	set x224 0; set x225 0; set x226 0; set x227 0;
+	set x228 0; set x229 0; set x230 0; set x231 0;
+	set x232 0; set x233 0; set x234 0; set x235 0;
+	set x236 0; set x237 0; set x238 0; set x239 0;
+	set x240 0; set x241 0; set x242 0; set x243 0;
+	set x244 0; set x245 0; set x246 0; set x247 0;
+	set x248 0; set x249 0; set x250 0; set x251 0;
 	set x252 0; set x253 0; set x254 0; set x255 0;
 	set y(0) {{1 2} {3 4}}
 	lset y(0) 1 1 5
diff --git a/tests/main.test b/tests/main.test
index 351fd4f..96af066 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -719,7 +719,7 @@ namespace eval ::tcl::test::main {
     } -result "Exit MainLoop\nIn exit\neven 0\n"
 
     test Tcl_Main-5.9 {
-	Tcl_Main: interactive mode: delete interp 
+	Tcl_Main: interactive mode: delete interp
 		-> main loop & exit handlers, but no [exit]
     } -constraints {
 	exec Tcltest
diff --git a/tests/misc.test b/tests/misc.test
index d4ece74..db8b14a 100644
--- a/tests/misc.test
+++ b/tests/misc.test
@@ -25,7 +25,7 @@ testConstraint testhashsystemhash [llength [info commands testhashsystemhash]]
 test misc-1.1 {error in variable ref. in command in array reference} {
     proc tstProc {} {
 	global a
-    
+
 	set tst $a([winfo name $zz])
 	# this is a bogus comment
 	# this is a bogus comment
@@ -42,7 +42,7 @@ test misc-1.1 {error in variable ref. in command in array reference} {
 test misc-1.2 {error in variable ref. in command in array reference} {
     proc tstProc {} "
 	global a
-    
+
 	set tst \$a(\[winfo name \$\{zz)
 	# this is a bogus comment
 	# this is a bogus comment
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 8647f9c..f50ebfb 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -51,7 +51,7 @@ namespace eval ::msgcat::test {
     variable body
     variable result
     variable setVars
-    foreach setVars [PowerSet $envVars] { 
+    foreach setVars [PowerSet $envVars] {
 	set result [string tolower [lindex $setVars 0]]
 	if {[string length $result] == 0} {
 	    if {[info exists ::tcl::mac::locale]} {
@@ -93,7 +93,7 @@ namespace eval ::msgcat::test {
 	incr count
     }
     unset -nocomplain result
-    
+
     # Could add tests of initialization from Windows registry here.
     # Use a fake registry package.
 
@@ -293,11 +293,11 @@ namespace eval ::msgcat::test {
     variable count 2
     variable result
     array set result {
-	foo,ov0 ov0_ROOT foo,ov1 ov1_foo foo,ov2 ov2_foo 
+	foo,ov0 ov0_ROOT foo,ov1 ov1_foo foo,ov2 ov2_foo
         foo,ov3 ov3_foo foo,ov4 ov4
-	foo_BAR,ov0 ov0_ROOT foo_BAR,ov1 ov1_foo foo_BAR,ov2 ov2_foo_BAR 
-        foo_BAR,ov3 ov3_foo_BAR	foo_BAR,ov4 ov4 
-        foo_BAR_baz,ov0 ov0_ROOT foo_BAR_baz,ov1 ov1_foo 
+	foo_BAR,ov0 ov0_ROOT foo_BAR,ov1 ov1_foo foo_BAR,ov2 ov2_foo_BAR
+        foo_BAR,ov3 ov3_foo_BAR	foo_BAR,ov4 ov4
+        foo_BAR_baz,ov0 ov0_ROOT foo_BAR_baz,ov1 ov1_foo
         foo_BAR_baz,ov2 ov2_foo_BAR
 	foo_BAR_baz,ov3 ov3_foo_BAR_baz foo_BAR_baz,ov4 ov4
     }
@@ -416,12 +416,12 @@ namespace eval ::msgcat::test {
 	    variable locale [mclocale]
 	    ::msgcat::mclocale ""
 	    ::msgcat::mcloadedlocales clear
-	    ::msgcat::mcpackageconfig unset mcfolder 
+	    ::msgcat::mcpackageconfig unset mcfolder
 	    mclocale $loc
 	} -cleanup {
 	    mclocale $locale
 	    ::msgcat::mcloadedlocales clear
-	    ::msgcat::mcpackageconfig unset mcfolder 
+	    ::msgcat::mcpackageconfig unset mcfolder
 	} -body {
 	    mcload $msgdir
 	} -result [expr { $count+1 }]
@@ -436,7 +436,7 @@ namespace eval ::msgcat::test {
 	} -cleanup {
 	    mclocale $locale
 	    mcloadedlocales clear
-	    mcpackageconfig unset mcfolder 
+	    mcpackageconfig unset mcfolder
 	} -body {
 	    mcload $msgdir
 	} -result 3
@@ -447,7 +447,7 @@ namespace eval ::msgcat::test {
 	} -cleanup {
 	    mclocale $locale
 	    mcloadedlocales clear
-	    mcpackageconfig unset mcfolder 
+	    mcpackageconfig unset mcfolder
 	} -body {
 	    mcload $msgdir
 	} -result 1
@@ -516,7 +516,7 @@ namespace eval ::msgcat::test {
 	} -cleanup {
 	    mclocale $locale
 	    mcloadedlocales clear
-	    mcpackageconfig unset mcfolder 
+	    mcpackageconfig unset mcfolder
 	} -body {
 	    mclocale foo
 	    mcpackageconfig set mcfolder $msgdir
@@ -535,7 +535,7 @@ namespace eval ::msgcat::test {
     # Tests msgcat-6.*: [mcset], [mc] namespace inheritance
 #
 # Test mcset and mc, ensuring that resolution for messages
-# proceeds from the current ns to its parent and so on to the 
+# proceeds from the current ns to its parent and so on to the
 # global ns.
 #
 # Do this for the 12 permutations of
@@ -579,7 +579,7 @@ namespace eval ::msgcat::test {
 			    ::msgcat::mcset foo ov3 "ov3_foo_bar_baz"
 			}
 		    }
-		    
+
 		}
 		variable locale [mclocale]
 		mclocale foo
@@ -688,12 +688,12 @@ namespace eval ::msgcat::test {
 	    mcexists
 	} -returnCodes 1\
 	-result {wrong # args: should be "mcexists ?-exactnamespace? ?-exactlocale? src"}
-    
+
 	test msgcat-9.2 {mcexists unknown option} -body {
-	    mcexists -unknown src 
+	    mcexists -unknown src
 	} -returnCodes 1\
 	-result {unknown option "-unknown"}
-    
+
 	test msgcat-9.3 {mcexists} -setup {
 	    mcforgetpackage
 	    variable locale [mclocale]
@@ -715,7 +715,7 @@ namespace eval ::msgcat::test {
 	} -body {
 	    list [mcexists k1] [mcexists -exactlocale k1]
 	} -result {1 0}
-    
+
 	test msgcat-9.5 {mcexists parent namespace} -setup {
 	    mcforgetpackage
 	    variable locale [mclocale]
@@ -729,19 +729,19 @@ namespace eval ::msgcat::test {
 			[::msgcat::mcexists -exactnamespace k1]
 	    }
 	} -result {1 0}
-    
+
     # Tests msgcat-10.*: [mcloadedlocales]
 
 	test msgcat-10.1 {mcloadedlocales no arg} -body {
 	    mcloadedlocales
 	} -returnCodes 1\
 	-result {wrong # args: should be "mcloadedlocales subcommand"}
-    
+
 	test msgcat-10.2 {mcloadedlocales wrong subcommand} -body {
 	    mcloadedlocales junk
 	} -returnCodes 1\
 	-result {unknown subcommand "junk": must be clear, or loaded}
-    
+
 	test msgcat-10.3 {mcloadedlocales loaded} -setup {
 	    mcforgetpackage
 	    variable locale [mclocale]
@@ -754,7 +754,7 @@ namespace eval ::msgcat::test {
 	    # The result is position independent so sort
 	    set resultlist [lsort [mcloadedlocales loaded]]
 	} -result {{} foo foo_bar}
-    
+
 	test msgcat-10.4 {mcloadedlocales clear} -setup {
 	    mcforgetpackage
 	    variable locale [mclocale]
@@ -960,9 +960,9 @@ namespace eval ::msgcat::test {
 	} -result {0 0 1 0}
 
     # option mcfolder is already tested with 5.11
-    
+
     # Tests msgcat-14.*: callbacks: loadcmd, changecmd, unknowncmd
-    
+
     # This routine is used as bgerror and by direct callback invocation
     proc callbackproc args {
 	variable resultvariable
@@ -973,7 +973,7 @@ namespace eval ::msgcat::test {
     }
     set bgerrorsaved [interp bgerror {}]
     interp bgerror {} [namespace code callbackproc]
-    
+
 	test msgcat-14.1 {invokation loadcmd} -setup {
 	    mcforgetpackage
     	    mclocale $locale
diff --git a/tests/namespace.test b/tests/namespace.test
index cded1f4..47c8001 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -56,7 +56,7 @@ test namespace-2.2 {Tcl_GetCurrentNamespace} {
 
 test namespace-3.1 {Tcl_GetGlobalNamespace} {
     namespace eval test_ns_1 {namespace eval foo {namespace eval bar {} } }
-    # namespace children uses Tcl_GetGlobalNamespace 
+    # namespace children uses Tcl_GetGlobalNamespace
     namespace eval test_ns_1 {namespace children foo b*}
 } {::test_ns_1::foo::bar}
 
@@ -106,7 +106,7 @@ test namespace-6.2 {Tcl_CreateNamespace, odd number of :'s in name is okay} {
          [namespace eval test_ns_2:::::foo {namespace current}]
 } {::test_ns_1::foo ::test_ns_2::foo}
 test namespace-6.3 {Tcl_CreateNamespace, trailing ::s in ns name are ignored} {
-    list [catch {namespace eval test_ns_7::: {namespace current}} msg] $msg 
+    list [catch {namespace eval test_ns_7::: {namespace current}} msg] $msg
 } {0 ::test_ns_7}
 test namespace-6.4 {Tcl_CreateNamespace, trailing ::s in ns name are ignored} {
     catch {namespace delete {*}[namespace children :: test_ns_*]}
@@ -264,7 +264,7 @@ test namespace-8.5 {TclTeardownNamespace: preserve errorInfo; errorCode values}
     invoked from within
 "slave eval error foo bar baz"}
 test namespace-8.6 {TclTeardownNamespace: preserve errorInfo; errorCode values} {
-    interp create slave 
+    interp create slave
     slave eval {trace add variable errorCode write {namespace delete :: ;#}}
     catch {slave eval error foo bar baz}
     interp delete slave
@@ -971,17 +971,17 @@ test namespace-22.5 {NamespaceCodeCmd, in other namespace} {
         namespace code cmd
     }
 } {::namespace inscope ::test_ns_1 cmd}
-test namespace-22.6 {NamespaceCodeCmd, in other namespace} { 
-    namespace eval test_ns_1 { 
-	variable v 42 
-    } 
-    namespace eval test_ns_2 { 
-	proc namespace args {} 
-    } 
-    namespace eval test_ns_2 [namespace eval test_ns_1 { 
-	namespace code {set v} 
-    }] 
-} {42} 
+test namespace-22.6 {NamespaceCodeCmd, in other namespace} {
+    namespace eval test_ns_1 {
+	variable v 42
+    }
+    namespace eval test_ns_2 {
+	proc namespace args {}
+    }
+    namespace eval test_ns_2 [namespace eval test_ns_1 {
+	namespace code {set v}
+    }]
+} {42}
 test namespace-22.7 {NamespaceCodeCmd, Bug 3202171} {
     namespace eval demo {
 	proc namespace args {puts $args}
@@ -1449,7 +1449,7 @@ test namespace-40.1 {Ignoring namespace proc "unknown"} -setup {
     namespace eval ns {proc unknown args {return local}}
     list [namespace eval ns aaa bbb] [namespace eval ns aaa]
 } -cleanup {
-    rename unknown {}   
+    rename unknown {}
     rename _unknown unknown
     namespace delete ns
 } -result {global global}
@@ -1460,7 +1460,7 @@ test namespace-41.1 {Shadowing byte-compiled commands, Bug: 231259} {
 	set res {}
 	proc test {} {
 	    set ::g 0
-	}  
+	}
 	lappend ::res [test]
 	proc set {a b} {
 	    ::set a [incr b]
diff --git a/tests/nre.test b/tests/nre.test
index 9df5eb1..3313df5 100644
--- a/tests/nre.test
+++ b/tests/nre.test
@@ -29,9 +29,9 @@ if {[testConstraint testnrelevels]} {
 	namespace path ::tcl::mathop
 	#
 	# [testnrelevels] returns a 6-list with: C-stack depth, iPtr->numlevels,
-	# cmdFrame level, callFrame level, tosPtr and callback depth 
+	# cmdFrame level, callFrame level, tosPtr and callback depth
 	#
-	variable last [testnrelevels] 
+	variable last [testnrelevels]
 	proc depthDiff {} {
 	    variable last
 	    set depth [testnrelevels]
@@ -327,7 +327,7 @@ test nre-8.1 {nre and {*}} -body {
 } -cleanup {
     rename inner {}
     rename outer {}
-} -result {1 1 1} 
+} -result {1 1 1}
 test nre-8.2 {nre and {*}, [Bug 2415422]} -body {
     # force an expansion that grows the evaluation stack, check that nre
     # adapts the bcFramePtr. This causes an NRE assertion to fail if it is not
diff --git a/tests/obj.test b/tests/obj.test
index 151abfb..7bf00f7 100644
--- a/tests/obj.test
+++ b/tests/obj.test
@@ -26,7 +26,7 @@ testConstraint wideBiggerThanInt [expr {wide(0x80000000) != int(0x80000000)}]
 test obj-1.1 {Tcl_AppendAllObjTypes, and InitTypeTable, Tcl_RegisterObjType} testobj {
     set r 1
     foreach {t} {
-	{array search} 
+	{array search}
 	bytearray
 	bytecode
 	cmdName
@@ -82,7 +82,7 @@ test obj-6.1 {Tcl_DuplicateObj, object has internal rep} testobj {
     set result ""
     lappend result [testobj freeallvars]
     lappend result [testintobj set 1 47]
-    lappend result [testobj duplicate 1 2]    
+    lappend result [testobj duplicate 1 2]
     lappend result [testintobj get 2]
     lappend result [testobj refcount 1]
     lappend result [testobj refcount 2]
@@ -91,7 +91,7 @@ test obj-6.2 {Tcl_DuplicateObj, "empty string" object} testobj {
     set result ""
     lappend result [testobj freeallvars]
     lappend result [testobj newobj 1]
-    lappend result [testobj duplicate 1 2]    
+    lappend result [testobj duplicate 1 2]
     lappend result [testintobj get 2]
     lappend result [testobj refcount 1]
     lappend result [testobj refcount 2]
diff --git a/tests/oo.test b/tests/oo.test
index 895f7ed..9491f78 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -280,7 +280,7 @@ test oo-1.18.2 {Bug 21c144f0f5} -setup {
     }
 } -cleanup {
     interp delete slave
-} 
+}
 test oo-1.19 {basic test of OO functionality: teardown order} -body {
     oo::object create o
     namespace delete [info object namespace o]
@@ -1989,7 +1989,7 @@ test oo-15.10 {variable binding must not bleed through oo::copy} -setup {
 } -body {
     set obj1 [FooClass new]
     oo::objdefine $obj1 {
-	variable var 
+	variable var
 	method m {} {
 	    set var foo
 	}
@@ -2619,7 +2619,7 @@ test oo-20.10 {OO: variable and varname methods refer to same things} -setup {
 test oo-20.11 {OO: variable mustn't crash when recursing} -body {
     oo::class create A {
 	constructor {name} {
-	    my variable np_name 
+	    my variable np_name
 	    set np_name $name
 	}
 	method copy {nm} {
@@ -2634,7 +2634,7 @@ test oo-20.11 {OO: variable mustn't crash when recursing} -body {
 			lappend objs [$ref copy {}]
 		    }
 		    $cpy prop $var $objs
-		} else { 
+		} else {
 		    $cpy prop $var $val
 		}
 	    }
diff --git a/tests/parse.test b/tests/parse.test
index d73c725..287c392 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -369,7 +369,7 @@ test parse-8.8 {Tcl_EvalObjv procedure, async handlers} -constraints {
     variable ::aresult
     variable ::acode
     proc async1 {result code} {
-	variable ::aresult 
+	variable ::aresult
 	variable ::acode
 	set aresult $result
 	set acode $code
diff --git a/tests/parseExpr.test b/tests/parseExpr.test
index ef05454..fda25b7 100644
--- a/tests/parseExpr.test
+++ b/tests/parseExpr.test
@@ -768,11 +768,11 @@ test parseExpr-21.8 {error messages} -body {
     expr {0o8x}
 } -returnCodes error -match glob -result {*invalid octal number*}
 test parseExpr-21.9 {error messages} -body {
-    expr {"} 
+    expr {"}
 } -returnCodes error -result {missing "
 in expression """}
 test parseExpr-21.10 {error messages} -body {
-    expr \{ 
+    expr \{
 } -returnCodes error -result "missing close-brace
 in expression \"\{\""
 test parseExpr-21.11 {error messages} -body {
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
index 84c82ce..8ff806c 100644
--- a/tests/pkgMkIndex.test
+++ b/tests/pkgMkIndex.test
@@ -231,7 +231,7 @@ proc pkgtest::runCreatedIndex {rv args} {
 	    set result [list 0 [makePkgList [parseIndex $idxFile]]]
 	} err]} {
 	    set result [list 1 $err]
-	} 
+	}
 	file delete $idxFile
     } else {
 	set result $rv
diff --git a/tests/platform.test b/tests/platform.test
index c826444..5838a41 100644
--- a/tests/platform.test
+++ b/tests/platform.test
@@ -51,12 +51,12 @@ test platform-2.1 {tcl_platform(wordSize) indicates size of native word} {
 
 test platform-3.1 {CPU ID on Windows/UNIX} \
     -constraints testCPUID \
-    -body {		
+    -body {
 	set cpudata [testcpuid 0]
 	binary format iii \
 	    [lindex $cpudata 1] \
 	    [lindex $cpudata 3] \
-	    [lindex $cpudata 2] 
+	    [lindex $cpudata 2]
     } \
     -match regexp \
     -result {^(?:AuthenticAMD|CentaurHauls|CyrixInstead|GenuineIntel)$}
diff --git a/tests/proc.test b/tests/proc.test
index e06720e..bae5e15 100644
--- a/tests/proc.test
+++ b/tests/proc.test
@@ -99,7 +99,7 @@ test proc-1.6 {Tcl_ProcObjCmd, namespace code ignores single ":"s in middle or e
 test proc-1.7 {Tcl_ProcObjCmd, check that formal parameter names are not array elements} -setup {
     catch {rename p ""}
 } -returnCodes error -body {
-    proc p {a(1) a(2)} { 
+    proc p {a(1) a(2)} {
 	set z [expr $a(1)+$a(2)]
 	puts "$z=z, $a(1)=$a(1)"
     }
@@ -107,7 +107,7 @@ test proc-1.7 {Tcl_ProcObjCmd, check that formal parameter names are not array e
 test proc-1.8 {Tcl_ProcObjCmd, check that formal parameter names are simple names} -setup {
     catch {rename p ""}
 } -body {
-    proc p {b:a b::a} { 
+    proc p {b:a b::a} {
     }
 } -returnCodes error -result {formal parameter "b::a" is not a simple name}
 
@@ -329,7 +329,7 @@ test proc-5.1 {Bytecompiling noop; test for correct argument substitution} -body
 } -cleanup {
     catch {rename p ""}
     catch {rename t ""}
-} -result {aba}    
+} -result {aba}
 
 test proc-6.1 {ProcessProcResultCode: Bug 647307 (negative return code)} -body {
     proc a {} {return -code -5}
diff --git a/tests/reg.test b/tests/reg.test
index d040632..b9dc538 100644
--- a/tests/reg.test
+++ b/tests/reg.test
@@ -49,9 +49,9 @@ catch [list package require -exact Tcltest [info patchlevel]]
 # subexpressions, checking where empty substrings are located,
 # etc. should be done using expectIndices and expectPartial.
 
-# The flag characters are complex and a bit eclectic.  Generally speaking, 
+# The flag characters are complex and a bit eclectic.  Generally speaking,
 # lowercase letters are compile options, uppercase are expected re_info
-# bits, and nonalphabetics are match options, controls for how the test is 
+# bits, and nonalphabetics are match options, controls for how the test is
 # run, or testing options.  The one small surprise is that AREs are the
 # default, and you must explicitly request lesser flavors of RE.  The flags
 # are as follows.  It is admitted that some are not very mnemonic.
@@ -311,7 +311,7 @@ namespace eval RETest {
     # match expected (full fanciness)
     # expectIndices testno flags re target mat submat ...
     proc expectIndices {args} {
-	MatchExpected -indices {*}$args 
+	MatchExpected -indices {*}$args
     }
 
     # partial match expected
diff --git a/tests/regexp.test b/tests/regexp.test
index 9fff262..4ffdbdb 100644
--- a/tests/regexp.test
+++ b/tests/regexp.test
@@ -480,7 +480,7 @@ test regexp-11.12 {regsub without final variable name returns value} {
 } {a,bcd,c,ea,bcfd,cf,e}
 
 # This test crashes on the Mac unless you increase the Stack Space to about 1
-# Meg.  This is probably bigger than most users want... 
+# Meg.  This is probably bigger than most users want...
 # 8.2.3 regexp reduced stack space requirements, but this should be
 # tested again
 test regexp-12.1 {Tcl_RegExpExec: large number of subexpressions} {macCrash} {
@@ -742,10 +742,10 @@ test regexp-19.2 {regsub null replacement} {
 
 test regexp-20.1 {regsub shared object shimmering} {
     # Bug #461322
-    set a abcdefghijklmnopqurstuvwxyz 
-    set b $a 
-    set c abcdefghijklmnopqurstuvwxyz0123456789 
-    regsub $a $c $b d 
+    set a abcdefghijklmnopqurstuvwxyz
+    set b $a
+    set c abcdefghijklmnopqurstuvwxyz0123456789
+    regsub $a $c $b d
     list $d [string length $d] [string bytelength $d]
 } [list abcdefghijklmnopqurstuvwxyz0123456789 37 37]
 test regexp-20.2 {regsub shared object shimmering with -about} {
diff --git a/tests/regexpComp.test b/tests/regexpComp.test
index 01ef06d..b8e64b6 100644
--- a/tests/regexpComp.test
+++ b/tests/regexpComp.test
@@ -22,7 +22,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 proc evalInProc { script } {
     proc testProc {} $script
     set status [catch {
-	testProc 
+	testProc
     } result]
     rename testProc {}
     return $result
@@ -607,7 +607,7 @@ test regexpComp-11.8 {regsub errors, -start bad int check} {
 } {1 {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?}}
 
 # This test crashes on the Mac unless you increase the Stack Space to about 1
-# Meg.  This is probably bigger than most users want... 
+# Meg.  This is probably bigger than most users want...
 # 8.2.3 regexp reduced stack space requirements, but this should be
 # tested again
 test regexpComp-12.1 {Tcl_RegExpExec: large number of subexpressions} {macCrash} {
@@ -794,10 +794,10 @@ test regexpComp-19.1 {regsub null replacement} {
 test regexpComp-20.1 {regsub shared object shimmering} {
     evalInProc {
 	# Bug #461322
-	set a abcdefghijklmnopqurstuvwxyz 
-	set b $a 
-	set c abcdefghijklmnopqurstuvwxyz0123456789 
-	regsub $a $c $b d 
+	set a abcdefghijklmnopqurstuvwxyz
+	set b $a
+	set c abcdefghijklmnopqurstuvwxyz0123456789
+	regsub $a $c $b d
 	list $d [string length $d] [string bytelength $d]
     }
 } [list abcdefghijklmnopqurstuvwxyz0123456789 37 37]
diff --git a/tests/set-old.test b/tests/set-old.test
index 94b6901..0e9ca63 100644
--- a/tests/set-old.test
+++ b/tests/set-old.test
@@ -931,7 +931,7 @@ catch {rename foo {}}
 
 # cleanup
 ::tcltest::cleanupTests
-return 
+return
 
 # Local Variables:
 # mode: tcl
diff --git a/tests/set.test b/tests/set.test
index 18119f5..7e4b864 100644
--- a/tests/set.test
+++ b/tests/set.test
@@ -536,4 +536,4 @@ catch {unset i}
 catch {unset x}
 catch {unset z}
 ::tcltest::cleanupTests
-return 
+return
diff --git a/tests/split.test b/tests/split.test
index 778131f..585fef5 100644
--- a/tests/split.test
+++ b/tests/split.test
@@ -43,7 +43,7 @@ test split-1.8 {basic split commands} {
         foreach f [split {]\n} {}] {
             append x $f
         }
-        return $x	
+        return $x
     }
     foo
 } {]\n}
diff --git a/tests/stack.test b/tests/stack.test
index 13bc524..4c50f74 100644
--- a/tests/stack.test
+++ b/tests/stack.test
@@ -31,7 +31,7 @@ test stack-2.1 {maxNestingDepth reached on infinite recursion} -body {
 	puts $msg
     }
 } -result {too many nested evaluations (infinite loop?)}
-    
+
 # Make sure that there is enough stack to run regexp even if we're
 # close to the recursion limit. [Bug 947070] [Patch 746378]
 test stack-3.1 {enough room for regexp near recursion limit} -body {
diff --git a/tests/string.test b/tests/string.test
index 3611753..418bc61 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -219,7 +219,7 @@ test string-4.14 {string first, negative start index} {
 } 1
 test string-4.15 {string first, ability to two-byte encoded utf-8 chars} {
     # Test for a bug in Tcl 8.3 where test for all-single-byte-encoded
-    # strings was incorrect, leading to an index returned by [string first] 
+    # strings was incorrect, leading to an index returned by [string first]
     # which pointed past the end of the string.
     set uchar \u057e    ;# character with two-byte encoding in utf-8
     string first % %#$uchar$uchar#$uchar$uchar#% 3
@@ -419,7 +419,7 @@ test string-6.37 {string is double, false on int overflow} -setup {
 } -result {1 priorValue}
 # string-6.38 removed, underflow on input is no longer an error.
 test string-6.39 {string is double, false} {
-    # This test is non-portable because IRIX thinks 
+    # This test is non-portable because IRIX thinks
     # that .e1 is a valid double - this is really a bug
     # on IRIX as .e1 should NOT be a valid double
     #
@@ -1833,7 +1833,7 @@ proc MemStress {args} {
     set res {}
     foreach body $args {
         set end 0
-        for {set i 0} {$i < 5} {incr i} { 
+        for {set i 0} {$i < 5} {incr i} {
             proc MemStress_Body {} $body
             uplevel 1 MemStress_Body
             rename MemStress_Body {}
diff --git a/tests/stringObj.test b/tests/stringObj.test
index 8209142..49f268e 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -414,10 +414,10 @@ test stringObj-13.3 {Tcl_GetCharLength with byte-size chars} testobj {
     list [string length $a] [string length $a]
 } {6 6}
 test stringObj-13.4 {Tcl_GetCharLength with mixed width chars} testobj {
-    string length "\u00ae" 
+    string length "\u00ae"
 } 1
 test stringObj-13.5 {Tcl_GetCharLength with mixed width chars} testobj {
-    # string length "￮￮" 
+    # string length "￮￮"
     # Use \uXXXX notation below instead of hardcoding the values, otherwise
     # the test will fail in multibyte locales.
     string length "\u00EF\u00BF\u00AE\u00EF\u00BF\u00AE"
diff --git a/tests/subst.test b/tests/subst.test
index 2115772..1f3c22a 100644
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -91,29 +91,29 @@ test subst-5.4 {command substitutions} {
 } {1 {invalid command name "bogus_command"}}
 test subst-5.5 {command substitutions} {
     set a 0
-    list [catch {subst {[set a 1}} msg] $a $msg 
+    list [catch {subst {[set a 1}} msg] $a $msg
 } {1 0 {missing close-bracket}}
 test subst-5.6 {command substitutions} {
     set a 0
-    list [catch {subst {0[set a 1}} msg] $a $msg 
+    list [catch {subst {0[set a 1}} msg] $a $msg
 } {1 0 {missing close-bracket}}
 test subst-5.7 {command substitutions} {
     set a 0
-    list [catch {subst {0[set a 1; set a 2}} msg] $a $msg 
+    list [catch {subst {0[set a 1; set a 2}} msg] $a $msg
 } {1 1 {missing close-bracket}}
 
 # repeat the tests above simulating cmd line input
 test subst-5.8 {command substitutions} {
     set script {[subst {[set a 1}]}
-    list [catch {exec [info nameofexecutable] << $script} msg] $msg 
+    list [catch {exec [info nameofexecutable] << $script} msg] $msg
 } {1 {missing close-bracket}}
 test subst-5.9 {command substitutions} {
     set script {[subst {0[set a 1}]}
-    list [catch {exec [info nameofexecutable] << $script} msg] $msg 
+    list [catch {exec [info nameofexecutable] << $script} msg] $msg
 } {1 {missing close-bracket}}
 test subst-5.10 {command substitutions} {
     set script {[subst {0[set a 1; set a 2}]}
-    list [catch {exec [info nameofexecutable] << $script} msg] $msg 
+    list [catch {exec [info nameofexecutable] << $script} msg] $msg
 } {1 {missing close-bracket}}
 
 test subst-6.1 {clear the result after command substitution} -body {
@@ -166,7 +166,7 @@ test subst-8.6 {return in a subst} -returnCodes error -body {
     subst "foo \[return {x}; bogus code bar"
 } -result {missing close-bracket}
 test subst-8.7 {return in a subst, parse error} -body {
-    subst {foo [return {x} ; set a {}"" ; stuff] bar} 
+    subst {foo [return {x} ; set a {}"" ; stuff] bar}
 } -returnCodes error -result {extra characters after close-brace}
 test subst-8.8 {return in a subst, parse error} -body {
     subst {foo [return {x} ; set bar baz ; set a {}"" ; stuff] bar}
diff --git a/tests/tailcall.test b/tests/tailcall.test
index 26f3cbf..ce506a7 100644
--- a/tests/tailcall.test
+++ b/tests/tailcall.test
@@ -28,9 +28,9 @@ if {[testConstraint testnrelevels]} {
     namespace eval testnre {
 	#
 	# [testnrelevels] returns a 6-list with: C-stack depth, iPtr->numlevels,
-	# cmdFrame level, callFrame level, tosPtr and callback depth 
+	# cmdFrame level, callFrame level, tosPtr and callback depth
 	#
-	variable last [testnrelevels] 
+	variable last [testnrelevels]
 	proc depthDiff {} {
 	    variable last
 	    set depth [testnrelevels]
@@ -148,7 +148,7 @@ test tailcall-0.5 {tailcall is constant space} -constraints testnrelevels -setup
 } -result {0 0 0 0 0 0}
 
 test tailcall-0.5.1 {tailcall is constant space} -constraints testnrelevels -setup {
-    # 
+    #
     # This test is related to [bug d87cb182053fd79b3]: the fix to that bug was
     # to remove a call to TclSkipTailcall, which caused a violation of the
     # constant-space property of tailcall in that particular
@@ -245,7 +245,7 @@ test tailcall-1 {tailcall} -body {
     }
     variable x *::
     proc xset args {error ::xset}
-    list [::b::moo] | $x $a::x $b::x | $::b::y 
+    list [::b::moo] | $x $a::x $b::x | $::b::y
 } -cleanup {
     unset x
     rename xset {}
@@ -619,7 +619,7 @@ test tailcall-12.3a3 {[Bug 2695587]} -body {
     set x
 } -cleanup {
     unset x
-} -result {0 1} 
+} -result {0 1}
 
 test tailcall-12.3b0 {[Bug 2695587]} -body {
     apply {{} {
@@ -654,7 +654,7 @@ test tailcall-12.3b3 {[Bug 2695587]} -body {
     set x
 } -cleanup {
     unset x
-} -result {0 1} 
+} -result {0 1}
 
 # MORE VARIANTS MISSING: bc'ed caught script vs (bc'ed, not-bc'ed)
 # catch. Actually superfluous now, as tailcall just returns TCL_RETURN so that
diff --git a/tests/tm.test b/tests/tm.test
index 1b22f8c..a4dafe0 100644
--- a/tests/tm.test
+++ b/tests/tm.test
@@ -200,7 +200,7 @@ test tm-3.11 {tm: module path management, remove ignores unknown path} -setup {
 proc genpaths {base} {
     # Normalizing picks up drive letters on windows [Bug 1053568]
     set base [file normalize $base]
-    lassign [split [package present Tcl] .] major minor 
+    lassign [split [package present Tcl] .] major minor
     set results {}
     set base [file join $base tcl$major]
     lappend results [file join $base site-tcl]
diff --git a/tests/trace.test b/tests/trace.test
index d830f3c..1099f48 100644
--- a/tests/trace.test
+++ b/tests/trace.test
@@ -164,30 +164,30 @@ test trace-1.10 {trace variable reads} {
 } {}
 test trace-1.11 {read traces that modify the array structure} {
     unset -nocomplain x
-    set x(bar) 0 
-    trace variable x r {set x(foo) 1 ;#} 
-    trace variable x r {unset -nocomplain x(bar) ;#} 
+    set x(bar) 0
+    trace variable x r {set x(foo) 1 ;#}
+    trace variable x r {unset -nocomplain x(bar) ;#}
     array get x
 } {}
 test trace-1.12 {read traces that modify the array structure} {
     unset -nocomplain x
-    set x(bar) 0 
-    trace variable x r {unset -nocomplain x(bar) ;#} 
-    trace variable x r {set x(foo) 1 ;#} 
+    set x(bar) 0
+    trace variable x r {unset -nocomplain x(bar) ;#}
+    trace variable x r {set x(foo) 1 ;#}
     array get x
 } {}
 test trace-1.13 {read traces that modify the array structure} {
     unset -nocomplain x
-    set x(bar) 0 
-    trace variable x r {set x(foo) 1 ;#} 
-    trace variable x r {unset -nocomplain x;#} 
+    set x(bar) 0
+    trace variable x r {set x(foo) 1 ;#}
+    trace variable x r {unset -nocomplain x;#}
     list [catch {array get x} res] $res
 } {1 {can't read "x(bar)": no such variable}}
 test trace-1.14 {read traces that modify the array structure} {
     unset -nocomplain x
-    set x(bar) 0 
-    trace variable x r {unset -nocomplain x;#} 
-    trace variable x r {set x(foo) 1 ;#} 
+    set x(bar) 0
+    trace variable x r {unset -nocomplain x;#}
+    trace variable x r {set x(foo) 1 ;#}
     list [catch {array get x} res] $res
 } {1 {can't read "x(bar)": no such variable}}
 
@@ -419,7 +419,7 @@ test trace-5.8 {array traces fire for undefined variables} {
     trace add variable x array {set x(foo) 1 ;#}
     set res "names: [array names x]"
 } {names: foo}
-    
+
 # Trace multiple trace types at once.
 
 test trace-6.1 {multiple ops traced at once} {
@@ -767,7 +767,7 @@ test trace-13.1 {delete one trace from another} {
     trace add variable x read {traceTag 2}
     trace add variable x read {traceTag 3}
     trace add variable x read {traceTag 4}
-    trace add variable x read delTraces 
+    trace add variable x read delTraces
     trace add variable x read {traceTag 5}
     set x
     set info
@@ -872,7 +872,7 @@ test trace-14.5 {trace command, invalid option} {
 } [list 1 "bad option \"gorp\": must be add, info, remove, variable, vdelete, or vinfo"]
 
 # Again, [trace ... command] and [trace ... variable] share syntax and
-# error message styles for their opList options; these loops test those 
+# error message styles for their opList options; these loops test those
 # error messages.
 
 set i 0
@@ -2104,7 +2104,7 @@ foo foo 0 1 leave}
 test trace-28.2 {exec traces with 'error'} {
     set info {}
     set res {}
-    
+
     proc foo {} {
 	if {[catch {bar}]} {
 	    return "error"
@@ -2126,7 +2126,7 @@ test trace-28.2 {exec traces with 'error'} {
 
     trace remove execution foo {enter enterstep leave leavestep} \
       [list traceExecute foo]
-    
+
     list $res [join $info \n]
 } {{error error} {foo foo enter
 foo {if {[catch {bar}]} {
@@ -2152,7 +2152,7 @@ foo foo 0 error leave}}
 test trace-28.3 {exec traces with 'return -code error'} {
     set info {}
     set res {}
-    
+
     proc foo {} {
 	if {[catch {bar}]} {
 	    return "error"
@@ -2174,7 +2174,7 @@ test trace-28.3 {exec traces with 'return -code error'} {
 
     trace remove execution foo {enter enterstep leave leavestep} \
       [list traceExecute foo]
-    
+
     list $res [join $info \n]
 } {{error error} {foo foo enter
 foo {if {[catch {bar}]} {
@@ -2204,7 +2204,7 @@ test trace-28.4 {exec traces in slave with 'return -code error'} {
     set res [interp eval slave {
 	set info {}
 	set res {}
-	
+
 	proc foo {} {
 	    if {[catch {bar}]} {
 		return "error"
@@ -2212,21 +2212,21 @@ test trace-28.4 {exec traces in slave with 'return -code error'} {
 		return "ok"
 	    }
 	}
-	
+
 	proc bar {} { return -code error "msg" }
-	
+
 	lappend res [foo]
-	
+
 	trace add execution foo {enter enterstep leave leavestep} \
 	  [list traceExecute foo]
-	
+
 	# With the trace active
-	
+
 	lappend res [foo]
-	
+
 	trace remove execution foo {enter enterstep leave leavestep} \
 	  [list traceExecute foo]
-	
+
 	list $res
     }]
     interp delete slave
@@ -2610,7 +2610,7 @@ test trace-39 {bug #3484621: tracing Bc'ed commands} -setup {
     proc foo {} {
 	incr ::traceCalls
 	# choose a BC'ed command that is 'unlikely' to interfere with tcltest's
-	# internals 
+	# internals
 	lset ::bar 1 2
     }
 } -body {
@@ -2631,7 +2631,7 @@ test trace-39 {bug #3484621: tracing Bc'ed commands} -setup {
     rename dotrace {}
     rename foo {}
 } -result {3 | 0 1 1}
-    
+
 test trace-39.1 {bug #3485022: tracing Bc'ed commands} -setup {
     set ::traceLog 0
     set ::traceCalls 0
@@ -2668,7 +2668,7 @@ test trace-40.1 {execution trace errors become command errors} {
     catch foo m
     return -level 0 $m[unset m]
 } bar
-    
+
 # Delete procedures when done, so we don't clash with other tests
 # (e.g. foobar will clash with 'unknown' tests).
 catch {rename foobar {}}
diff --git a/tests/unixForkEvent.test b/tests/unixForkEvent.test
index 120f362..d7b86fd 100644
--- a/tests/unixForkEvent.test
+++ b/tests/unixForkEvent.test
@@ -37,7 +37,7 @@ test unixforkevent-1.1 {fork and test writeable event} \
 	viewFile result.txt $myFolder
     } \
     -result {writable} \
-    -cleanup { 
+    -cleanup {
 	catch { removeFolder $myFolder }
     }
 
diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test
index 2f03529..18b967f 100644
--- a/tests/unixNotfy.test
+++ b/tests/unixNotfy.test
@@ -34,7 +34,7 @@ test unixNotfy-1.1 {Tcl_DeleteFileHandler} -constraints {noTk unix unthreaded} -
     vwait x
     close $f
     list [catch {vwait x} msg] $msg
-} -result {1 {can't wait for variable "x": would wait forever}} -cleanup { 
+} -result {1 {can't wait for variable "x": would wait forever}} -cleanup {
     catch { close $f }
     catch { removeFile foo }
 }
@@ -90,7 +90,7 @@ test unixNotfy-2.2 {Tcl_DeleteFileHandler} \
 	set x
     } \
     -result {ok} \
-    -cleanup { 
+    -cleanup {
 	catch { close $f1 }
 	catch { close $f2 }
 	catch { removeFile foo }
diff --git a/tests/unknown.test b/tests/unknown.test
index e80d3a6..6c31c3d 100644
--- a/tests/unknown.test
+++ b/tests/unknown.test
@@ -58,7 +58,7 @@ test unknown-4.1 {errors in "unknown" procedure} {
 catch {rename unknown {}}
 catch {rename unknown.old unknown}
 cleanupTests
-return 
+return
 
 # Local Variables:
 # mode: tcl
diff --git a/tests/uplevel.test b/tests/uplevel.test
index 0410469..3f6b2a8 100644
--- a/tests/uplevel.test
+++ b/tests/uplevel.test
@@ -138,7 +138,7 @@ test uplevel-7.1 {var access, no LVT in either level} -setup {
     unset -nocomplain y z
 } -body {
     namespace eval foo {
-	set x 2 
+	set x 2
 	set y 2
 	uplevel 1 {
 	    set x 3
@@ -157,7 +157,7 @@ test uplevel-7.2 {var access, no LVT in upper level} -setup {
     unset -nocomplain y z
 } -body {
     proc foo {} {
-	set x 2 
+	set x 2
 	set y 2
 	uplevel 1 {
 	    set x 3
@@ -181,7 +181,7 @@ test uplevel-7.3 {var access, LVT in upper level} -setup {
     }
 } -body {
     proc foo {} {
-	set x 2 
+	set x 2
 	set y 2
 	uplevel 1 {
 	    set x 3
diff --git a/tests/upvar.test b/tests/upvar.test
index 5ea870d..476250c 100644
--- a/tests/upvar.test
+++ b/tests/upvar.test
@@ -477,7 +477,7 @@ test upvar-NS-1.4 {nsupvar links to correct variable} -body {
 } -returnCodes error -cleanup {
     namespace delete test_ns_1
 } -result {namespace "test_ns_0" not found in "::test_ns_1"}
-    
+
 test upvar-NS-1.5 {nsupvar links to correct variable} -body {
     namespace eval test_ns_1 {
 	namespace eval test_ns_0 {}
diff --git a/tests/util.test b/tests/util.test
index 7782f35..2ac11bf 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -208,7 +208,7 @@ test util-4.6 {Tcl_ConcatObj - utf-8 sequence with "whitespace" char} {
 } \xe0
 test util-4.7 {Tcl_ConcatObj - refCount safety} testconcatobj {
     # Check for Bug #1447328 (actually, bugs in its original "fix"). One of the
-    # symptoms was Bug #2055782. 
+    # symptoms was Bug #2055782.
     testconcatobj
 } {}
 
@@ -566,7 +566,7 @@ test util-9.1.3 {TclGetIntForIndex} {
 } k
 test util-9.2.0 {TclGetIntForIndex} {
     string index abcd end
-} d 
+} d
 test util-9.2.1 {TclGetIntForIndex} -body {
     string index abcd { end}
 } -returnCodes error -match glob -result *
@@ -4007,7 +4007,7 @@ test util-17.1 {bankers' rounding [Bug 3349507]} {ieeeFloatingPoint} {
     }
     set r
 } [list {*}{
-    0x43fffffffffffffc 0xc3fffffffffffffc 
+    0x43fffffffffffffc 0xc3fffffffffffffc
     0x43fffffffffffffc 0xc3fffffffffffffc
     0x43fffffffffffffd 0xc3fffffffffffffd
     0x43fffffffffffffe 0xc3fffffffffffffe
diff --git a/tests/var.test b/tests/var.test
index b6b09fd..6f90664 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -39,7 +39,7 @@ catch {unset arr}
 test var-1.1 {TclLookupVar, Array handling} -setup {
     catch {unset a}
 } -body {
-    set x "incr"  ;# force no compilation and runtime call to Tcl_IncrCmd 
+    set x "incr"  ;# force no compilation and runtime call to Tcl_IncrCmd
     set i 10
     set arr(foo) 37
     list [$x i] $i [$x arr(foo)] $arr(foo)
@@ -216,7 +216,7 @@ test var-3.3 {MakeUpvar, my var has TCL_GLOBAL_ONLY specified} -setup {
     set a 123321
     proc p {} {
 	# create global xx linked to global a
-	testupvar 1 a {} xx global 
+	testupvar 1 a {} xx global
     }
     list [p] $xx [set xx 789] $a
 } -result {{} 123321 789 789}
@@ -228,7 +228,7 @@ test var-3.4 {MakeUpvar, my var has TCL_NAMESPACE_ONLY specified} -setup {
 	catch {unset ::test_ns_var::vv}
 	proc p {} {
 	    # create namespace var vv linked to global a
-	    testupvar 1 a {} vv namespace 
+	    testupvar 1 a {} vv namespace
 	}
 	p
     }
@@ -516,11 +516,11 @@ test var-7.14 {Tcl_VariableObjCmd, array element parameter} -body {
     namespace eval test_ns_var { variable arrayvar(1) }
 } -returnCodes error -result "can't define \"arrayvar(1)\": name refers to an element in an array"
 test var-7.15 {Tcl_VariableObjCmd, array element parameter} -body {
-    namespace eval test_ns_var { 
+    namespace eval test_ns_var {
 	variable arrayvar
 	set arrayvar(1) x
 	variable arrayvar(1) y
-    }   
+    }
 } -returnCodes error -result "can't define \"arrayvar(1)\": name refers to an element in an array"
 test var-7.16 {Tcl_VariableObjCmd, no args (TIP 323)} {
     variable
@@ -742,7 +742,7 @@ test var-15.1 {segfault in [unset], [Bug 735335]} {
 	set var $name
     }
     #
-    # Note that the variable name has to be 
+    # Note that the variable name has to be
     # unused previously for the segfault to
     # be triggered.
     #
diff --git a/tests/winPipe.test b/tests/winPipe.test
index 9c6f94d..8128fe2 100644
--- a/tests/winPipe.test
+++ b/tests/winPipe.test
@@ -34,14 +34,14 @@ testConstraint testexcept   [llength [info commands testexcept]]
 
 set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n
 append big $big
-append big $big	
+append big $big
 append big $big
 append big $big
 append big $big
 append big $big
 
 set path(little) [makeFile {} little]
-set f [open $path(little) w] 
+set f [open $path(little) w]
 puts -nonewline $f "little"
 close $f
 
-- 
cgit v0.12