aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2015-04-06 09:58:07 +1000
committerSteve Bennett <steveb@workware.net.au>2015-04-06 09:58:07 +1000
commit85358e479e5bbf295a5aaf743f3c29a5e1a4fd1c (patch)
tree0e3c49a31550c9e869e98464a4baff77ebce7b5c
parentc73f5c591b206c92f8021d01088738c908970d64 (diff)
downloadjimtcl-85358e479e5bbf295a5aaf743f3c29a5e1a4fd1c.zip
jimtcl-85358e479e5bbf295a5aaf743f3c29a5e1a4fd1c.tar.gz
jimtcl-85358e479e5bbf295a5aaf743f3c29a5e1a4fd1c.tar.bz2
ensure that tests can find tcltest.tcl
Reported-By: Stuart Cassoff <stwo@bell.net> Signed-off-by: Steve Bennett <steveb@workware.net.au>
-rw-r--r--Makefile.in2
-rw-r--r--tests/testing.tcl4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 2cef516..6645ddf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,7 +112,7 @@ uninstall:
@endif
test check: $(JIMSH)
- cd @srcdir@/tests; $(DEF_LD_PATH) $(MAKE) jimsh=@builddir@/jimsh
+ cd @srcdir@/tests; $(DEF_LD_PATH) $(MAKE) jimsh=@builddir@/jimsh TOPSRCDIR=@top_srcdir@
$(OBJS): Makefile $(wildcard *.h)
diff --git a/tests/testing.tcl b/tests/testing.tcl
index 386e070..95c0fe3 100644
--- a/tests/testing.tcl
+++ b/tests/testing.tcl
@@ -4,5 +4,9 @@ if {[catch {info version}]} {
source [file dirname [info script]]/../tcltest.tcl
} else {
# Jim
+ if {[exists env(TOPSRCDIR)]} {
+ set auto_path [list $env(TOPSRCDIR) {*}$auto_path]
+ }
+
package require tcltest
}