Commits

Johannes Rudolph committed 5213d09

Spike building in parallel.

Comments (0)

Files changed (4)

SubSpec.Silverlight.tests.msbuild

+<Project DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+
+  <ItemGroup>
+    <SilverlightTestXaps
+            Include="test\*\bin\SL4\$(Configuration)\*.xap" />
+  </ItemGroup>
+
+  <Target Name="Test">
+    <Exec 
+      Command="&quot;tools\StatLight\StatLight.exe&quot; @(SilverlightTestXaps -> '-x=&quot;%(Identity)&quot;', ' ') --teamcity -r=&quot;build\TestResults.Silverlight-$(PROCESSOR_ARCHITECTURE).xml&quot;"/>
+  </Target>
+  
+</Project>
             Projects="SubSpec.sln"
             Targets="Build"
             Properties="Configuration=$(Configuration);TrackFileAccess=$(TrackFileAccess)"/>
-	</Target>
-	
-    <Target Name="Test" DependsOnTargets="Build">
-        <!-- Run 32 bit tests-->
-		<MSBuild
-            Projects="SubSpec.tests.msbuild"
-            Properties="Configuration=$(Configuration)" />
+	  </Target>
+
+    <ItemGroup>
+      <TestProjects Include="*.tests.msbuild"/>
+    </ItemGroup>
+
+    <Target Name="Test">
+      <MSBuild
+        Projects="SubSpec.tests.msbuild;SubSpec.Silverlight.tests.msbuild"
+        BuildInParallel="true"
+        Properties="Configuration=$(Configuration)"/>
     </Target>
-	
+  
     <Target Name="Packages" DependsOnTargets="Build">
 		<!-- SubSpec.nuspec -->
         <MakeDir Directories='build\packaging\lib'/>

SubSpec.tests.msbuild

 <Project DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
 
-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
-  </PropertyGroup>
-
   <UsingTask
       AssemblyFile="tools\xunit.runner.msbuild.dll"
       TaskName="Xunit.Runner.MSBuild.xunit"/>
   <ItemGroup>
     <TestAssemblies
         Include="test\*\bin\$(Configuration)\*.Tests.dll" />
-    <SilverlightTestXaps
-            Include="test\*\bin\SL4\$(Configuration)\*.xap" />
   </ItemGroup>
 
-  <Target Name="Test" DependsOnTargets="xUnitTests;SilverlightTests">
-    <Error Text="xUnit Test error(s) occured" Code="%(xUnitExitCodes.Identity)" Condition=" '%(xUnitExitCodes.Identity)' != '0' And '@(TestAssemblies)' != ''"/>
-    <Error Text="StatLight (Silverlight) Test error(s) occured" Code="%(StatLightExitCodes.Identity)" Condition=" '%(StatLightExitCodes.Identity)' != '0' And '@(SilverlightTestXaps)' != ''"/>
+  <Target Name="Test">
+    <xunit 
+      Assemblies="@(TestAssemblies)" 
+      Xml="build\TestResults-$(PROCESSOR_ARCHITECTURE).xml" 
+      Html="build\TestResults-$(PROCESSOR_ARCHITECTURE).html"/>
   </Target>
-
-  <Target Name="xUnitTests">
-    <xunit
-      Assemblies="@(TestAssemblies)"
-      Xml="build\TestResults-$(PROCESSOR_ARCHITECTURE).xml"
-      Html="build\TestResults-$(PROCESSOR_ARCHITECTURE).html"
-      ContinueOnError="true">
-      
-      <Output TaskParameter="ExitCode" ItemName="xUnitExitCodes"/>
-    
-    </xunit>
-  </Target>
-
-  <Target Name="SilverlightTests">
-    <Exec 
-      Command="&quot;tools\StatLight\StatLight.exe&quot; @(SilverlightTestXaps -> '-x=&quot;%(Identity)&quot;', ' ') --teamcity -r=&quot;build\TestResults.Silverlight-$(PROCESSOR_ARCHITECTURE).xml&quot;"
-      ContinueOnError="true">
-
-      <Output TaskParameter="ExitCode" ItemName="StatLightExitCodes"/>
-    
-    </Exec>
-  </Target>
+  
 </Project>
 goto BuildTarget
 
 :BuildDefault
-%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe SubSpec.msbuild /t:Build
+%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe SubSpec.msbuild /ds /m /t:Build
 goto End
 
 :BuildTarget
-%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe SubSpec.msbuild /t:%*
+%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe SubSpec.msbuild /ds /m /t:%*
 
 :End