merge 8.7

1 files changed, 5 insertions, 10 deletions

diff --git a/tests/all.tcl b/tests/all.tcl
index ad372db..4fce323 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -13,19 +13,14 @@
 package prefer latest
 package require Tcl 8.5-
 package require tcltest 2.2
-namespace import tcltest::*
-configure {*}$argv -testdir [file dir [info script]]
+namespace import -force ::tcltest::*
+
+configure {*}$argv -testdir [file dirname [file dirname [file normalize [
+    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 {
-	if {$x eq $testsdir} continue
-	lindex $x
-    }
-}} $testsdir {*}$auto_path]
-
 runAllTests
 proc exit args {}