[Acmcontester-developers] SF.net SVN: acmcontester:[550] nera

[<br...@us...>]

Revision: 550
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=550&view=rev
Author:   brus07
Date:     2009-07-26 00:16:30 +0000 (Sun, 26 Jul 2009)

Log Message:
-----------
Added new Task to msbuild script file: Test (for NUnit testing solution).
Include used MSBuild.Community.Tasks.
But now used absolute my path to main folder (for other, please change Global.targets <MainPath>).

Modified Paths:
--------------
    nera/Targets/Common.targets
    nera/Targets/Global.targets
    nera/projects/nera.tester.runner/trunk/Component Tests.csproj
    nera/projects/nera.tester.runner/trunk/docs/build help.txt

Modified: nera/Targets/Common.targets
===================================================================
--- nera/Targets/Common.targets	2009-07-25 23:26:26 UTC (rev 549)
+++ nera/Targets/Common.targets	2009-07-26 00:16:30 UTC (rev 550)
@@ -2,6 +2,11 @@
 
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 
+  <!-- MSBuild Community tasks are used on some of the targets because they provide useful tasks as
+       Nunit, Zip, etc.
+   -->
+  <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets"/>
+
   <PropertyGroup>
     <ComponentVersion>$(ComponentVersionMajor).$(ComponentVersionMinor).$(ComponentVersionMicro)</ComponentVersion>
     <ComponentPath>$(ComponentDistFileName)\$(ComponentVersion)</ComponentPath>
@@ -28,8 +33,39 @@
   </Choose>
 
   <Target Name="CleanSolution">
+    <MSBuild Targets="Clean"
+             Projects="$(MSBuildProjectDirectory)\Component Sources.csproj"/>
+    <MSBuild Targets="Clean"
+             Projects="$(MSBuildProjectDirectory)\Component Tests.csproj"/>
     <RemoveDir Directories="$(BuildDir)"/>
     <RemoveDir Directories="$(TestLogDir)"/>
     <RemoveDir Directories="$(BuildObjDir)"/>
   </Target>
+
+  <Target Name="TestSetup" DependsOnTargets="Build" />
+  <Target Name="TestTearDown" DependsOnTargets="Build" />
+
+  <!-- Run Unit tests -->
+  <Target Name="Test"
+    DependsOnTargets="Build"
+    Condition="$(ProjectKind)=='ComponentTests'">
+
+    <CallTarget Targets="TestSetup"/>
+    <MakeDir Directories="$(TestLogDir)" Condition="!Exists('$(TestLogDir)')"/>
+    <Message Text="NUnit utility was not found. Please check its path in Global.targets file or the definition for &quot;NUnitConsole&quot; property from above in this file."
+             Condition="!Exists('$(Nunit)')"/>
+
+    <Message Text="Starting NUnit test run ..."/>
+    <NUnit Assemblies="$(BuildClassDir)\$(ComponentPackage).Test.$(ComponentPackageExtension)"
+           OutputXmlFile="$(TestLogDir)\$(ComponentPackage).Test.$(ComponentPackageExtension)-results.xml"
+           ToolPath="$(NunitDir)"
+           ContinueOnError="true"
+           WorkingDirectory="$(MSBuildProjectDirectory)"/>
+    <Xslt Inputs="$(TestLogDir)\$(ComponentPackage).Test.$(ComponentPackageExtension)-results.xml"
+          Xsl="$(NunitSummaryTransform)"
+          Output="$(TestLogDir)\$(ComponentPackage).Test.$(ComponentPackageExtension)-results.txt"
+          Condition="Exists('$(NunitSummaryTransform)')"/>
+    <CallTarget Targets="TestTearDown"/>
+  </Target>
+
 </Project>

Modified: nera/Targets/Global.targets
===================================================================
--- nera/Targets/Global.targets	2009-07-25 23:26:26 UTC (rev 549)
+++ nera/Targets/Global.targets	2009-07-26 00:16:30 UTC (rev 550)
@@ -1,8 +1,10 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MainPath>..</MainPath>
+    <MainPath>d:\Documents\Contester\System\svn\nera</MainPath>
     <ToolsDir>$(MainPath)\tools</ToolsDir>
 
+    <MSBuildCommunityTasksPath>$(ToolsDir)\MSBuild.Community.Tasks.v1.2.0.306\Build</MSBuildCommunityTasksPath>
+
     <!-- Reference to NUnit -->
     <NUnitDir>$(ToolsDir)\nunit-v2.2.8\bin</NUnitDir>
     <NUnit>$(NUnitDir)\nunit.framework.dll</NUnit>

Modified: nera/projects/nera.tester.runner/trunk/Component Tests.csproj
===================================================================
--- nera/projects/nera.tester.runner/trunk/Component Tests.csproj	2009-07-25 23:26:26 UTC (rev 549)
+++ nera/projects/nera.tester.runner/trunk/Component Tests.csproj	2009-07-26 00:16:30 UTC (rev 550)
@@ -16,4 +16,11 @@
 
   <Import Project="Reference.targets" />
 
+  <ItemGroup>
+    <MySourceFiles Include="$(TestFilesDir)\test1\**\*.*" Exclude="$(TestFilesDir)\test1\**\.svn\**\*.*" />
+  </ItemGroup>
+  <Target Name="TestSetup" DependsOnTargets="Build">
+    <Copy SourceFiles="@(MySourceFiles)" DestinationFiles="@(MySourceFiles->'$(OutputPath)\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+
 </Project>
\ No newline at end of file

Modified: nera/projects/nera.tester.runner/trunk/docs/build help.txt
===================================================================
--- nera/projects/nera.tester.runner/trunk/docs/build help.txt	2009-07-25 23:26:26 UTC (rev 549)
+++ nera/projects/nera.tester.runner/trunk/docs/build help.txt	2009-07-26 00:16:30 UTC (rev 550)
@@ -1,8 +1,11 @@
-For build component run
+For build component:
 go.bat "Component Sources.csproj" /t:build
 
-For build test project run
+For build test project:
 go.bat "Component Tests.csproj" /t:build
 
-For clean solution run
+For clean solution:
 go.bat "Component Sources.csproj" /t:CleanSolution
+
+For testing solution:
+go.bat "Component Tests.csproj" /t:test
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.