1 files changed, 14 insertions, 9 deletions
diff --git a/tests/all.tcl b/tests/all.tcl
index ad372db..d6434fb 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -14,18 +14,23 @@ package prefer latest
 package require Tcl 8.5-
 package require tcltest 2.2
 namespace import tcltest::*
-configure {*}$argv -testdir [file dir [info script]]
-if {[singleProcess]} {
-    interp debug {} -frame 1
-}
 
-set testsdir [file dirname [file dirname [file normalize [info script]/...]]]
-lappend auto_path $testsdir {*}[apply {{testsdir args} {
-    lmap x $args {
+apply {args {
+    global auto_path
+    set testsdir [file dirname [file dirname [file normalize [
+	info script]/...]]]
+
+    configure {*}$args -testdir $testsdir
+
+    if {[singleProcess]} {
+	interp debug {} -frame 1
+    }
+
+    set auto_path [lmap x $auto_path[set auto_path {}] {
 	if {$x eq $testsdir} continue
 	lindex $x
-    }
-}} $testsdir {*}$auto_path]
+    }]
+}} {*}$argv
 
 runAllTests
 proc exit args {}