summaryrefslogtreecommitdiffstats
path: root/win/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-28 23:22:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-28 23:22:36 (GMT)
commit3f9c403daa87772cfc14b14c526209bf611553f4 (patch)
tree4b28336c18397a0d59174b25eae6e7bec8051c40 /win/Makefile.in
parent4562f64b892a515fb81ace2907ceea4f4185ef32 (diff)
parenta8b104c3b5ef5cf3721b20a37d48360b90f77a10 (diff)
downloadtcl-3f9c403daa87772cfc14b14c526209bf611553f4.zip
tcl-3f9c403daa87772cfc14b14c526209bf611553f4.tar.gz
tcl-3f9c403daa87772cfc14b14c526209bf611553f4.tar.bz2
[Bug 3549770] Multiple test failures running tcltest outside build tree
Diffstat (limited to 'win/Makefile.in')
-rw-r--r--win/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index d5a335d..62a5553 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -722,14 +722,14 @@ test: test-tcl test-packages
test-tcl: binaries $(TCLTEST)
TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
./$(TCLTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \
- -load "set ::ddelib [file normalize ${DDE_DLL_FILE}]; \
- set ::reglib [file normalize ${REG_DLL_FILE}]" | ./$(CAT32)
+ -load "package ifneeded dde 1.4.0b1 [list load [file normalize ${DDE_DLL_FILE}] dde]; \
+ package ifneeded registry 1.3.0 [list load [file normalize ${REG_DLL_FILE}] registry]" | ./$(CAT32)
# Useful target to launch a built tcltest with the proper path,...
runtest: binaries $(TCLTEST)
@TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
- ./$(TCLTEST) $(TESTFLAGS) -load "set ::ddelib [file normalize ${DDE_DLL_FILE}]; \
- set ::reglib [file normalize ${REG_DLL_FILE}]" $(SCRIPT)
+ ./$(TCLTEST) $(TESTFLAGS) -load "package ifneeded dde 1.4.0b1 [list load [file normalize ${DDE_DLL_FILE}] dde]; \
+ package ifneeded registry 1.3.0 [list load [file normalize ${REG_DLL_FILE}] registry]" $(SCRIPT)
# This target can be used to run tclsh from the build directory via
# `make shell SCRIPT=foo.tcl`