* 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]

3 files changed, 17 insertions, 8 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`
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
 
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index e2f399f..c6438f1 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinThrd.c,v 1.33 2004/07/21 01:45:45 hobbs Exp $
+ * RCS: @(#) $Id: tclWinThrd.c,v 1.34 2004/10/27 20:53:38 davygrvy Exp $
  */
 
 #include "tclWinInt.h"
@@ -437,7 +437,8 @@ TclFinalizeLock ()
 	allocOnce = 0;
     }
 #endif
-    /* Destroy the critical section that we are holding! */
+    LeaveCriticalSection(&initLock);
+    /* Destroy the critical section that we were holding. */
     DeleteCriticalSection(&initLock);
 }