Skip to content

Commit 2a01331

Browse files
kotlarmiloskotlarmilos
committed
Add runtime and library tests for Apple mobile on CoreCLR
1 parent 8cf1f91 commit 2a01331

File tree

4 files changed

+136
-7
lines changed

4 files changed

+136
-7
lines changed

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

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,51 @@ jobs:
168168
buildAllTestsAsStandalone: true
169169

170170
#
171-
# Build the whole product using CoreCLR and run functional tests
171+
# Build the whole product using CoreCLR and run runtime tests
172+
#
173+
- template: /eng/pipelines/common/platform-matrix.yml
174+
parameters:
175+
jobTemplate: /eng/pipelines/common/global-build-job.yml
176+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
177+
buildConfig: Checked
178+
runtimeFlavor: coreclr
179+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
180+
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
181+
platforms:
182+
- ios_arm64
183+
- tvos_arm64
184+
variables:
185+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
186+
- name: _HelixSource
187+
value: pr/dotnet/runtime/$(Build.SourceBranch)
188+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
189+
- name: _HelixSource
190+
value: ci/dotnet/runtime/$(Build.SourceBranch)
191+
- name: timeoutPerTestInMinutes
192+
value: 60
193+
- name: timeoutPerTestCollectionInMinutes
194+
value: 180
195+
jobParameters:
196+
testGroup: innerloop
197+
nameSuffix: AllSubsets_CoreCLR_RuntimeTests
198+
buildArgs: -s clr+libs -c $(_BuildConfig)
199+
timeoutInMinutes: 240
200+
# extra steps, run tests
201+
extraVariablesTemplates:
202+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
203+
parameters:
204+
testGroup: innerloop
205+
postBuildSteps:
206+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
207+
parameters:
208+
creator: dotnet-bot
209+
testBuildArgs: /p:DevTeamProvisioning=- /p:RunAOTCompilation=false /p:UseMonoRuntime=false /p:MonoForceInterpreter=false /p:UseNativeAOTRuntime=false /p:BuildTestsOnHelix=true
210+
compileOnHelix: true
211+
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
212+
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
213+
214+
#
215+
# Build the whole product using CoreCLR and run library tests
172216
#
173217
- template: /eng/pipelines/common/platform-matrix.yml
174218
parameters:
@@ -191,7 +235,7 @@ jobs:
191235
jobParameters:
192236
testGroup: innerloop
193237
nameSuffix: AllSubsets_CoreCLR
194-
buildArgs: -s clr+clr.runtime+libs+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=false /p:UseMonoRuntime=false /p:MonoForceInterpreter=false /p:BuildTestsOnHelix=false /p:UseNativeAOTRuntime=false /p:RunSmokeTestsOnly=true
238+
buildArgs: -s clr+clr.runtime+libs+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=false $(_runSmokeTestsOnlyArg) /p:UseMonoRuntime=false /p:MonoForceInterpreter=false /p:BuildTestsOnHelix=false /p:UseNativeAOTRuntime=false
195239
timeoutInMinutes: 120
196240
# extra steps, run tests
197241
postBuildSteps:

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

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,50 @@ jobs:
135135
buildAllTestsAsStandalone: true
136136

137137
#
138-
# Build the whole product using CoreCLR and run functional tests
138+
# Build the whole product using CoreCLR and run runtime tests
139+
#
140+
- template: /eng/pipelines/common/platform-matrix.yml
141+
parameters:
142+
jobTemplate: /eng/pipelines/common/global-build-job.yml
143+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
144+
buildConfig: Checked
145+
runtimeFlavor: coreclr
146+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
147+
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
148+
platforms:
149+
- iossimulator_arm64
150+
variables:
151+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
152+
- name: _HelixSource
153+
value: pr/dotnet/runtime/$(Build.SourceBranch)
154+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
155+
- name: _HelixSource
156+
value: ci/dotnet/runtime/$(Build.SourceBranch)
157+
- name: timeoutPerTestInMinutes
158+
value: 60
159+
- name: timeoutPerTestCollectionInMinutes
160+
value: 180
161+
jobParameters:
162+
testGroup: innerloop
163+
nameSuffix: AllSubsets_CoreCLR_RuntimeTests
164+
buildArgs: -s clr+libs -c $(_BuildConfig)
165+
timeoutInMinutes: 240
166+
# extra steps, run tests
167+
extraVariablesTemplates:
168+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
169+
parameters:
170+
testGroup: innerloop
171+
postBuildSteps:
172+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
173+
parameters:
174+
creator: dotnet-bot
175+
testBuildArgs: /p:DevTeamProvisioning=- /p:RunAOTCompilation=false /p:UseMonoRuntime=false /p:MonoForceInterpreter=false /p:UseNativeAOTRuntime=false /p:BuildTestsOnHelix=true
176+
compileOnHelix: true
177+
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
178+
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
179+
180+
#
181+
# Build the whole product using CoreCLR and run library tests
139182
#
140183
- template: /eng/pipelines/common/platform-matrix.yml
141184
parameters:
@@ -158,7 +201,7 @@ jobs:
158201
jobParameters:
159202
testGroup: innerloop
160203
nameSuffix: AllSubsets_CoreCLR
161-
buildArgs: -s clr+clr.runtime+libs+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=false /p:UseMonoRuntime=false /p:MonoForceInterpreter=false /p:RunSmokeTestsOnly=true
204+
buildArgs: -s clr+clr.runtime+libs+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=false /p:UseMonoRuntime=false /p:MonoForceInterpreter=false
162205
timeoutInMinutes: 120
163206
# extra steps, run tests
164207
postBuildSteps:

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

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,50 @@ jobs:
204204
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
205205

206206
#
207-
# Build the whole product using CoreCLR and run functional tests
207+
# Build the whole product using CoreCLR and run runtime tests
208+
#
209+
- template: /eng/pipelines/common/platform-matrix.yml
210+
parameters:
211+
jobTemplate: /eng/pipelines/common/global-build-job.yml
212+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
213+
buildConfig: Checked
214+
runtimeFlavor: coreclr
215+
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
216+
isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }}
217+
platforms:
218+
- maccatalyst_x64
219+
- maccatalyst_arm64
220+
variables:
221+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
222+
- name: _HelixSource
223+
value: pr/dotnet/runtime/$(Build.SourceBranch)
224+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
225+
- name: _HelixSource
226+
value: ci/dotnet/runtime/$(Build.SourceBranch)
227+
- name: timeoutPerTestInMinutes
228+
value: 60
229+
- name: timeoutPerTestCollectionInMinutes
230+
value: 180
231+
jobParameters:
232+
testGroup: innerloop
233+
nameSuffix: AllSubsets_CoreCLR_RuntimeTests
234+
buildArgs: -s clr+libs -c $(_BuildConfig)
235+
timeoutInMinutes: 240
236+
# extra steps, run tests
237+
extraVariablesTemplates:
238+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
239+
parameters:
240+
testGroup: innerloop
241+
postBuildSteps:
242+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
243+
parameters:
244+
creator: dotnet-bot
245+
testBuildArgs: /p:DevTeamProvisioning=- /p:RunAOTCompilation=false /p:UseMonoRuntime=false /p:MonoForceInterpreter=false /p:UseNativeAOTRuntime=false
246+
compileOnHelix: true
247+
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
248+
249+
#
250+
# Build the whole product using CoreCLR and run library tests
208251
#
209252
- template: /eng/pipelines/common/platform-matrix.yml
210253
parameters:
@@ -227,7 +270,7 @@ jobs:
227270
jobParameters:
228271
testGroup: innerloop
229272
nameSuffix: AllSubsets_CoreCLR
230-
buildArgs: -s clr+clr.runtime+libs+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=false /p:UseMonoRuntime=false /p:MonoForceInterpreter=false /p:BuildTestsOnHelix=false /p:UseNativeAOTRuntime=false /p:RunSmokeTestsOnly=true
273+
buildArgs: -s clr+clr.runtime+libs+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=false /p:UseMonoRuntime=false /p:MonoForceInterpreter=false /p:BuildTestsOnHelix=false /p:UseNativeAOTRuntime=false
231274
timeoutInMinutes: 120
232275
# extra steps, run tests
233276
postBuildSteps:

‎src/libraries/tests.proj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,6 @@
618618
</ItemGroup>
619619

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

0 commit comments

Comments
 (0)