* library/tcltest/tcltest.tcl: Corrected [puts -nonewline] within

        test bodies.  Thanks to Harald Kirsch.  [Bug 612786, Patch 612788]
        * library/tcltest/pkgIndex.tcl: Bump to version 2.2.1.

3 files changed, 13 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 35758f6..4ce356b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-22  Don Porter  <dgp@users.sourceforge.net>
+
+	* library/tcltest/tcltest.tcl:  Corrected [puts -nonewline] within
+	test bodies.  Thanks to Harald Kirsch.  [Bug 612786, Patch 612788]
+	* library/tcltest/pkgIndex.tcl: Bump to version 2.2.1.
+
 2002-09-15  Mo DeJong  <mdejong@users.sourceforge.net>
 
 	* unix/configure: Regen.
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl
index b77e989..af5a397 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.3]} {return}
-package ifneeded tcltest 2.2 [list source [file join $dir tcltest.tcl]]
+package ifneeded tcltest 2.2.1 [list source [file join $dir tcltest.tcl]]
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 6bd2a5b..400e50d 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -16,14 +16,14 @@
 # Contributions from Don Porter, NIST, 2002.  (not subject to US copyright)
 # All rights reserved.
 #
-# RCS: @(#) $Id: tcltest.tcl,v 1.73 2002/08/20 15:33:33 dgp Exp $
+# RCS: @(#) $Id: tcltest.tcl,v 1.74 2002/09/22 17:55:38 dgp Exp $
 
 package require Tcl 8.3		;# uses [glob -directory]
 namespace eval tcltest {
 
     # When the version number changes, be sure to update the pkgIndex.tcl file,
     # and the install directory in the Makefiles.
-    variable Version 2.2
+    variable Version 2.2.1
 
     # Compatibility support for dumb variables defined in tcltest 1
     # Do not use these.  Call [package provide Tcl] and [info patchlevel]
@@ -1474,6 +1474,7 @@ proc tcltest::Replace::puts {args} {
 		# return [Puts -nonewline [lindex $args end]]
 	    } else {
 		set channel [lindex $args 0]
+		set newline \n
 	    }
 	}
 	3 {
@@ -1481,6 +1482,7 @@ proc tcltest::Replace::puts {args} {
 		# Both -nonewline and channelId are specified, unless
 		# it's an error.  -nonewline is supposed to be argv[0].
 		set channel [lindex $args 1]
+		set newline ""
 	    }
 	}
     }
@@ -1488,11 +1490,11 @@ proc tcltest::Replace::puts {args} {
     if {[info exists channel]} {
 	if {[string equal $channel [[namespace parent]::outputChannel]]
 		|| [string equal $channel stdout]} {
-	    append outData [lindex $args end]\n
+	    append outData [lindex $args end]$newline
 	    return
 	} elseif {[string equal $channel [[namespace parent]::errorChannel]]
 		|| [string equal $channel stderr]} {
-	    append errData [lindex $args end]\n
+	    append errData [lindex $args end]$newline
 	    return
 	}
     }