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.vc | |
| 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.vc')
| -rw-r--r-- | win/makefile.vc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index c553016..ad5b4cc 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.134 2004/09/27 14:31:21 kennykb Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.135 2004/10/27 20:53:38 davygrvy Exp $ #------------------------------------------------------------------------------ !if !defined(MSDEVDIR) && !defined(MSVCDIR) @@ -465,10 +465,16 @@ install: install-binaries install-libraries install-docs test: setup $(TCLTEST) dlls $(CAT32) set TCL_LIBRARY=$(ROOT)/library !if "$(OS)" == "Windows_NT" || "$(MSVCDIR)" == "IDE" - $(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) + $(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile << + set ::ddelib [file normalize $(TCLDDELIB:\=/)] + set ::reglib [file normalize $(TCLREGLIB:\=/)] +<< !else @echo Please wait while the tests are collected... - $(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) > tests.log + $(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile << + set ::ddelib [file normalize $(TCLDDELIB:\=/)] + set ::reglib [file normalize $(TCLREGLIB:\=/)] +<< > tests.log type tests.log | more !endif |