Skip to content

Commit a0ee973

Browse files
[tests] enable GCBridge category for CoreCLR (#10354)
Context: #10198 We added CoreCLR "GC Bridge" support in 1f8f719, but there are still some tests we can enable. Hopefully they pass! 🤞 I also did some cleanup of a `DotNetIgnore` category that is no longer used since Xamarin.Android was removed from this repo.
1 parent 70f4dd8 commit a0ee973

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

Documentation/workflow/UnitTests.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,19 @@ To run ALL the [MSBuild Integration Tests](#msbuild-integration-tests) *and*
6363
all the [MSBuild Task Unit Tests](#msbuild-task-tests), run:
6464

6565
```sh
66-
./dotnet-local.sh test bin/TestDebug/net7.0/Xamarin.Android.Build.Tests.dll --filter=Category!=DotNetIgnore
66+
./dotnet-local.sh test bin/TestDebug/net7.0/Xamarin.Android.Build.Tests.dll
6767
```
6868

6969
To run ALL the supported [Device Integration Tests](#devive-integration-tests), run:
7070

7171
```sh
72-
./dotnet-local.sh test bin/TestDebug/MSBuildDeviceIntegration/net7.0/MSBuildDeviceIntegration.dll --filter=Category!=DotNetIgnore
72+
./dotnet-local.sh test bin/TestDebug/MSBuildDeviceIntegration/net7.0/MSBuildDeviceIntegration.dll
7373
```
7474

7575
If no Android device is attached, then the emulator will be created.
7676
The `ADB_TARGET` environment variable can be used to explicitly specify which
7777
Android device should be used when running Device Integration Tests.
7878

79-
NOTE: Not all tests work under .NET for Android yet. So we need to filter
80-
them on the `DotNetIgnore` category.
81-
8279
To run a specific test you can use the `Name=Value` argument for `--filter`,
8380

8481
```sh
@@ -106,22 +103,19 @@ To run ALL the [MSBuild Integration Tests](#msbuild-integration-tests) *and*
106103
all the [MSBuild Task Unit Tests](#msbuild-task-tests), run:
107104

108105
```cmd
109-
dotnet-local.cmd test bin\TestDebug\net7.0\Xamarin.Android.Build.Tests.dll --filter=Category!=DotNetIgnore
106+
dotnet-local.cmd test bin\TestDebug\net7.0\Xamarin.Android.Build.Tests.dll
110107
```
111108

112109
To run ALL the supported [Device Integration Tests](#devive-integration-tests), runs:
113110

114111
```cmd
115-
dotnet-local.cmd test bin\TestDebug\MSBuildDeviceIntegration\net7.0\MSBuildDeviceIntegration.dll --filter=Category!=DotNetIgnore
112+
dotnet-local.cmd test bin\TestDebug\MSBuildDeviceIntegration\net7.0\MSBuildDeviceIntegration.dll
116113
```
117114

118115
If no Android device is attached, then the emulator will be created.
119116
The `ADB_TARGET` environment variable can be used to explicitly specify which
120117
Android device should be used when running Device Integration Tests.
121118

122-
NOTE: Not all tests work under .NET for Android yet. So we need to filter
123-
them on the `DotNetIgnore` category.
124-
125119
To run a specific test you can use the `Name=Value` argument for the `--filter`,
126120

127121
```cmd

tests/Mono.Android-Tests/Java.Interop-Tests/Java.Interop-Tests.NET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<SignAssembly>true</SignAssembly>
1515
<AssemblyOriginatorKeyFile>..\..\..\product.snk</AssemblyOriginatorKeyFile>
1616
<DefineConstants>$(DefineConstants);NO_MARSHAL_MEMBER_BUILDER_SUPPORT</DefineConstants>
17-
<DefineConstants Condition=" '$(UseMonoRuntime)' == 'false' or '$(PublishAot)' == 'true' ">$(DefineConstants);NO_GC_BRIDGE_SUPPORT</DefineConstants>
17+
<DefineConstants Condition=" '$(PublishAot)' == 'true' ">$(DefineConstants);NO_GC_BRIDGE_SUPPORT</DefineConstants>
1818
<JavaInteropTestDirectory>$(JavaInteropSourceDirectory)\tests\Java.Interop-Tests\</JavaInteropTestDirectory>
1919
</PropertyGroup>
2020

tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
InetAccess excluded: https://github.com/dotnet/runtime/issues/73304
3131
NetworkInterfaces excluded: https://github.com/dotnet/runtime/issues/75155
3232
-->
33-
<ExcludeCategories>DotNetIgnore</ExcludeCategories>
3433
<!-- TODO: https://github.com/dotnet/android/issues/10069 -->
35-
<ExcludeCategories Condition=" '$(UseMonoRuntime)' == 'false' ">$(ExcludeCategories):CoreCLRIgnore:SSL:NTLM:GCBridge:RuntimeConfig</ExcludeCategories>
34+
<ExcludeCategories Condition=" '$(UseMonoRuntime)' == 'false' ">$(ExcludeCategories):CoreCLRIgnore:SSL:NTLM:RuntimeConfig</ExcludeCategories>
3635
<!-- TODO: https://github.com/dotnet/android/issues/10079 -->
3736
<ExcludeCategories Condition=" '$(PublishAot)' == 'true' ">$(ExcludeCategories):NativeAOTIgnore:SSL:NTLM:GCBridge:AndroidClientHandler:Export:NativeTypeMap</ExcludeCategories>
3837
<!-- FIXME: LLVMIgnore https://github.com/dotnet/runtime/issues/89190 -->

0 commit comments

Comments
 (0)