#
#
# rename "visualc/unit_tests.vcproj"
#     to "visualc/unit_tester.vcproj"
# 
# patch "tester.cc"
#  from [15a36dfef03be38ba1725b809c81d27759513863]
#    to [c4ddb0b7774c9b6a2a7a97b4fe0cfd65b712bb90]
# 
# patch "visualc/monotone.sln"
#  from [1b6044d626f607b778aa61b703d9b5f1bc304b8b]
#    to [4cc9dff446e2748daca6e0adb3028aa11b7a8d0d]
# 
# patch "visualc/runtests.bat"
#  from [1ef850fd7a0e4234df2cb961dcdd88f82868dc47]
#    to [2d04a176f6a6708cd8b01040862bb72d6c42e975]
# 
# patch "visualc/unit_tester.vcproj"
#  from [6bc6b55c046555f36577fcd4cbde94b552d251ff]
#    to [a29dcde9095facf294b4c968d1618f5fe62a5b6a]
#
============================================================
--- tester.cc	15a36dfef03be38ba1725b809c81d27759513863
+++ tester.cc	c4ddb0b7774c9b6a2a7a97b4fe0cfd65b712bb90
@@ -1,6 +1,8 @@
 #include "base.hh"
 #include "lua.hh"
+#include "paths.hh"
 #include "platform.hh"
+#include "platform-wrapped.hh"
 #include "tester-plaf.hh"
 #include "vector.hh"
 #include "sanity.hh"
@@ -1051,14 +1053,19 @@ int main(int argc, char **argv)
           run_dir = firstdir + "/tester_dir";
           testfile = tests_to_run.front();
 
-          if (argv[0][0] == '/'
-#ifdef WIN32
-              || argv[0][0] != '\0' && argv[0][1] == ':'
-#endif
-              )
+#if defined(WIN32)
+          char name[MAX_PATH];
+          int len = 0;
+          len = (int)GetModuleFileName(0, name, MAX_PATH);
+          if(len != 0) {
+            argv0 = system_path(name).as_external();
+          }
+#else
+          if (argv[0][0] == '/')
             argv0 = argv[0];
           else
             argv0 = firstdir + "/" + argv[0];
+#endif
 
           change_current_working_dir(dirname(testfile));
           source_dir = get_current_working_dir();
============================================================
--- visualc/monotone.sln	1b6044d626f607b778aa61b703d9b5f1bc304b8b
+++ visualc/monotone.sln	4cc9dff446e2748daca6e0adb3028aa11b7a8d0d
@@ -37,7 +37,7 @@ EndProject
 		{36249158-B5C6-46BD-9FAF-15454CBE722F} = {36249158-B5C6-46BD-9FAF-15454CBE722F}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "unit_tests.vcproj", "{8F951705-66C4-4B67-A585-C8CF75EA2644}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tester", "unit_tester.vcproj", "{8F951705-66C4-4B67-A585-C8CF75EA2644}"
 	ProjectSection(ProjectDependencies) = postProject
 		{83E1EB91-ABA9-4DC5-9423-87B3D977F015} = {83E1EB91-ABA9-4DC5-9423-87B3D977F015}
 	EndProjectSection
============================================================
--- visualc/runtests.bat	1ef850fd7a0e4234df2cb961dcdd88f82868dc47
+++ visualc/runtests.bat	2d04a176f6a6708cd8b01040862bb72d6c42e975
@@ -1,26 +1,34 @@ SETLOCAL
 SETLOCAL
 
+if "%1x"=="debugx" goto do_debug
 set EXE_PATH=visualc\Release
+goto setpath
+
+:do_debug
+set EXE_PATH=visualc\Debug
+goto setpath
+
+:setpath
 set PATH=%CD%\%EXE_PATH%;%PATH%
 
 set fail_count=0
 
-unit_tests.exe
-if %ERRORLEVEL%==0 goto tester-testsuite.lua
address@hidden unit-tests failed.
-set fail_count=1
-
-:tester-testsuite.lua
 %EXE_PATH%\tester.exe tester-testsuite.lua
-if %ERRORLEVEL%==0 goto testsuite.lua
+if %ERRORLEVEL%==0 goto unit-testsuite.lua
 @echo tester-testsuite.lua failed.
+set fail_count=1
+
+:unit-testsuite.lua
+%EXE_PATH%\tester.exe unit-testsuite.lua
+if %ERRORLEVEL%==0 goto lua-testsuite.lua
address@hidden unit-testsuite.lua failed.
 if %fail_count%==1 set fail_count=2
 if %fail_count%==0 set fail_count=1
 
-:testsuite.lua
-%EXE_PATH%\tester.exe testsuite.lua
+:lua-testsuite.lua
+%EXE_PATH%\tester.exe lua-testsuite.lua
 if %ERRORLEVEL%==0 goto nomore
address@hidden testsuite.lua failed.
address@hidden lua-testsuite.lua failed.
 if %fail_count%==2 set fail_count=3
 if %fail_count%==1 set fail_count=2
 if %fail_count%==0 set fail_count=1
============================================================
--- visualc/unit_tests.vcproj	6bc6b55c046555f36577fcd4cbde94b552d251ff
+++ visualc/unit_tester.vcproj	a29dcde9095facf294b4c968d1618f5fe62a5b6a
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="unit_tests"
+	Name="unit_tester"
 	ProjectGUID="{8F951705-66C4-4B67-A585-C8CF75EA2644}"
 	RootNamespace="monotone"
 	>
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
-			IntermediateDirectory="unit-testsDebug"
+			IntermediateDirectory="unit-testerDebug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			CharacterSet="2"
@@ -67,7 +67,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib /VERBOSE:lib"
 				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib pcre.lib iconvD.lib ws2_32.lib shell32.lib advapi32.lib zlibd.lib"
-				OutputFile="$(outdir)\unit_tests.exe"
+				OutputFile="$(outdir)\unit_tester.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				IgnoreDefaultLibraryNames=""
@@ -84,7 +84,7 @@
 				OutputManifestFile="$(IntDir)\$(TargetFileName).embed.manifest"
 				ManifestResourceFile="$(IntDir)\$(TargetFileName).embed.manifest.res"
 				UseFAT32Workaround="true"
-				AdditionalOptions="/outputresource:&quot;.\Debug\unit_tests.exe;#1&quot;"
+				AdditionalOptions="/outputresource:&quot;.\Debug\unit_tester.exe;#1&quot;"
 				VerboseOutput="false"
 			/>
 			<Tool
@@ -109,7 +109,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="Release"
-			IntermediateDirectory="unit-testsRelease"
+			IntermediateDirectory="unit-testerRelease"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			CharacterSet="2"
@@ -165,7 +165,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT.lib"
 				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib pcre.lib iconv.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
-				OutputFile="$(outdir)/unit_tests.exe"
+				OutputFile="$(outdir)/unit_tester.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				GenerateDebugInformation="true"
@@ -327,10 +327,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gzip.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\file_io.cc"
 				>
 			</File>
@@ -351,10 +347,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\gzip.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\hmac.cc"
 				>
 			</File>
 			<File
+				RelativePath="..\inodeprint.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\win32\inodeprint.cc"
 				>
 				<FileConfiguration
@@ -377,10 +381,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\inodeprint.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\key_store.cc"
 				>
 			</File>
@@ -819,10 +819,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\gzip.hh"
-				>
-			</File>
-			<File
 				RelativePath="..\file_io.hh"
 				>
 			</File>
@@ -839,6 +835,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\gzip.hh"
+				>
+			</File>
+			<File
 				RelativePath="..\hash_map.hh"
 				>
 			</File>