From f80c16b53ad584accf790028fe20302abf664a00 Mon Sep 17 00:00:00 2001
From: Guenter Obiltschnig <guenter.obiltschnig@appinf.com>
Date: Mon, 21 Apr 2014 20:55:18 +0200
Subject: [PATCH] don't use WinTestRunner/MFC in VS2013 test suites

---
 .../templates/vs120/Win32/testsuite/debug_shared.template   | 5 ++---
 .../vs120/Win32/testsuite/debug_static_md.template          | 5 ++---
 .../vs120/Win32/testsuite/debug_static_mt.template          | 6 ++----
 ProGen/templates/vs120/Win32/testsuite/project.properties   | 1 +
 .../templates/vs120/Win32/testsuite/release_shared.template | 5 ++---
 .../vs120/Win32/testsuite/release_static_md.template        | 5 ++---
 .../vs120/Win32/testsuite/release_static_mt.template        | 6 ++----
 ProGen/templates/vs120/x64/testsuite/debug_shared.template  | 5 ++---
 .../templates/vs120/x64/testsuite/debug_static_md.template  | 5 ++---
 .../templates/vs120/x64/testsuite/debug_static_mt.template  | 6 ++----
 ProGen/templates/vs120/x64/testsuite/project.properties     | 1 +
 .../templates/vs120/x64/testsuite/release_shared.template   | 5 ++---
 .../vs120/x64/testsuite/release_static_md.template          | 5 ++---
 .../vs120/x64/testsuite/release_static_mt.template          | 6 ++----
 14 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/ProGen/templates/vs120/Win32/testsuite/debug_shared.template b/ProGen/templates/vs120/Win32/testsuite/debug_shared.template
index 2f4db8ebf..69f5a3b22 100644
--- a/ProGen/templates/vs120/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_shared.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin\"
 	IntermediateDirectory="obj\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="2"
 	CharacterSet="2"
 	>
 	<Tool
@@ -53,14 +52,14 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
 		SuppressStartupBanner="true"
 		GenerateDebugInformation="true"
 		ProgramDatabaseFile="bin\${project.target}d.pdb"
-		SubSystem="2"
+		SubSystem="1"
 		TargetMachine="1"
 		AdditionalOptions="${configuration.linker.additionalOptions}"
 	/>
diff --git a/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
index 68885ec3b..e6359f70f 100644
--- a/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin\static_md\"
 	IntermediateDirectory="obj\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="2"
 	CharacterSet="2"
 	>
 	<Tool
@@ -53,14 +52,14 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
 		SuppressStartupBanner="true"
 		GenerateDebugInformation="true"
 		ProgramDatabaseFile="bin\static_md\${project.target}d.pdb"
-		SubSystem="2"
+		SubSystem="1"
 		TargetMachine="1"
 		AdditionalOptions="${configuration.linker.additionalOptions}"
 	/>
diff --git a/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
index 46763ae09..002c5a166 100644
--- a/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin\static_mt\"
 	IntermediateDirectory="obj\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="1"
 	CharacterSet="2"
 	>
 	<Tool
@@ -53,15 +52,14 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
-		IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
 		SuppressStartupBanner="true"
 		GenerateDebugInformation="true"
 		ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
-		SubSystem="2"
+		SubSystem="1"
 		TargetMachine="1"
 		AdditionalOptions="${configuration.linker.additionalOptions}"
 	/>
diff --git a/ProGen/templates/vs120/Win32/testsuite/project.properties b/ProGen/templates/vs120/Win32/testsuite/project.properties
index bf39bf8c5..a708b0f00 100644
--- a/ProGen/templates/vs120/Win32/testsuite/project.properties
+++ b/ProGen/templates/vs120/Win32/testsuite/project.properties
@@ -7,3 +7,4 @@ project.targetSuffix.debug_static_mt = d
 project.targetSuffix.release_static_mt = 
 project.postprocess = upgrade2008to2013
 project.finalSuffix = _vs120.vcxproj
+project.replaceSourceFiles = .\\src\\WinDriver.cpp > .\\src\\Driver.cpp
diff --git a/ProGen/templates/vs120/Win32/testsuite/release_shared.template b/ProGen/templates/vs120/Win32/testsuite/release_shared.template
index 451becda4..f85718517 100644
--- a/ProGen/templates/vs120/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_shared.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin\"
 	IntermediateDirectory="obj\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="2"
 	CharacterSet="2"
 	>
 	<Tool
@@ -55,12 +54,12 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
 		GenerateDebugInformation="false"
-		SubSystem="2"
+		SubSystem="1"
 		OptimizeReferences="2"
 		EnableCOMDATFolding="2"
 		TargetMachine="1"
diff --git a/ProGen/templates/vs120/Win32/testsuite/release_static_md.template b/ProGen/templates/vs120/Win32/testsuite/release_static_md.template
index 18806b021..c18fed320 100644
--- a/ProGen/templates/vs120/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_static_md.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin\static_md\"
 	IntermediateDirectory="obj\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="2"
 	CharacterSet="2"
 	>
 	<Tool
@@ -55,12 +54,12 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
 		GenerateDebugInformation="false"
-		SubSystem="2"
+		SubSystem="1"
 		OptimizeReferences="2"
 		EnableCOMDATFolding="2"
 		TargetMachine="1"
diff --git a/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
index 2064fe997..c293ab252 100644
--- a/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin\static_mt\"
 	IntermediateDirectory="obj\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="1"
 	CharacterSet="2"
 	>
 	<Tool
@@ -55,13 +54,12 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
-		IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
 		GenerateDebugInformation="false"
-		SubSystem="2"
+		SubSystem="1"
 		OptimizeReferences="2"
 		EnableCOMDATFolding="2"
 		TargetMachine="1"
diff --git a/ProGen/templates/vs120/x64/testsuite/debug_shared.template b/ProGen/templates/vs120/x64/testsuite/debug_shared.template
index 86e2793b4..c1dcd13e2 100644
--- a/ProGen/templates/vs120/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_shared.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin64\"
 	IntermediateDirectory="obj64\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="2"
 	CharacterSet="2"
 	>
 	<Tool
@@ -53,14 +52,14 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
 		SuppressStartupBanner="true"
 		GenerateDebugInformation="true"
 		ProgramDatabaseFile="bin64\${project.target}d.pdb"
-		SubSystem="2"
+		SubSystem="1"
 		TargetMachine="17"
 		AdditionalOptions="${configuration.linker.additionalOptions}"
 	/>
diff --git a/ProGen/templates/vs120/x64/testsuite/debug_static_md.template b/ProGen/templates/vs120/x64/testsuite/debug_static_md.template
index 99e2564c2..a5bf9915c 100644
--- a/ProGen/templates/vs120/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_static_md.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin64\static_md\"
 	IntermediateDirectory="obj64\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="2"
 	CharacterSet="2"
 	>
 	<Tool
@@ -53,14 +52,14 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
 		SuppressStartupBanner="true"
 		GenerateDebugInformation="true"
 		ProgramDatabaseFile="bin64\static_md\${project.target}d.pdb"
-		SubSystem="2"
+		SubSystem="1"
 		TargetMachine="17"
 		AdditionalOptions="${configuration.linker.additionalOptions}"
 	/>
diff --git a/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
index 565c4d5ac..8a1e41dfe 100644
--- a/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin64\static_mt\"
 	IntermediateDirectory="obj64\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="1"
 	CharacterSet="2"
 	>
 	<Tool
@@ -53,15 +52,14 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
-		IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
 		SuppressStartupBanner="true"
 		GenerateDebugInformation="true"
 		ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
-		SubSystem="2"
+		SubSystem="1"
 		TargetMachine="17"
 		AdditionalOptions="${configuration.linker.additionalOptions}"
 	/>
diff --git a/ProGen/templates/vs120/x64/testsuite/project.properties b/ProGen/templates/vs120/x64/testsuite/project.properties
index 60b8cb5d9..fd0b790e6 100644
--- a/ProGen/templates/vs120/x64/testsuite/project.properties
+++ b/ProGen/templates/vs120/x64/testsuite/project.properties
@@ -8,3 +8,4 @@ project.targetSuffix.release_static_mt =
 project.postprocess = upgrade2008to2013
 project.finalSuffix = _x64_vs120.vcxproj
 project.targetArchitecture = AMD64
+project.replaceSourceFiles = .\\src\\WinDriver.cpp > .\\src\\Driver.cpp
diff --git a/ProGen/templates/vs120/x64/testsuite/release_shared.template b/ProGen/templates/vs120/x64/testsuite/release_shared.template
index 117df4268..1e0868b9f 100644
--- a/ProGen/templates/vs120/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_shared.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin64\"
 	IntermediateDirectory="obj64\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="2"
 	CharacterSet="2"
 	>
 	<Tool
@@ -55,12 +54,12 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
 		GenerateDebugInformation="false"
-		SubSystem="2"
+		SubSystem="1"
 		OptimizeReferences="2"
 		EnableCOMDATFolding="2"
 		TargetMachine="17"
diff --git a/ProGen/templates/vs120/x64/testsuite/release_static_md.template b/ProGen/templates/vs120/x64/testsuite/release_static_md.template
index 15c9d0b04..394b01953 100644
--- a/ProGen/templates/vs120/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_static_md.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin64\static_md\"
 	IntermediateDirectory="obj64\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="2"
 	CharacterSet="2"
 	>
 	<Tool
@@ -55,12 +54,12 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
 		GenerateDebugInformation="false"
-		SubSystem="2"
+		SubSystem="1"
 		OptimizeReferences="2"
 		EnableCOMDATFolding="2"
 		TargetMachine="17"
diff --git a/ProGen/templates/vs120/x64/testsuite/release_static_mt.template b/ProGen/templates/vs120/x64/testsuite/release_static_mt.template
index 3299a1884..9d0352cfb 100644
--- a/ProGen/templates/vs120/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_static_mt.template
@@ -3,7 +3,6 @@
 	OutputDirectory="bin64\static_mt\"
 	IntermediateDirectory="obj64\$(ConfigurationName)"
 	ConfigurationType="1"
-	UseOfMFC="1"
 	CharacterSet="2"
 	>
 	<Tool
@@ -55,13 +54,12 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
-		IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
 		GenerateDebugInformation="false"
-		SubSystem="2"
+		SubSystem="1"
 		OptimizeReferences="2"
 		EnableCOMDATFolding="2"
 		TargetMachine="17"