diff options
| author | davygrvy <davygrvy@pobox.com> | 2004-10-27 20:53:35 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy@pobox.com> | 2004-10-27 20:53:35 (GMT) |
| commit | 735e9fb4795704a351f58505a21ad08f077d48ef (patch) | |
| tree | 5416675fede22765cce8d52871bdd496dd2ca1d1 /win/Makefile.in | |
| parent | 4acd535a45b785914cfabbadb987305ce8bf8544 (diff) | |
| download | tcl-735e9fb4795704a351f58505a21ad08f077d48ef.zip tcl-735e9fb4795704a351f58505a21ad08f077d48ef.tar.gz tcl-735e9fb4795704a351f58505a21ad08f077d48ef.tar.bz2 | |
* tests/registry.test: Fixed test files to load the correct
* tests/winDde.test: registry and dde packages by using the info
* win/Makefile.in: from makefiles to tell tcltest where to load
* win/makefile.vc: them from. This avoids grabbing the wrong
package from $auto_path which might be the install point rather than
the dev location. Kudos to Jennifer Hom for adding -load and
-loadfile to the tcltest package. [Bug 926088]
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index b51f4b5..dfe42fd 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.82 2004/10/20 18:12:25 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.83 2004/10/27 20:53:37 davygrvy Exp $ VERSION = @TCL_VERSION@ @@ -623,12 +623,14 @@ install-private-headers: libraries test: binaries $(TCLTEST) TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \ ./$(TCLTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \ - | ./$(CAT32) + -load "set ::ddelib [file normalize ${DDE_DLL_FILE}]; \ + set ::reglib [file normalize ${REG_DLL_FILE}]" | ./$(CAT32) # Useful target to launch a built tcltest with the proper path,... runtest: binaries $(TCLTEST) @TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \ - ./$(TCLTEST) $(TESTFLAGS) $(SCRIPT) + ./$(TCLTEST) $(TESTFLAGS) -load "set ::ddelib [file normalize ${DDE_DLL_FILE}]; \ + set ::reglib [file normalize ${REG_DLL_FILE}]" $(SCRIPT) # This target can be used to run tclsh from the build directory # via `make shell SCRIPT=foo.tcl` |