Merge 8.7

12 files changed, 113 insertions, 104 deletions

diff --git a/changes b/changes
index 8112306..ca2f7ee 100644
--- a/changes
+++ b/changes
@@ -9024,11 +9024,11 @@ in this changeset (new minor version) rather than bug fixes:
 
 2018-02-14 [TIP 476] Scan/Printf consistency (nijtmans)
 
-2018-03-05 [TIP 351] [lsearch] striding 
+2018-03-05 [TIP 351] [lsearch] striding
 
 2018-03-05 [TIPs 330,336] tighten access to Interp fields (porter)
 
-2018-03-12 [TIP 462] [::tcl::process] 
+2018-03-12 [TIP 462] [::tcl::process]
 
 2018-03-12 [TIP 490] add oo support for msgcat => msgcat 1.7.0 (oehlmann)
 
diff --git a/generic/tcl.h b/generic/tcl.h
index 9880d59..efc4572 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -1559,7 +1559,7 @@ typedef struct Tcl_Filesystem {
 				 * arbitrary additional data to files in a
 				 * filesystem. */
     Tcl_FSFileAttrsGetProc *fileAttrsGetProc;
-				/* Called by 'Tcl_FSFileAttrsGet()' and by 
+				/* Called by 'Tcl_FSFileAttrsGet()' and by
 				 * 'file attributes'. */
     Tcl_FSFileAttrsSetProc *fileAttrsSetProc;
 				/* Called by 'Tcl_FSFileAttrsSet()' and by
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index afba9aa..93c0250 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1659,7 +1659,7 @@ LoadEncodingFile(
  *	not be created because the file contained invalid data.
  *
  * Side effects:
- *	See Tcl_CreateEncoding(). 
+ *	See Tcl_CreateEncoding().
  *
  *-------------------------------------------------------------------------
  */
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 91b4ab3..b2f2dca 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -620,7 +620,7 @@ FsGetFirstFilesystem(void)
 }
 
 /*
- * The epoch can is changed when a filesystems is added or removed, when 
+ * The epoch can is changed when a filesystems is added or removed, when
  * "system encoding" changes, and when env(HOME) changes.
  */
 
@@ -959,7 +959,7 @@ Tcl_FSUnregister(
  *	Search in the given pathname for files matching the given pattern.
  *	Used by [glob].  Processes just one pattern for one directory.  Callers
  *	such as TclGlob and DoGlob implement manage the searching of multiple
- *	directories in cases such as  
+ *	directories in cases such as
  *		glob -dir $dir -join * pkgIndex.tcl
  *
  * Results:
@@ -1222,7 +1222,7 @@ FsAddMountsToGlobResult(
  *
  *	The reason for the exception in 2,3 for the native filesystem is that
  *	the native filesystem claims every file without determining whether
- *	whether the file exists, or even whether the pathname makes sense. 
+ *	whether the file exists, or even whether the pathname makes sense.
  *
  *----------------------------------------------------------------------
  */
@@ -1240,7 +1240,7 @@ Tcl_FSMountsChanged(
 
     /*
      * Increment the filesystem epoch to invalidate every existing cached
-     * internal representation. 
+     * internal representation.
      */
 
     Tcl_MutexLock(&filesystemMutex);
@@ -1475,7 +1475,7 @@ TclGetOpenModeEx(
     const char *modeString,	/* Mode string, e.g. "r+" or "RDONLY CREAT" */
     int *seekFlagPtr,		/* Sets this to 1 to tell the the caller to seek to
 				 * EOF after opening the file, and 0 otherwise. */
-    int *binaryPtr)		/* Sets this to 1 to tell the caller to 
+    int *binaryPtr)		/* Sets this to 1 to tell the caller to
 				 * configure the channel for binary
 				 * operations after opening the file. */
 {
@@ -1719,7 +1719,7 @@ Tcl_FSEvalFileEx(
     }
 
     /*
-     * The eof character is \32 (^Z). This is standard on Windows, and Tcl 
+     * The eof character is \32 (^Z). This is standard on Windows, and Tcl
      * uses it on every platform to allow for scripted documents. [Bug: 2040]
      */
 
@@ -1855,7 +1855,7 @@ TclNREvalFile(
     TclPkgFileSeen(interp, TclGetString(pathPtr));
 
     /*
-     * The eof character is \32 (^Z). This is standard on Windows, and Tcl 
+     * The eof character is \32 (^Z). This is standard on Windows, and Tcl
      * uses it on every platform to allow for scripted documents. [Bug: 2040]
      */
 
@@ -2065,7 +2065,7 @@ Tcl_PosixError(
  *----------------------------------------------------------------------
  *
  * Tcl_FSStat --
- *	Calls 'statProc' of the filesystem corresponding to pathPtr. 
+ *	Calls 'statProc' of the filesystem corresponding to pathPtr.
  *
  *	Replaces the standard library routines stat.
  *
@@ -2099,7 +2099,7 @@ Tcl_FSStat(
  *----------------------------------------------------------------------
  *
  * Tcl_FSLstat --
- *	Calls the 'lstatProc' of the filesystem corresponding to pathPtr. 
+ *	Calls the 'lstatProc' of the filesystem corresponding to pathPtr.
  *
  *	Replaces the library version of lstat.  If the filesystem doesn't
  *	provide lstatProc but does provide statProc, Tcl falls back to
@@ -2199,7 +2199,7 @@ Tcl_FSOpenFileChannel(
 
     if (Tcl_FSGetNormalizedPath(interp, pathPtr) == NULL) {
 	/*
-	 * Return the correct error message. 
+	 * Return the correct error message.
 	 */
 	return NULL;
     }
@@ -2651,7 +2651,7 @@ Tcl_FSGetCwd(
 		norm = TclFSNormalizeAbsolutePath(interp,retVal);
 		if (norm != NULL) {
 		    /*
-		     * Assign to global storage the pathname of the current directory 
+		     * Assign to global storage the pathname of the current directory
 		     * and copy it into thread-local storage as well.
 		     *
 		     * At system startup multiple threads could in principle
@@ -2954,7 +2954,7 @@ Tcl_FSChdir(
 		 */
 
 		FsUpdateCwd(normDirName, cd);
-	    } 
+	    }
 	} else {
 	    /*
 	     * Tcl_FSGetCwd() synchronizes the file-global cwdPathPtr if
@@ -3018,7 +3018,7 @@ Tcl_FSLoadFile(
 				/* Places to store pointers to the functions
 				 * named by sym1 and sym2. */
     Tcl_LoadHandle *handlePtr,	/* A place to store the token for the loaded
-				 * object.  Can be passed to 
+				 * object.  Can be passed to
 				 * (*unloadProcPtr)() to unload the file. */
     Tcl_FSUnloadFileProc **unloadProcPtr)
 				/* A place to store a pointer to the function
@@ -3050,7 +3050,7 @@ Tcl_FSLoadFile(
  *
  *	Load a dynamic shared object by calling 'loadFileProc' of the
  *	filesystem corresponding to the given pathname, and then finds within
- *	the loaded object the functions named in symbols[].  
+ *	the loaded object the functions named in symbols[].
  *
  *	The given pathname is passed unmodified to `loadFileProc`, which
  *	decides how to resolve it.  On POSIX systems the native filesystem
@@ -3195,7 +3195,7 @@ Tcl_LoadFile(
     }
 
     /*
-     * The filesystem doesn't support 'load'. Fall to the following: 
+     * The filesystem doesn't support 'load'. Fall to the following:
      */
 
     /*
@@ -3378,7 +3378,7 @@ Tcl_LoadFile(
 	/*
 	 * This is the filesystem for the temporary file the object was loaded
 	 * from.  A reference to copyToPtr is already stored in
-	 * tvdlPtr->divertedFile, so need need to increment the refCount again. 
+	 * tvdlPtr->divertedFile, so need need to increment the refCount again.
 	 */
 
 	tvdlPtr->divertedFilesystem = copyFsPtr;
@@ -3721,7 +3721,7 @@ TclFSUnloadTempFile(
 Tcl_Obj *
 Tcl_FSLink(
     Tcl_Obj *pathPtr,		/* Pathaname of file. */
-    Tcl_Obj *toPtr,		/* 
+    Tcl_Obj *toPtr,		/*
 				 * NULL or the pathname of a file to link to.
 				 */
     int linkAction)		/* Action to perform. */
@@ -3804,7 +3804,7 @@ Tcl_FSListVolumes(void)
  *
  * FsListMounts --
  *
- *	Lists the mounts mathing the given pattern in the given directory. 
+ *	Lists the mounts mathing the given pattern in the given directory.
  *
  * Results:
  *	A list, having a refCount of 0, of the matching mounts, or NULL if no
@@ -4209,7 +4209,7 @@ Tcl_FSCopyFile(
  * TclCrossFilesystemCopy --
  *
  *	Helper for Tcl_FSCopyFile and Tcl_FSLoadFile.  Copies a file from one
- *	filesystem to another, overwiting any file that already exists. 
+ *	filesystem to another, overwiting any file that already exists.
  *
  * Results:
  *	A standard Tcl return code.
@@ -4514,7 +4514,7 @@ Tcl_FSGetFileSystemForPath(
     /*
      * Call each of the "pathInFilesystem" functions in succession until the
      * corresponding filesystem is found.
-     */ 
+     */
     for (; fsRecPtr!=NULL ; fsRecPtr=fsRecPtr->nextPtr) {
 	ClientData clientData = NULL;
 
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index b8fc428..dd78362 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -47,7 +47,7 @@ static const Tcl_ObjType fsPathType = {
 /*
  * struct FsPath --
  *
- * Internal representation of a Tcl_Obj of fsPathType 
+ * Internal representation of a Tcl_Obj of fsPathType
  */
 
 typedef struct {
@@ -124,7 +124,7 @@ typedef struct {
  *	None (beyond the memory allocation for the result).
  *
  * Special note:
- *	Originally based on code from Matt Newman and Jean-Claude Wippler. 
+ *	Originally based on code from Matt Newman and Jean-Claude Wippler.
  *	Totally rewritten later by Vince Darley to handle symbolic links.
  *
  *---------------------------------------------------------------------------
@@ -2028,7 +2028,7 @@ Tcl_FSGetInternalRep(
  *
  * TclFSEnsureEpochOk --
  *
- *	Ensure that the path is a valid path, and that it has a 
+ *	Ensure that the path is a valid path, and that it has a
  *	fsPathType internal representation that is not stale.
  *
  * Results:
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 6f9515b..cef3d49 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -935,7 +935,7 @@ Tcl_ScanObjCmd(
 			Tcl_SetErrorCode(interp, "TCL", "MEMORY", NULL);
 			return TCL_ERROR;
 		    } else {
-			mp_set_ull(&big, (Tcl_WideUInt)wideValue);    
+			mp_set_ull(&big, (Tcl_WideUInt)wideValue);
 			Tcl_SetBignumObj(objPtr, &big);
 		    }
 		} else {
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl
index ca93725..4aa3970 100644
--- a/library/tcltest/pkgIndex.tcl
+++ b/library/tcltest/pkgIndex.tcl
@@ -9,4 +9,4 @@
 # full path name of this file's directory.
 
 if {![package vsatisfies [package provide Tcl] 8.5-]} {return}
-package ifneeded tcltest 2.5.1 [list source [file join $dir tcltest.tcl]]
+package ifneeded tcltest 2.5.2 [list source [file join $dir tcltest.tcl]]
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 820e978..4171965 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -22,7 +22,7 @@ namespace eval tcltest {
     # When the version number changes, be sure to update the pkgIndex.tcl file,
     # and the install directory in the Makefiles.  When the minor version
     # changes (new feature) be sure to update the man page as well.
-    variable Version 2.5.1
+    variable Version 2.5.2
 
     # Compatibility support for dumb variables defined in tcltest 1
     # Do not use these.  Call [package provide Tcl] and [info patchlevel]
@@ -2358,12 +2358,21 @@ proc tcltest::RunTest {name script} {
 	memory tag $name
     }
 
-    set code [catch {uplevel 1 $script} actualAnswer]
+    set code [catch {uplevel 1 [list [
+	namespace origin EvalTest] $script]} actualAnswer copts]
 
     return [list $actualAnswer $code]
 }
 
 
+proc tcltest::EvalTest script {
+    set code [catch {uplevel 1 $script} cres copts]
+    dict set copts -code $code
+    dict incr copts -level
+    return -options $copts $cres
+}
+
+
 
 # SetupTest --
 #
diff --git a/tests/info.test b/tests/info.test
index ce51523..1f3584c 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -735,28 +735,28 @@ proc etrace {} {
 
 test info-22.0 {info frame, levels} {!singleTestInterp} {
     info frame
-} 7
+} 9
 test info-22.1 {info frame, bad level relative} {!singleTestInterp} {
     # catch is another level!, i.e. we have 8, not 7
-    catch {info frame -8} msg
+    catch {info frame -10} msg
     set msg
-} {bad level "-8"}
+} {bad level "-10"}
 test info-22.2 {info frame, bad level absolute} {!singleTestInterp} {
     # catch is another level!, i.e. we have 8, not 7
-    catch {info frame 9} msg
+    catch {info frame 11} msg
     set msg
-} {bad level "9"}
+} {bad level "11"}
 test info-22.3 {info frame, current, relative} -match glob -body {
     info frame 0
-} -result {type source line 750 file */info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type source line 750 file */info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-22.4 {info frame, current, relative, nested} -match glob -body {
     set res [info frame 0]
-} -result {type source line 753 file */info.test cmd {info frame 0} proc ::tcltest::RunTest} -cleanup {unset res}
+} -result {type source line 753 file */info.test cmd {info frame 0} proc ::tcltest::EvalTest} -cleanup {unset res}
 test info-22.5 {info frame, current, absolute} -constraints {!singleTestInterp} -match glob -body {
-    reduce [info frame 7]
-} -result {type source line 756 file info.test cmd {info frame 7} proc ::tcltest::RunTest}
+    reduce [info frame 9]
+} -result {type source line 756 file info.test cmd {info frame 9} proc ::tcltest::EvalTest}
 test info-22.6 {info frame, global, relative} {!singleTestInterp} {
-    reduce [info frame -6]
+    reduce [info frame -8]
 } {type source line 758 file info.test cmd test\ info-22.6\ \{info\ frame,\ global,\ relative\}\ \{!singleTestInter level 0}
 test info-22.7 {info frame, global, absolute} {!singleTestInterp} {
     reduce [info frame 1]
@@ -764,8 +764,8 @@ test info-22.7 {info frame, global, absolute} {!singleTestInterp} {
 test info-22.8 {info frame, basic trace} -match glob -body {
     join [lrange [etrace] 0 2] \n
 } -result {* {type source line 730 file info.test cmd {info frame $level} proc ::etrace level 0}
-* {type source line 765 file info.test cmd etrace proc ::tcltest::RunTest}
-* {type source line * file tcltest* cmd {uplevel 1 $script} proc ::tcltest::RunTest}}
+* {type source line 765 file info.test cmd etrace proc ::tcltest::EvalTest}
+* {type source line * file tcltest* cmd {uplevel 1 $script} proc ::tcltest::EvalTest}}
 unset -nocomplain msg
 
 
@@ -792,20 +792,20 @@ test info-23.3 {eval'd info frame, literal} -match glob -body {
     eval {
 	info frame 0
     }
-} -result {type source line 793 file * cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type source line 793 file * cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-23.4 {eval'd info frame, semi-dynamic} {
     eval info frame 0
-} {type eval line 1 cmd {info frame 0} proc ::tcltest::RunTest}
+} {type eval line 1 cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-23.5 {eval'd info frame, dynamic} -cleanup {unset script} -body {
     set script {info frame 0}
     eval $script
-} -result {type eval line 1 cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type eval line 1 cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-23.6 {eval'd info frame, trace} -match glob -cleanup {unset script} -body {
     set script {etrace}
     join [lrange [eval $script] 0 2] \n
 } -result {* {type source line 730 file info.test cmd {info frame $level} proc ::etrace level 0}
-* {type eval line 1 cmd etrace proc ::tcltest::RunTest}
-* {type source line 805 file info.test cmd {eval $script} proc ::tcltest::RunTest}}
+* {type eval line 1 cmd etrace proc ::tcltest::EvalTest}
+* {type source line 805 file info.test cmd {eval $script} proc ::tcltest::EvalTest}}
 
 # -------------------------------------------------------------------------
 
@@ -1024,7 +1024,7 @@ test info-30.0 {bs+nl in literal words} -cleanup {unset res} -body {
     # offsets of all bs+nl sequences in literal words, then using the
     # information in the bcc and other places to bump line numbers when
     # parsing over the location. Also affected: testcases 22.8 and 23.6.
-} -result {type source line 1018 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type source line 1018 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 # -------------------------------------------------------------------------
 # See 24.0 - 24.5 for similar situations, using literal scripts.
@@ -1042,36 +1042,36 @@ test info-31.0 {ns eval, script in variable} -body {namespace eval foo {variable
 test info-31.1 {if, script in variable} -cleanup {unset res a flag} -body {
     if 1 $body
     return $res
-} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-31.1a {if, script in variable} -cleanup {unset res a flag} -body {
     if 1 then $body
     return $res
-} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-31.2 {while, script in variable} -cleanup {unset flag res a} -body {
     set flag 1
     while {$flag} $body
     return $res
-} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::EvalTest}
 
 # .3 - proc - scoping prevent return of result ...
 
 test info-31.4 {foreach, script in variable} -cleanup {unset var res a flag} -body {
     foreach var val $body
     set res
-} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-31.5 {for, script in variable} -cleanup {unset flag res a} -body {
     set flag 1
     for {} {$flag} {} $body
     return $res
-} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-31.6 {eval, script in variable} -cleanup {unset res a flag} -body {
     eval $body
     return $res
-} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type eval line 3 cmd {info frame 0} proc ::tcltest::EvalTest}
 
 # -------------------------------------------------------------------------
 
@@ -1319,8 +1319,8 @@ test info-37.0 {eval pure list, single line} -match glob -body {
     eval $cmd
     return $res
 } -result {* {type source line 730 file info.test cmd {info frame $level} proc ::etrace level 0}
-* {type eval line 2 cmd etrace proc ::tcltest::RunTest}
-* {type eval line 1 cmd foreac proc ::tcltest::RunTest}} -cleanup {unset foo cmd res b c}
+* {type eval line 2 cmd etrace proc ::tcltest::EvalTest}
+* {type eval line 1 cmd foreac proc ::tcltest::EvalTest}} -cleanup {unset foo cmd res b c}
 
 # -------------------------------------------------------------------------
 
@@ -1360,8 +1360,8 @@ test info-38.1 {location information for uplevel, dv, direct-var} -match glob -b
     }
     join [lrange [uplevel \#0 $script] 0 2] \n
 } -result {* {type source line 730 file info.test cmd {info frame $level} proc ::etrace level 0}
-* {type eval line 3 cmd etrace proc ::tcltest::RunTest}
-* {type source line 1361 file info.test cmd {uplevel \\#0 $script} proc ::tcltest::RunTest}} -cleanup {unset script y}
+* {type eval line 3 cmd etrace proc ::tcltest::EvalTest}
+* {type source line 1361 file info.test cmd {uplevel \\#0 $script} proc ::tcltest::EvalTest}} -cleanup {unset script y}
 
 # 38.2 moved to bottom to not disturb other tests with the necessary changes to this one.
 
@@ -1381,7 +1381,7 @@ test info-38.3 {location information for uplevel, dpv, direct-proc-var} -match g
 } -result {* {type source line 730 file info.test cmd {info frame $level} proc ::etrace level 0}
 * {type eval line 3 cmd etrace proc ::control}
 * {type source line 1338 file info.test cmd {uplevel 1 $script} proc ::control}
-* {type source line 1380 file info.test cmd {control y $script} proc ::tcltest::RunTest}} -cleanup {unset script y}
+* {type source line 1380 file info.test cmd {control y $script} proc ::tcltest::EvalTest}} -cleanup {unset script y}
 
 # 38.4 moved to bottom to not disturb other tests with the necessary changes to this one.
 
@@ -1399,7 +1399,7 @@ test info-38.5 {location information for uplevel, ppv, proc-proc-var} -match glo
 * {type eval line 3 cmd etrace proc ::control}
 * {type source line 1338 file info.test cmd {uplevel 1 $script} proc ::control}
 * {type source line 1353 file info.test cmd {control y $script} proc ::datav level 1}
-* {type source line 1397 file info.test cmd datav proc ::tcltest::RunTest}}
+* {type source line 1397 file info.test cmd datav proc ::tcltest::EvalTest}}
 
 # 38.6 moved to bottom to not disturb other tests with the necessary changes to this one.
 
@@ -1413,9 +1413,9 @@ testConstraint testevalex [llength [info commands testevalex]]
 test info-38.7 {location information for arg substitution} -constraints testevalex -match glob -body {
     join [lrange [testevalex {return -level 0 [etrace]}] 0 3] \n
 } -result {* {type source line 730 file info.test cmd {info frame \$level} proc ::etrace level 0}
-* {type eval line 1 cmd etrace proc ::tcltest::RunTest}
-* {type source line 1414 file info.test cmd {testevalex {return -level 0 \[etrace]}} proc ::tcltest::RunTest}
-* {type source line * file tcltest* cmd {uplevel 1 $script} proc ::tcltest::RunTest}}
+* {type eval line 1 cmd etrace proc ::tcltest::EvalTest}
+* {type source line 1414 file info.test cmd {testevalex {return -level 0 \[etrace]}} proc ::tcltest::EvalTest}
+* {type source line * file tcltest* cmd {uplevel 1 $script} proc ::tcltest::EvalTest}}
 
 # -------------------------------------------------------------------------
 # literal sharing
@@ -1463,7 +1463,7 @@ test info-30.3 {bs+nl in literal words, namespace multi-word script} {
     namespace eval xxx variable res \
 	[list [reduce [info frame 0]]];# line 1464
     return $xxx::res
-} {type source line 1464 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1464 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.4 {bs+nl in literal words, eval script} -cleanup {unset res} -body {
     eval {
@@ -1471,7 +1471,7 @@ test info-30.4 {bs+nl in literal words, eval script} -cleanup {unset res} -body
 	    [reduce [info frame 0]];# line 1471
     }
     return $res
-} -result {type source line 1471 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type source line 1471 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.5 {bs+nl in literal words, eval script, with nested words} -body {
     eval {
@@ -1482,12 +1482,12 @@ test info-30.5 {bs+nl in literal words, eval script, with nested words} -body {
 	    }
     }
     return $res
-} -cleanup {unset res} -result {type source line 1481 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result {type source line 1481 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.6 {bs+nl in computed word} -cleanup {unset res} -body {
     set res "\
 [reduce [info frame 0]]";# line 1489
-} -result { type source line 1489 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result { type source line 1489 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.7 {bs+nl in computed word, in proc} -body {
     proc abra {} {
@@ -1505,7 +1505,7 @@ test info-30.8 {bs+nl in computed word, nested eval} -body {
 	    res "\
 [reduce [info frame 0]]";# line 1506
 }
-} -cleanup {unset res} -result { type source line 1506 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result { type source line 1506 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.9 {bs+nl in computed word, nested eval} -body {
     eval {
@@ -1514,7 +1514,7 @@ test info-30.9 {bs+nl in computed word, nested eval} -body {
 [reduce \
      [info frame 0]]";# line 1515
 }
-} -cleanup {unset res} -result { type source line 1515 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result { type source line 1515 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.10 {bs+nl in computed word, key to array} -body {
     set tmp([set \
@@ -1523,14 +1523,14 @@ test info-30.10 {bs+nl in computed word, key to array} -body {
      [info frame 0]]"]) x ; #1523
     unset tmp
     set res
-} -cleanup {unset res} -result { type source line 1523 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result { type source line 1523 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.11 {bs+nl in subst arguments} -body {
     subst {[set \
 	    res "\
 [reduce \
      [info frame 0]]"]} ; #1532
-} -cleanup {unset res} -result { type source line 1532 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res} -result { type source line 1532 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.12 {bs+nl in computed word, nested eval} -body {
     eval {
@@ -1540,7 +1540,7 @@ test info-30.12 {bs+nl in computed word, nested eval} -body {
 [reduce \
      [info frame 0]]";# line 1541
 }
-} -cleanup {unset res x} -result {   type source line 1541 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset res x} -result {   type source line 1541 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.13 {bs+nl in literal words, uplevel script, with nested words} -body {
     subinterp ; set res [interp eval sub { uplevel #0 {
@@ -1601,7 +1601,7 @@ test info-30.17 {bs+nl in multi-body switch, direct} {
 	^key     { reduce [info frame 0] ;# 1601 } \
         \t###    { } \
         {[0-9]*} { }
-} {type source line 1601 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1601 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.18 {bs+nl, literal word, uplevel through proc, appended, loss of primary tracking data} {
     proc abra {script} {
@@ -1644,7 +1644,7 @@ test info-30.20 {bs+nl in single-body switch, direct} {
 	\t###    { }
         {[0-9]*} { }
     }
-} {type source line 1643 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1643 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 
 test info-30.21 {bs+nl in if, full compiled} {
     proc a {value} {
@@ -1710,71 +1710,71 @@ type source line 1700 file info.test cmd {info frame 0} proc ::a level 0}
 
 test info-30.25 {TIP 280 for compiled [subst]} {
     subst {[reduce [info frame 0]]} ; # 1712
-} {type source line 1712 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1712 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.26 {TIP 280 for compiled [subst]} {
     subst \
 	    {[reduce [info frame 0]]} ; # 1716
-} {type source line 1716 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1716 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.27 {TIP 280 for compiled [subst]} {
     subst {
 [reduce [info frame 0]]} ; # 1720
 } {
-type source line 1720 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+type source line 1720 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.28 {TIP 280 for compiled [subst]} {
     subst {\
 [reduce [info frame 0]]} ; # 1725
-} { type source line 1725 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} { type source line 1725 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.29 {TIP 280 for compiled [subst]} {
     subst {foo\
 [reduce [info frame 0]]} ; # 1729
-} {foo type source line 1729 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {foo type source line 1729 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.30 {TIP 280 for compiled [subst]} {
     subst {foo
 [reduce [info frame 0]]} ; # 1733
 } {foo
-type source line 1733 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+type source line 1733 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.31 {TIP 280 for compiled [subst]} {
     subst {[][reduce [info frame 0]]} ; # 1737
-} {type source line 1737 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1737 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.32 {TIP 280 for compiled [subst]} {
     subst {[\
 ][reduce [info frame 0]]} ; # 1741
-} {type source line 1741 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1741 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.33 {TIP 280 for compiled [subst]} {
     subst {[
 ][reduce [info frame 0]]} ; # 1745
-} {type source line 1745 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1745 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.34 {TIP 280 for compiled [subst]} {
     subst {[format %s {}
 ][reduce [info frame 0]]} ; # 1749
-} {type source line 1749 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1749 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.35 {TIP 280 for compiled [subst]} {
     subst {[format %s {}
 ]
 [reduce [info frame 0]]} ; # 1754
 } {
-type source line 1754 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+type source line 1754 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.36 {TIP 280 for compiled [subst]} {
     subst {
 [format %s {}][reduce [info frame 0]]} ; # 1759
 } {
-type source line 1759 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+type source line 1759 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.37 {TIP 280 for compiled [subst]} {
     subst {
 [format %s {}]
 [reduce [info frame 0]]} ; # 1765
 } {
 
-type source line 1765 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+type source line 1765 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.38 {TIP 280 for compiled [subst]} {
     subst {\
 [format %s {}][reduce [info frame 0]]} ; # 1771
-} { type source line 1771 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} { type source line 1771 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.39 {TIP 280 for compiled [subst]} {
     subst {\
 [format %s {}]\
 [reduce [info frame 0]]} ; # 1776
-} {  type source line 1776 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {  type source line 1776 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.40 {TIP 280 for compiled [subst]} -setup {
     unset -nocomplain empty
 } -body {
@@ -1782,7 +1782,7 @@ test info-30.40 {TIP 280 for compiled [subst]} -setup {
     subst {$empty[reduce [info frame 0]]} ; # 1782
 } -cleanup {
     unset empty
-} -result {type source line 1782 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result {type source line 1782 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.41 {TIP 280 for compiled [subst]} -setup {
     unset -nocomplain empty
 } -body {
@@ -1792,7 +1792,7 @@ test info-30.41 {TIP 280 for compiled [subst]} -setup {
 } -cleanup {
     unset empty
 } -result {
-type source line 1791 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+type source line 1791 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.42 {TIP 280 for compiled [subst]} -setup {
     unset -nocomplain empty
 } -body {
@@ -1800,25 +1800,25 @@ test info-30.42 {TIP 280 for compiled [subst]} -setup {
 [reduce [info frame 0]]} ; # 1800
 } -cleanup {
     unset empty
-} -result { type source line 1800 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -result { type source line 1800 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.43 {TIP 280 for compiled [subst]} -body {
     unset -nocomplain a\nb
     set a\nb {}
     subst {${a
 b}[reduce [info frame 0]]} ; # 1808
-} -cleanup {unset a\nb} -result {type source line 1808 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} -cleanup {unset a\nb} -result {type source line 1808 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.44 {TIP 280 for compiled [subst]} {
     unset -nocomplain a
     set a(\n) {}
     subst {$a(
 )[reduce [info frame 0]]} ; # 1814
-} {type source line 1814 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1814 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.45 {TIP 280 for compiled [subst]} {
     unset -nocomplain a
     set a() {}
     subst {$a([
 return -level 0])[reduce [info frame 0]]} ; # 1820
-} {type source line 1820 file info.test cmd {info frame 0} proc ::tcltest::RunTest}
+} {type source line 1820 file info.test cmd {info frame 0} proc ::tcltest::EvalTest}
 test info-30.46 {TIP 280 for compiled [subst]} {
     unset -nocomplain a
     set a(1825) YES;  set a(1824) 1824; set a(1826) 1826
@@ -1835,7 +1835,7 @@ unset -nocomplain a
 test info-30.48 {Bug 2850901} testevalex {
     testevalex {return -level 0 [format %s {}
 ][reduce [info frame 0]]} ; # line 2 of the eval
-} {type eval line 2 cmd {info frame 0} proc ::tcltest::RunTest}
+} {type eval line 2 cmd {info frame 0} proc ::tcltest::EvalTest}
 
 
 # -------------------------------------------------------------------------
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 5b158b5..d000a5b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1042,9 +1042,9 @@ install-libraries: libraries
 	@echo "Installing package msgcat 1.7.0 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
 		"$(MODULE_INSTALL_DIR)"/tcl9/9.0/msgcat-1.7.0.tm
-	@echo "Installing package tcltest 2.5.1 as a Tcl Module"
+	@echo "Installing package tcltest 2.5.2 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
-		"$(MODULE_INSTALL_DIR)"/tcl9/9.0/tcltest-2.5.1.tm
+		"$(MODULE_INSTALL_DIR)"/tcl9/9.0/tcltest-2.5.2.tm
 	@echo "Installing package platform 1.0.14 as a Tcl Module"
 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
 		"$(MODULE_INSTALL_DIR)"/tcl9/9.0/platform-1.0.14.tm
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 2cc6721..b32a2a2 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -2040,7 +2040,7 @@ TclpObjNormalizePath(
     }
 
     /*
-     * Call 'realpath' to obtain a canonical path. 
+     * Call 'realpath' to obtain a canonical path.
      */
 
 #ifndef NO_REALPATH
@@ -2050,7 +2050,7 @@ TclpObjNormalizePath(
 	     * The path contains at most one component, e.g. '/foo' or '/', so
 	     * so there is nothing to resolve. Also, on some platforms
 	     * 'Realpath' transforms an empty string into the normalized pwd,
-	     * which is the wrong answer. 
+	     * which is the wrong answer.
 	     */
 
 	    return 0;
@@ -2096,7 +2096,7 @@ TclpObjNormalizePath(
 
 	    if (path[nextCheckpoint] != '\0') {
 		/*
-		 * Append the remaining path components. 
+		 * Append the remaining path components.
 		 */
 
 		int normLen = Tcl_DStringLength(&ds);
diff --git a/win/Makefile.in b/win/Makefile.in
index 92e93fa..b9d3765 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -877,8 +877,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    done;
 	@echo "Installing package msgcat 1.7.0 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl9/9.0/msgcat-1.7.0.tm;
-	@echo "Installing package tcltest 2.5.1 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl9/9.0/tcltest-2.5.1.tm;
+	@echo "Installing package tcltest 2.5.2 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl9/9.0/tcltest-2.5.2.tm;
 	@echo "Installing package platform 1.0.14 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl9/9.0/platform-1.0.14.tm;
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";