Avoid error in tcltest.tcl if $::argv0 is unset

Can happen if running interactively or via -e

Reported-by: Stuart Cassoff <stwo@bell.net>
Signed-off-by: Steve Bennett <steveb@workware.net.au>

3 files changed, 9 insertions, 6 deletions

diff --git a/tcltest.tcl b/tcltest.tcl
index 408d803..d338b2a 100644
--- a/tcltest.tcl
+++ b/tcltest.tcl
@@ -9,9 +9,6 @@ set testinfo(numskip) 0
 set testinfo(numtests) 0
 set testinfo(failed) {}
 
-set testdir [file dirname $::argv0]
-set bindir [file dirname [info nameofexecutable]]
-
 if {[lsearch $argv "-verbose"] >= 0 || [info exists env(testverbose)]} {
 	incr testinfo(verbose)
 }
@@ -71,7 +68,13 @@ if {[catch {info version}]} {
 	return
 }
 
-lappend auto_path $testdir $bindir [file dirname [pwd]]
+# Add some search paths for packages
+if {[exists argv0]} {
+	# The directory containing the original script
+	lappend auto_path [file dirname $argv0]
+}
+# The directory containing the jimsh executable
+lappend auto_path [file dirname [info nameofexecutable]]
 
 # For Jim, this is reasonable compatible tcltest
 proc makeFile {contents name {dir {}}} {
diff --git a/tests/filecopy.test b/tests/filecopy.test
index 084beec..87fc899 100644
--- a/tests/filecopy.test
+++ b/tests/filecopy.test
@@ -5,7 +5,7 @@ needs cmd file
 needs cmd exec
 needs cmd parray tclcompat
 
-cd $testdir
+cd [file dirname [info script]]
 
 file mkdir tempdir
 
diff --git a/tests/misc.test b/tests/misc.test
index 9a9ac35..60dcf78 100644
--- a/tests/misc.test
+++ b/tests/misc.test
@@ -45,7 +45,7 @@ test regr-1.5 "lassign with empty list" {
 
 test io-1.1 "Read last line with no newline" {
 	set lines 0
-	set f [open $testdir/testio.in]
+	set f [open [file dirname [info script]]/testio.in]
 	while {[gets $f buf] >= 0} {
 		incr lines
 	}