Backport tcltest 2.3.3 for release with Tcl 8.5.*

2 files changed, 16 insertions, 20 deletions

diff --git a/tests/init.test b/tests/init.test
index 7bdbd82..aaa4c4f 100644
--- a/tests/init.test
+++ b/tests/init.test
@@ -53,21 +53,18 @@ test init-1.7 {auto_qualify - multiples colons 1} {
 test init-1.8 {auto_qualify - multiple colons 2} {
     auto_qualify :::foo ::bar
 } foo
-
+
 
 # we use a sub interp and auto_reset and double the tests because there is 2
 # places where auto_loading occur (before loading the indexes files and after)
 
 set testInterp [interp create]
-interp eval $testInterp [list set argv $argv]
-interp eval $testInterp [list package require tcltest]
-interp eval $testInterp [list namespace import -force ::tcltest::*]
-
+tcltest::loadIntoSlaveInterpreter $testInterp {*}$argv
 interp eval $testInterp {
-
-auto_reset
-catch {rename parray {}}
-
+    namespace import -force ::tcltest::*
+    auto_reset
+    catch {rename parray {}}
+
 test init-2.0 {load parray - stage 1} {
     set ret [catch {parray} error]
     rename parray {} ; # remove it, for the next test - that should not fail.
@@ -148,12 +145,12 @@ test init-3.0 {random stuff in the auto_index, should still work} {
 
 set count 0
 foreach arg [subst -nocommands -novariables {
-		c
-                {argument
+    c
+    {argument
                 which spans
                 multiple lines}
-                {argument which is all on one line but which is of such great length that the Tcl C library will truncate it when appending it onto the global error stack}
-                {argument which spans multiple lines
+    {argument which is all on one line but which is of such great length that the Tcl C library will truncate it when appending it onto the global error stack}
+    {argument which spans multiple lines
                 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}
@@ -162,13 +159,13 @@ foreach arg [subst -nocommands -novariables {
 		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
 "}
-		{argument that contains non-ASCII character, \u20ac, and which is of such great length that it will be longer than 150 bytes so it will be truncated by the Tcl C library}
-	}] {
+    {argument that contains non-ASCII character, \u20ac, and which is of such great length that it will be longer than 150 bytes so it will be truncated by the Tcl C library}
+	}] {    ;# emacs needs -> "
 
     test init-4.$count.0 {::errorInfo produced by [unknown]} {
 	auto_reset
diff --git a/tests/pkg.test b/tests/pkg.test
index 7d818d4..62075f3 100644
--- a/tests/pkg.test
+++ b/tests/pkg.test
@@ -19,11 +19,10 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 # Do all this in a slave interp to avoid garbaging the
 # package list
 set i [interp create]
-interp eval $i [list set argv $argv]
-interp eval $i [list package require tcltest 2]
-interp eval $i [list namespace import -force ::tcltest::*]
-interp eval $i {
+tcltest::loadIntoSlaveInterpreter $i {*}$argv
 
+interp eval $i {
+namespace import -force ::tcltest::*
 package forget {*}[package names]
 set oldPkgUnknown [package unknown]
 package unknown {}