Skip to content

Commit 04bacb8

Browse files
Fix AOT tests in Mono.Android.NET-Tests.csproj
* had the wrong file path for `TestResults-*.xml` * `$(ExcludeCategories)` should include `DotNetIgnore` and `InetAccess`
1 parent 94d073a commit 04bacb8

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -803,9 +803,8 @@ stages:
803803
configuration: $(XA.Build.Configuration)
804804
testName: Mono.Android.NET_Tests-Aot
805805
project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
806-
testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)-Aot.xml
807-
# InetAccess excluded due to: https://github.com/dotnet/runtime/issues/56315
808-
extraBuildArgs: /p:RunAOTCompilation=true /p:ExcludeCategories=InetAccess
806+
testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)Aot.xml
807+
extraBuildArgs: /p:TestsFlavor=Aot /p:RunAOTCompilation=true
809808
artifactSource: bin/Test$(XA.Build.Configuration)/net6.0-android/Mono.Android.NET_Tests-Signed.apk
810809
artifactFolder: net6-aot
811810
useDotNet: true

tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@
1919
<EnableDefaultAndroidAssetItems>false</EnableDefaultAndroidAssetItems>
2020
<_MonoAndroidTestPackage>Mono.Android.NET_Tests</_MonoAndroidTestPackage>
2121
<PlotDataLabelSuffix>-$(TestsFlavor)NET6</PlotDataLabelSuffix>
22-
<!-- TODO: Fix excluded tests -->
22+
<!--
23+
TODO: Fix excluded tests
24+
For AOT, InetAccess excluded due to: https://github.com/dotnet/runtime/issues/56315
25+
-->
2326
<ExcludeCategories>DotNetIgnore</ExcludeCategories>
27+
<ExcludeCategories Condition=" '$(RunAOTCompilation)' == 'true' ">$(ExcludeCategories):InetAccess</ExcludeCategories>
2428
</PropertyGroup>
2529

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

0 commit comments

Comments
 (0)