Skip to content

[#104016000] Fixed test targets for Post-checkin job. #998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hovsepm merged 2 commits into from
Sep 29, 2015
Merged

[#104016000] Fixed test targets for Post-checkin job. #998

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99cfeb9
Fixed test targets for Post-checkin job.
Sep 28, 2015
bc011e3
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Sep 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
ContinueOnError="false" />
</Target>
<Target Name="InvokeXUnit">

<Target Name="DeclareXunitTests">
<ItemGroup>
<AsmXUnitTests Include=".\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
<AsmXUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
Expand Down Expand Up @@ -88,7 +88,9 @@
<ItemGroup Condition=" '$(scope)' !='' and '$(scope)' != 'ServiceManagement' ">
<XUnitTests Include="$(MSBuildProjectDirectory)\src\ResourceManager\$(scope)\*\bin\Debug\*.Test.dll"/>
</ItemGroup>

</Target>

<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
<Message Importance="high" Text="Running XUnit tests" />
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
<Exec
Expand All @@ -97,7 +99,7 @@
<OnError ExecuteTargets="TimeoutErrorHandler"/>
</Target>

<Target Name="InvokeXUnitAll">
<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
<Message Importance="high" Text="Running XUnit tests" />
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
<Exec
Expand Down