Skip to content

Commit c158ff4

Browse files
authored
[Android] Add CoreCLR smoke tests for Android (#116540)
* Add CoreCLR build and test jobs for Android * Add smoke tests for CoreCLR Android * Remove CoreCLR Android runtime tests * Fix formatting * Reorder smoke test projects * Add functional tests as smoke test * Disable failing tests
1 parent 1c2cef4 commit c158ff4

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/libraries/tests.proj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,15 @@
607607
<SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Net.Http\tests\FunctionalTests\System.Net.Http.Functional.Tests.csproj" />
608608
</ItemGroup>
609609

610+
<ItemGroup Condition="'$(TargetOS)' == 'android' and '$(RuntimeFlavor)' == 'CoreCLR'">
611+
<SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices\tests\System.Runtime.InteropServices.UnitTests\System.Runtime.InteropServices.Tests.csproj" />
612+
<SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Tests\System.Globalization.Tests.csproj" />
613+
<SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Net.Mail\tests\Functional\System.Net.Mail.Functional.Tests.csproj" />
614+
<SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\System.Diagnostics.DiagnosticSource.Tests.csproj" />
615+
<SmokeTestProject Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing\tests\System.Diagnostics.Tracing.Tests.csproj" />
616+
<SmokeTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\JIT\*.Test.csproj"/>
617+
</ItemGroup>
618+
610619
<!--
611620
There is a decent number of hidden tests that fail with TestReadyToRun, and
612621
it's proven to be a neverending task to flush all of them at once. So, we will
@@ -749,13 +758,6 @@
749758
AdditionalProperties="%(AdditionalProperties);_IsPublishing=true;Configuration=Release;PublishDir=$(XUnitLogCheckerLibrariesOutDir);ROOTFS_DIR=$(ROOTFS_DIR);RuntimeIdentifier=$(TargetRid)" />
750759
</ItemGroup>
751760

752-
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'android' and '$(RuntimeFlavor)' == 'CoreCLR'">
753-
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\JIT\Android.Device_Emulator.JIT.Test.csproj"
754-
BuildInParallel="false" />
755-
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\Android\Device_Emulator\JIT\Android.Device_Emulator.JIT.Static.Test.csproj"
756-
BuildInParallel="false" />
757-
</ItemGroup>
758-
759761
<Target Name="GenerateMergedCoverageReport"
760762
AfterTargets="Test"
761763
DependsOnTargets="GenerateCoverageReport"

0 commit comments

Comments
 (0)