summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2012-01-27 09:29:49 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2012-01-29 10:39:01 -0800
commit920586d1115cd349fdbc78a41c83f051e0fa154a (patch)
treebad466c67519eeeb91e0162634d063681360aba3
parenteb2fe80ed606932a983bb8002c132a98514db827 (diff)
downloadDotNetOpenAuth-920586d1115cd349fdbc78a41c83f051e0fa154a.zip
DotNetOpenAuth-920586d1115cd349fdbc78a41c83f051e0fa154a.tar.gz
DotNetOpenAuth-920586d1115cd349fdbc78a41c83f051e0fa154a.tar.bz2
Added DNOA.AspNet.Test project to build.proj Test target.
-rw-r--r--build.proj11
1 files changed, 8 insertions, 3 deletions
diff --git a/build.proj b/build.proj
index 4f33e72..f6a8601 100644
--- a/build.proj
+++ b/build.proj
@@ -41,6 +41,11 @@
$(ProjectRoot)**\*.log*;
$(ProjectRoot)doc\$(ProductName).chm;
" />
+
+ <TestProjects Include="DotNetOpenAuth_Test;DotNetOpenAuth_TestWeb" Condition=" '$(ClrVersion)' == '2' " />
+ <TestProjects Include="DotNetOpenAuth_AspNet_Test" Condition=" '$(ClrVersion)' == '4' " />
+ <TestAssemblies Include="$(OutputPath)$(ProductName).Test.dll" Condition=" '$(ClrVersion)' == '2' " />
+ <TestAssemblies Include="$(OutputPath)$(ProductName).AspNet.Test.dll" Condition=" '$(ClrVersion)' == '4' " />
</ItemGroup>
<Target Name="TouchUpProjectsForDualFrameworks">
@@ -62,7 +67,7 @@
</Target>
<Target Name="BuildTests" DependsOnTargets="SkipVerification">
- <MSBuild Projects="$(SolutionPath)" Targets="DotNetOpenAuth_Test;DotNetOpenAuth_TestWeb" BuildInParallel="$(BuildInParallel)" />
+ <MSBuild Projects="$(SolutionPath)" Targets="@(TestProjects)" BuildInParallel="$(BuildInParallel)" />
</Target>
<Target Name="Build" DependsOnTargets="SkipVerification">
@@ -74,13 +79,13 @@
</Target>
<Target Name="Test" DependsOnTargets="BuildTests"
- Inputs="$(OutputPath)$(ProductName).dll;$(OutputPath)$(ProductName).Test.dll"
+ Inputs="$(OutputPath)$(ProductName).dll;@(TestAssemblies)"
Outputs='$(OutputPath)Test-result.xml'>
<PropertyGroup>
<!-- Performance tests are only expected to pass in optimized builds. -->
<NUnitExcludeCategories Condition=" '$(Configuration)' != 'Release' ">Performance</NUnitExcludeCategories>
</PropertyGroup>
- <NUnit Assemblies="$(OutputPath)$(ProductName).Test.dll"
+ <NUnit Assemblies="@(TestAssemblies)"
ToolPath="$(NUnitToolPath)"
OutputXmlFile="$(OutputPath)Test-result.xml"
ExcludeCategory="$(NUnitExcludeCategories)" />