Skip to content

Commit 1555332

Browse files
kotlarmilosCopilot
andcommitted
Run a curated NativeAOT subset on Apple-mobile extra-platforms
The full library set (~150 projects) does not fit in 240-minute AzDO budget on iossimulator/maccatalyst/tvos NativeAOT (Build product: ILC + Xcode link/bundle per project times out repeatedly). - runtime.yml NativeAOT_Smoke legs keep /p:RunSmokeTestsOnly=true and run System.Runtime.Tests + iOS functional tests. - extra-platforms NativeAOT legs drop /p:RunSmokeTestsOnly=true and use a new explicit ProjectReference list in src/libraries/tests.proj (gated on TargetsAppleMobile && UseNativeAOTRuntime) which references 9 representative library tests (Runtime, Collections, Linq, Threading, Threading.Tasks, IO.FileSystem, RegularExpressions, Text.Json, Net.Http) instead of the wildcard. Timeout reverted to 180 minutes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 50686ad commit 1555332

4 files changed

Lines changed: 18 additions & 5 deletions

File tree

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
testGroup: innerloop
118118
nameSuffix: AllSubsets_NativeAOT
119119
buildArgs: --cross -s clr.alljits+clr.tools+clr.nativeaotruntime+clr.nativeaotlibs+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:BuildTestsOnHelix=true /p:UseNativeAOTRuntime=true /p:RunAOTCompilation=false /p:ContinuousIntegrationBuild=true
120-
timeoutInMinutes: 240
120+
timeoutInMinutes: 180
121121
# extra steps, run tests
122122
postBuildSteps:
123123
- template: /eng/pipelines/libraries/helix.yml

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
testGroup: innerloop
113113
nameSuffix: AllSubsets_NativeAOT
114114
buildArgs: --cross -s clr.alljits+clr.tools+clr.nativeaotruntime+clr.nativeaotlibs+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:BuildTestsOnHelix=true /p:UseNativeAOTRuntime=true /p:RunAOTCompilation=false /p:ContinuousIntegrationBuild=true
115-
timeoutInMinutes: 240
115+
timeoutInMinutes: 180
116116
# extra steps, run tests
117117
postBuildSteps:
118118
- template: /eng/pipelines/libraries/helix.yml

eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
testGroup: innerloop
150150
nameSuffix: AllSubsets_NativeAOT
151151
buildArgs: --cross -s clr.alljits+clr.tools+clr.nativeaotruntime+clr.nativeaotlibs+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=adhoc /p:BuildTestsOnHelix=true /p:UseNativeAOTRuntime=true /p:RunAOTCompilation=false /p:ContinuousIntegrationBuild=true
152-
timeoutInMinutes: 240
152+
timeoutInMinutes: 180
153153
# extra steps, run tests
154154
postBuildSteps:
155155
- template: /eng/pipelines/libraries/helix.yml
@@ -182,7 +182,7 @@ jobs:
182182
testGroup: innerloop
183183
nameSuffix: AllSubsets_NativeAOT_AppSandbox
184184
buildArgs: --cross -s clr.alljits+clr.tools+clr.nativeaotruntime+clr.nativeaotlibs+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=adhoc /p:BuildTestsOnHelix=true /p:UseNativeAOTRuntime=true /p:RunAOTCompilation=false /p:ContinuousIntegrationBuild=true /p:EnableAppSandbox=true
185-
timeoutInMinutes: 240
185+
timeoutInMinutes: 180
186186
# extra steps, run tests
187187
postBuildSteps:
188188
- template: /eng/pipelines/libraries/helix.yml

src/libraries/tests.proj

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,8 +714,9 @@
714714

715715
<ProjectReference Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj"
716716
Exclude="@(ProjectExclusions)"
717-
Condition="'$(TestAssemblies)' == 'true'"
717+
Condition="'$(TestAssemblies)' == 'true' and !('$(TargetsAppleMobile)' == 'true' and '$(UseNativeAOTRuntime)' == 'true')"
718718
BuildInParallel="$(BuildTestInParallel)" />
719+
719720
<ProjectReference Include="$(MSBuildThisFileDirectory)testPackages\testPackages.proj"
720721
Condition="'$(TestPackages)' == 'true'" />
721722

@@ -741,6 +742,18 @@
741742
BuildInParallel="false" />
742743
</ItemGroup>
743744

745+
<ItemGroup Condition="'$(RunSmokeTestsOnly)' != 'true' and '$(TestAssemblies)' == 'true' and '$(TargetsAppleMobile)' == 'true' and '$(UseNativeAOTRuntime)' == 'true'">
746+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System.Runtime.Tests.csproj" />
747+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Collections\tests\System.Collections.Tests.csproj" />
748+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Linq\tests\System.Linq.Tests.csproj" />
749+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Threading\tests\System.Threading.Tests.csproj" />
750+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Threading.Tasks.Tests\System.Threading.Tasks.Tests.csproj" />
751+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.IO.FileSystem.Tests\System.IO.FileSystem.Tests.csproj" />
752+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
753+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
754+
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Net.Http\tests\FunctionalTests\System.Net.Http.Functional.Tests.csproj" />
755+
</ItemGroup>
756+
744757
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'ios' and '$(RunAOTCompilation)' == 'true'">
745758
<!-- Only System.Runtime tests on iOS for now -->
746759
<ProjectReference Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests\System.Runtime.Tests.csproj" />

0 commit comments

Comments
 (0)