tcltest-12.3-4 needed to have ::tcltest::loadScript set to empty in their -setup

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f79d516..bc6a328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-10  David Gravereaux <davyrgvy@pobox.com>
+
+	* tests/tcltest.test: tcltest-12.3-4 needed to have
+	::tcltest::loadScript set to empty in their -setup
+
 2004-09-10  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* generic/tclObj.c (SetIntOrWideFromAny): Rewritten integral value
diff --git a/tests/tcltest.test b/tests/tcltest.test
index 9d0aa82..6e2ba7b 100755
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -6,7 +6,7 @@
 # Copyright (c) 2000 by Ajuba Solutions
 # All rights reserved.
 #
-# RCS: @(#) $Id: tcltest.test,v 1.44 2004/06/23 15:36:58 dkf Exp $
+# RCS: @(#) $Id: tcltest.test,v 1.45 2004/09/11 00:39:47 davygrvy Exp $
 
 # Note that there are several places where the value of 
 # tcltest::currentFailure is stored/reset in the -setup/-cleanup
@@ -822,6 +822,7 @@ test tcltest-12.2 {-loadfile load.tcl} {unixOrPc} {
 test tcltest-12.3 {loadScript} {
     -setup {
 	set old $::tcltest::loadScript
+	set ::tcltest::loadScript {}
     }
     -body {
 	set f1 [loadScript]
@@ -838,6 +839,7 @@ test tcltest-12.3 {loadScript} {
 test tcltest-12.4 {loadFile} {
     -setup {
 	set olds $::tcltest::loadScript
+	set ::tcltest::loadScript {}
 	set oldf $::tcltest::loadFile
 	set ::tcltest::loadFile {}
     }