Index: tests/thread.test
===================================================================
RCS file: /cvsroot/tcl/thread/tests/thread.test,v
retrieving revision 1.22
diff -u -r1.22 thread.test
--- tests/thread.test	28 Jan 2006 15:11:32 -0000	1.22
+++ tests/thread.test	10 May 2007 14:31:23 -0000
@@ -22,7 +22,7 @@
 
 tcltest::testConstraint chanTransfer               \
     [expr {   $::tcl_platform(platform) == "unix"  \
-           || $::tcl_PatchLevel > "8.4.10"}]
+           || $::tcl_patchLevel > "8.4.10"}]
 
 set dummy [::tcltest::makeFile dummyForTransfer dummyForTransfer]
 set tcltest::mainThread [thread::id]
Index: win/vc/makefile.vc
===================================================================
RCS file: /cvsroot/tcl/thread/win/vc/makefile.vc,v
retrieving revision 1.32
diff -u -r1.32 makefile.vc
--- win/vc/makefile.vc	9 May 2007 11:50:42 -0000	1.32
+++ win/vc/makefile.vc	10 May 2007 14:30:48 -0000
@@ -276,9 +276,6 @@
 
 !if $(DEBUG)
 ldebug	= -debug:full -debugtype:cv
-!if $(MSVCRT)
-ldebug = $(ldebug) -nodefaultlib:msvcrt
-!endif
 !else
 ldebug	= -release -opt:ref -opt:icf,3
 !endif
@@ -343,14 +340,20 @@
 #
 !if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
 test: setup $(PROJECT)
-	$(TCLSH) "$(ROOT)\tests\all.tcl" $(TESTFLAGS) -loadfile <<
+	$(TCLSH) <<
 load [file normalize [file join [pwd] $(PRJLIB:\=/)]]
+cd {$(ROOT)/tests}
+set argv {$(TESTFLAGS)}
+source all.tcl
 <<
 !else
 test: setup $(PROJECT)
         echo Please wait while the test results are collected
-	$(TCLSH) "$(ROOT)\tests\all.tcl" $(TESTFLAGS) -loadfile << >tests.log
+	$(TCLSH) << >tests.log
 load [file normalize [file join [pwd] $(PRJLIB:\=/)]]
+cd {$(ROOT)/tests}
+set argv {$(TESTFLAGS)}
+source all.tcl
 <<
         type tests.log | more
 !endif
