Skip to content

[clr-ios] Add R2R and interpreter functional tests on iOS #122036

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

Merged
kotlarmilos merged 19 commits into from
Dec 5, 2025
Merged

[clr-ios] Add R2R and interpreter functional tests on iOS #122036

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
963242f
Add R2R functional test on iOS
kotlarmilos Nov 28, 2025
007a6d3
Rename project files
kotlarmilos Nov 28, 2025
c687585
Update MainLibraryFileName in iOS test projects
kotlarmilos Nov 28, 2025
3e58c2b
Rename project file
kotlarmilos Dec 1, 2025
520dd15
Disable R2R in interp-only test
kotlarmilos Dec 1, 2025
34feb56
Refactor import condition for AppleBuild.InTree.targets in iOS R2R te…
kotlarmilos Dec 1, 2025
5ce0f1e
Remove conditional import of AppleBuild.InTree.targets for iOS R2R te…
kotlarmilos Dec 1, 2025
2addc57
Refactor iOS build configuration to use CrossGen props/targets
kotlarmilos Dec 2, 2025
e33f99d
Override R2R-related targets in the SDK
kotlarmilos Dec 2, 2025
f474dfb
Revert changes
kotlarmilos Dec 2, 2025
d9d1c98
Remove unnecessary environment variable for ReadyToRun
kotlarmilos Dec 2, 2025
9c61b72
Add AppleBuild.ReadyToRun.targets
kotlarmilos Dec 2, 2025
47558eb
Add environment variable to disable ReadyToRun for iOS interpreter test
kotlarmilos Dec 2, 2025
a4b4e75
Add environment variable to control ReadyToRun behavior for iOS tests
kotlarmilos Dec 3, 2025
64a0599
Add IsFunctionalTest property to iOS Device build configuration
kotlarmilos Dec 3, 2025
0bbc29c
Revert changes
kotlarmilos Dec 3, 2025
344780e
Fix path
kotlarmilos Dec 3, 2025
4e7496c
Use TargetsAppleMobile
kotlarmilos Dec 4, 2025
30af4ac
Merge branch 'main' into improvement/clr-ios-r2r-test
kotlarmilos Dec 5, 2025
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
6 changes: 3 additions & 3 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@
<ProjectExclusions Include="$(RepoRoot)/src/tests/FunctionalTests/iOS/Simulator/LibraryMode/iOS.Simulator.LibraryMode.Test.csproj" />
</ItemGroup>

<ItemGroup Condition="('$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvossimulator') and ('$(RuntimeFlavor)' == 'Mono' or '$(UseNativeAOTRuntime)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR.Interpreter\*.Test.csproj" />
<ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator') and ('$(RuntimeFlavor)' == 'Mono' or '$(UseNativeAOTRuntime)' == 'true') and '$(RunDisablediOSTests)' != 'true'">
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR\*.Test.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'browser' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' != 'true'">
Expand Down Expand Up @@ -631,7 +631,7 @@

<ItemGroup Condition="('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'maccatalyst') and '$(RuntimeFlavor)' == 'CoreCLR' and '$(UseNativeAOTRuntime)' != 'true'">
<SmokeTestProject Remove="@(SmokeTestProject)" />
<SmokeTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR.Interpreter\*.Test.csproj"/>
<SmokeTestProject Include="$(RepoRoot)\src\tests\FunctionalTests\iOS\Simulator\CoreCLR\*.Test.csproj"/>
</ItemGroup>

<!--
Expand Down
15 changes: 0 additions & 15 deletions src/mono/msbuild/apple/build/AppleBuild.InTree.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,4 @@
</ItemGroup>
<Message Text="Used runtime pack: %(ResolvedRuntimePack.PackageDirectory)" Importance="high" />
</Target>

<!-- Override the ResolveReadyToRunCompilers target to use the in-build crossgen2.
This needs to be imported after SDK targets, so any project requiring this should set AfterMicrosoftNETSdkTargets -->
<Target Name="ResolveReadyToRunCompilers" Condition="'$(PublishReadyToRun)' == true" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
<PropertyGroup>
<Crossgen2Path>$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)'))</Crossgen2Path>
</PropertyGroup>

<ItemGroup>
<Crossgen2Tool Include="$(Crossgen2Path)"
TargetArch="$(TargetArchitecture)"
TargetOS="$(TargetOS)"
PerfmapFormatVersion="$(PublishReadyToRunPerfmapFormatVersion)"/>
</ItemGroup>
</Target>
</Project>
17 changes: 17 additions & 0 deletions src/mono/msbuild/apple/build/AppleBuild.ReadyToRun.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
Override the ResolveReadyToRunCompilers target to use the in-build crossgen2.
This needs to be imported after SDK targets, so any project requiring this should set AfterMicrosoftNETSdkTargets -->
<Target Name="ResolveReadyToRunCompilers" Condition="'$(PublishReadyToRun)' == true" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
<PropertyGroup>
<Crossgen2Path>$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)'))</Crossgen2Path>
</PropertyGroup>

<ItemGroup>
<Crossgen2Tool Include="$(Crossgen2Path)"
TargetArch="$(TargetArchitecture)"
TargetOS="$(TargetOS)"
PerfmapFormatVersion="$(PublishReadyToRunPerfmapFormatVersion)"/>
</ItemGroup>
</Target>
</Project>
18 changes: 18 additions & 0 deletions src/mono/msbuild/apple/build/AppleBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@
<MonoForceInterpreter Condition="'$(MonoForceInterpreter)' == ''">true</MonoForceInterpreter>
</PropertyGroup>

<PropertyGroup Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
<PublishReadyToRunContainerFormat>macho</PublishReadyToRunContainerFormat>
</PropertyGroup>

<ItemGroup Condition="'$(PublishReadyToRun)' != 'true' and '$(UseMonoRuntime)' != 'true'">
<EnvironmentVariables Include="DOTNET_ReadyToRun=0" />
</ItemGroup>

<!-- Tracking issue: https://github.com/dotnet/runtime/issues/119006
ReadyToRun settings for CoreCLR on Apple platforms.
This can be removed once we upstream Mach-O support in the targets to the SDK -->
<Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
<PropertyGroup Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">
<AfterMicrosoftNETSdkTargets Condition="'$(Crossgen2SdkOverrideTargetsPath)' != ''">$(AfterMicrosoftNETSdkTargets);$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.ReadyToRun.targets</AfterMicrosoftNETSdkTargets>
</PropertyGroup>

<PropertyGroup>
<iOSLikeDedup Condition="'$(iOSLikeDedup)' == '' and '$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'">true</iOSLikeDedup>
<RuntimeIdentifier>$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())</RuntimeIdentifier>
Expand Down
13 changes: 0 additions & 13 deletions src/mono/sample/iOS/Program.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,11 @@
<BuildAppBundleDependsOnTargets Condition="'$(ArchiveTests)' == 'true'">Publish</BuildAppBundleDependsOnTargets>
</PropertyGroup>

<PropertyGroup Condition="'$(PublishReadyToRun)' == 'true' and '$(UseMonoRuntime)' != 'true'">
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
<PublishReadyToRunContainerFormat>macho</PublishReadyToRunContainerFormat>
</PropertyGroup>

<ItemGroup>
<RuntimeComponents Condition="'$(DiagnosticPorts)' != ''" Include="diagnostics_tracing" />
</ItemGroup>

<!-- Use the repo's CrossGen props/targets.
This can be removed once we upstream Mach-O support in the targets to the SDK -->
<Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverridePropsPath)' != ''" />
<Import Project="$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.props" />
<PropertyGroup>
<!-- Import after SDK targets in order to override R2R-related targets in the SDK -->
<AfterMicrosoftNETSdkTargets Condition="'$(PublishReadyToRun)' == 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''">$(Crossgen2SdkOverrideTargetsPath)</AfterMicrosoftNETSdkTargets>
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MonoProjectRoot)\msbuild\apple\build\AppleBuild.InTree.targets</AfterMicrosoftNETSdkTargets>
</PropertyGroup>

<Target Name="BuildAppBundle" AfterTargets="$(BuildAppBundleAfterTargets)" DependsOnTargets="$(BuildAppBundleDependsOnTargets)"/>
<Target Name="_SetAppleGenerateAppBundleProps" Condition="'$(TargetOS)' != 'ios' and '$(ArchiveTests)' != 'true'" BeforeTargets="_AppleGenerateAppBundle">
Expand Down
2 changes: 1 addition & 1 deletion src/tests/FunctionalTests/iOS/Device/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
</PropertyGroup>

<Import Project="..\..\..\..\libraries\Directory.Build.props" />
</Project>
</Project>
0 .../Simulator/CoreCLR.Interpreter/Program.cs → ...nalTests/iOS/Simulator/CoreCLR/Program.cs
View file
Open in desktop
File renamed without changes.
6 changes: 1 addition & 5 deletions ...Simulator.CoreCLR.Interpreter.Test.csproj → ...reCLR/iOS.CoreCLR.Interpreter.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,11 @@
<TestRuntime>true</TestRuntime>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<TargetOS Condition="'$(TargetOS)' == ''">iossimulator</TargetOS>
<MainLibraryFileName>iOS.Simulator.CoreCLR.Interpreter.Test.dll</MainLibraryFileName>
<MainLibraryFileName>iOS.CoreCLR.Interpreter.Test.dll</MainLibraryFileName>
<IncludesTestRunner>false</IncludesTestRunner>
<ExpectedExitCode>42</ExpectedExitCode>
</PropertyGroup>

<ItemGroup>
<EnvironmentVariables Include="DOTNET_InterpMode=3" />
</ItemGroup>

<ItemGroup>
<Compile Include="Program.cs" />
</ItemGroup>
Expand Down
19 changes: 19 additions & 0 deletions src/tests/FunctionalTests/iOS/Simulator/CoreCLR/iOS.CoreCLR.R2R.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<UseMonoRuntime>false</UseMonoRuntime>
<MonoForceInterpreter>false</MonoForceInterpreter>
<RunAOTCompilation>false</RunAOTCompilation>
<TestRuntime>true</TestRuntime>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<TargetOS Condition="'$(TargetOS)' == ''">iossimulator</TargetOS>
<MainLibraryFileName>iOS.CoreCLR.R2R.Test.dll</MainLibraryFileName>
<IncludesTestRunner>false</IncludesTestRunner>
<ExpectedExitCode>42</ExpectedExitCode>
<PublishReadyToRun>true</PublishReadyToRun>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.cs" />
</ItemGroup>
</Project>
Loading