From e6ab2837d7d772a8ef7e9da8d4bb44eaa82a2956 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Fri, 17 Jun 2016 15:36:38 +0100
Subject: [PATCH] Run all tests in Windows build

---
 Windows Build/test2/test2.vcxproj | 2 ++
 Windows Build/test9/test9.vcxproj | 2 ++
 build.xml                         | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Windows Build/test2/test2.vcxproj b/Windows Build/test2/test2.vcxproj
index 3831b0de..33a0a14f 100644
--- a/Windows Build/test2/test2.vcxproj	
+++ b/Windows Build/test2/test2.vcxproj	
@@ -41,9 +41,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\build\output\test\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\build\output\test\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/Windows Build/test9/test9.vcxproj b/Windows Build/test9/test9.vcxproj
index afda6803..796709d0 100644
--- a/Windows Build/test9/test9.vcxproj	
+++ b/Windows Build/test9/test9.vcxproj	
@@ -41,9 +41,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\build\output\test\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\build\output\test\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/build.xml b/build.xml
index a4783c8d..0030d138 100644
--- a/build.xml
+++ b/build.xml
@@ -94,7 +94,7 @@
       <os family="windows"/>
     <then>
 		<!-- TODO: build test2 for windows -->
-    	<foreach target="runAtest" param="aTest" list="test1,test4"/>
+    	<foreach target="runAtest" param="aTest" list="test1,test2,test4,test9"/>
 	  </then>
     <else>
 	    <foreach target="runAtest" param="aTest" list="test9,test1,test2,test4"/>