Skip to content

Commit

Permalink
Fix AOT tests in Mono.Android.NET-Tests.csproj
Browse files Browse the repository at this point in the history
* had the wrong file path for `TestResults-*.xml`
* `$(ExcludeCategories)` should include `DotNetIgnore` and `InetAccess`
  • Loading branch information
jonathanpeppers committed Jul 27, 2021
1 parent 94d073a commit 1a450f1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 2 additions & 3 deletions build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -803,9 +803,8 @@ stages:
configuration: $(XA.Build.Configuration)
testName: Mono.Android.NET_Tests-Aot
project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)-Aot.xml
# InetAccess excluded due to: https://github.com/dotnet/runtime/issues/56315
extraBuildArgs: /p:RunAOTCompilation=true /p:ExcludeCategories=InetAccess
testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)Aot.xml
extraBuildArgs: /p:RunAOTCompilation=true
artifactSource: bin/Test$(XA.Build.Configuration)/net6.0-android/Mono.Android.NET_Tests-Signed.apk
artifactFolder: net6-aot
useDotNet: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@
<EnableDefaultAndroidAssetItems>false</EnableDefaultAndroidAssetItems>
<_MonoAndroidTestPackage>Mono.Android.NET_Tests</_MonoAndroidTestPackage>
<PlotDataLabelSuffix>-$(TestsFlavor)NET6</PlotDataLabelSuffix>
<!-- TODO: Fix excluded tests -->
<!--
TODO: Fix excluded tests
For AOT, InetAccess excluded due to: https://github.com/dotnet/runtime/issues/56315
-->
<ExcludeCategories>DotNetIgnore</ExcludeCategories>
<ExcludeCategories Condition=" '$(RunAOTCompilation)' == 'true' ">$(ExcludeCategories):InetAccess</ExcludeCategories>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down

0 comments on commit 1a450f1

Please sign in to comment.