Skip to content
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

Jump to bottom

[tests] Report errors last in RunApkTests (Take 2!) #1610

Merged
merged 1 commit into from
May 1, 2018
Merged

[tests] Report errors last in RunApkTests (Take 2!) #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions build-tools/scripts/RunTests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,25 @@
<_RenamedTestCases>@(_RenameNUnitTestCasesGlob)</_RenamedTestCases>
</PropertyGroup>
<MSBuild
ContinueOnError="ErrorAndContinue"
Projects="$(MSBuildThisFileDirectory)TestApks.targets"
Targets="RenameTestCases"
Properties="Configuration=$(Configuration);RenameTestCasesGlob=$(_RenamedTestCases)"
/>
</Target>
<Target Name="RunJavaInteropTests">
<MSBuild Projects="$(JavaInteropSourceDirectory)\Java.Interop.sln" Condition=" '$(HostOS)' == 'Windows' " />
<MSBuild
Condition=" '$(HostOS)' == 'Windows' "
ContinueOnError="ErrorAndContinue"
Projects="$(JavaInteropSourceDirectory)\Java.Interop.sln"
/>
<Exec
Command ="make -C &quot;$(JavaInteropSourceDirectory)&quot; CONFIGURATION=$(Configuration) all"
Condition=" '$(HostOS)' != 'Windows' "
/>
<SetEnvironmentVariable Name="ANDROID_SDK_PATH" Value="$(AndroidSdkFullPath)" />
<MSBuild
ContinueOnError="ErrorAndContinue"
Projects="$(JavaInteropSourceDirectory)\build-tools\scripts\RunNUnitTests.targets"
Properties="AndroidSdkDirectory=$(AndroidSdkDirectory)"
/>
Expand All @@ -61,6 +67,7 @@
<_RenamedTestCases>@(_RenameJITestCasesGlob)</_RenamedTestCases>
</PropertyGroup>
<MSBuild
ContinueOnError="ErrorAndContinue"
Projects="$(MSBuildThisFileDirectory)TestApks.targets"
Targets="RenameTestCases"
Properties="Configuration=$(Configuration);RenameTestCasesGlob=$(_RenamedTestCases)"
Expand All @@ -73,12 +80,16 @@
</Target>
<Target Name="RunApkTests">
<Exec Command="$(_XABuild) %(_ApkTestProject.Identity) /t:SignAndroidPackage $(_XABuildProperties)" />
<MSBuild Projects="$(_TopDir)\tests\RunApkTests.targets" />
<MSBuild
ContinueOnError="ErrorAndContinue"
Projects="$(_TopDir)\tests\RunApkTests.targets"
/>
<Exec
Command="$(_XABuild) %(_ApkTestProjectAot.Identity) /t:SignAndroidPackage $(_XABuildProperties) /p:AotAssemblies=True"
Condition=" '$(Configuration)' == 'Release' "
/>
<MSBuild
ContinueOnError="ErrorAndContinue"
Projects="$(_TopDir)\tests\RunApkTests.targets"
Condition=" '$(Configuration)' == 'Release' "
Properties="AotAssemblies=True"
Expand Down
2 changes: 2 additions & 0 deletions build-tools/scripts/TestApks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@
ContinueOnError="True"
Command="kill -KILL $(_EmuPid)"
/>
</Target>
<Target Name="ReportComponentFailures">
<Error
Condition="'@(_FailedComponent)' != ''"
Text="Execution of the following components did not complete successfully: @(_FailedComponent->'%(Identity)', ', ')"
Expand Down
1 change: 1 addition & 0 deletions tests/RunApkTests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
RunTestApks;
ReleaseAndroidTarget;
RenameApkTestCases;
ReportComponentFailures;
</RunApkTestsDependsOn>
</PropertyGroup>
<Target Name="RunApkTests"
Expand Down