Updated Branches: refs/heads/hyperv c05758b25 -> f7bd4614c
Fixing the warnings while running unit tests for hyper agent. Added a new switch for functional tests. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f7bd4614 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f7bd4614 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f7bd4614 Branch: refs/heads/hyperv Commit: f7bd4614c0183bde18863e9ae717092b9f72908d Parents: c05758b Author: Anshul Gangwar <[email protected]> Authored: Mon Oct 28 13:49:50 2013 +0530 Committer: Devdeep Singh <[email protected]> Committed: Mon Oct 28 13:49:50 2013 +0530 ---------------------------------------------------------------------- .../ServerResource.Tests/ServerResource.Tests.csproj | 4 ++-- plugins/hypervisors/hyperv/buildagent.sh | 9 ++++++++- plugins/hypervisors/hyperv/pom.xml | 6 ++++-- 3 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7bd4614/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj index 96b411c..ea78aa0 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj @@ -96,7 +96,7 @@ <ItemGroup> <Compile Include="HypervResourceController1Test.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="HypervResourceControllerTest.cs" /> + <!--<Compile Include="HypervResourceControllerTest.cs" /> --> </ItemGroup> <ItemGroup> <Content Include="App.config"> @@ -136,4 +136,4 @@ <Target Name="AfterBuild"> <Xunit.Runner.MSBuild.xunit Assembly="..\ServerResource.Tests\bin\Debug\ServerResource.Tests.dll" /> </Target> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7bd4614/plugins/hypervisors/hyperv/buildagent.sh ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/buildagent.sh b/plugins/hypervisors/hyperv/buildagent.sh index 93aec16..4abde38 100755 --- a/plugins/hypervisors/hyperv/buildagent.sh +++ b/plugins/hypervisors/hyperv/buildagent.sh @@ -19,4 +19,11 @@ export EnableNuGetPackageRestore=true wget http://nuget.org/nuget.exe mv nuget.exe ./DotNet/ServerResource/.nuget/NuGet.exe chmod a+x ./DotNet/ServerResource/.nuget/NuGet.exe -xbuild /p:BuildWithMono="true" ./DotNet/ServerResource/ServerResource.sln +if [ "$1" == "true" ] ; then + echo " skipping tests" + xbuild /p:Configuration="NoUnitTests" /p:BuildWithMono="true" ./DotNet/ServerResource/ServerResource.sln + +else + echo " running tests " + xbuild /p:BuildWithMono="true" ./DotNet/ServerResource/ServerResource.sln +fi http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7bd4614/plugins/hypervisors/hyperv/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml index e9f0371..042d3aa 100644 --- a/plugins/hypervisors/hyperv/pom.xml +++ b/plugins/hypervisors/hyperv/pom.xml @@ -27,7 +27,8 @@ <relativePath>../../pom.xml</relativePath> </parent> <properties> - <skipTests>true</skipTests> + <skipTests>false</skipTests> + <skipFunctionalTests>true</skipFunctionalTests> </properties> <dependencies> <dependency> @@ -134,6 +135,7 @@ <executable>bash</executable> <arguments> <argument>./buildagent.sh</argument> + <argument>${skipTests}</argument> </arguments> </configuration> </plugin> @@ -148,7 +150,7 @@ <includes> <include>**/HypervDirectConnectResourceTest.java</include> </includes> - <skipTests>${skipTests}</skipTests> + <skipTests>${skipFunctionalTests}</skipTests> </configuration> </plugin> </plugins>
