Skip to content

Commit ef67ba8

Browse files
github-actions[bot]MichalStrehovskyagocke
authored
[release/8.0] Add Native AOT Pri0 test leg (#91373)
* Pri0 test leg * wip * hm * Update Comparer_get_Default.csproj * Revert "wip" This reverts commit af025c0. * Add failing JIT test to issues.targets --------- Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com> Co-authored-by: Andy Gocke <andy@commentout.net>
1 parent 217be6c commit ef67ba8

File tree

4 files changed

+45
-0
lines changed

4 files changed

+45
-0
lines changed

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,44 @@ jobs:
193193
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
194194
eq(variables['isRollingBuild'], true))
195195
196+
#
197+
# CoreCLR NativeAOT checked build and Pri0 tests
198+
# Only when CoreCLR is changed
199+
#
200+
- template: /eng/pipelines/common/platform-matrix.yml
201+
parameters:
202+
jobTemplate: /eng/pipelines/common/global-build-job.yml
203+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
204+
buildConfig: Checked
205+
platforms:
206+
- windows_x64
207+
- linux_x64
208+
variables:
209+
- name: timeoutPerTestInMinutes
210+
value: 60
211+
- name: timeoutPerTestCollectionInMinutes
212+
value: 180
213+
jobParameters:
214+
timeoutInMinutes: 240
215+
nameSuffix: NativeAOT_Pri0
216+
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release
217+
extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
218+
extraStepsParameters:
219+
creator: dotnet-bot
220+
testBuildArgs: 'nativeaot /p:IlcUseServerGc=false'
221+
liveLibrariesBuildConfig: Release
222+
testRunNamePrefixSuffix: NativeAOT_Pri0_$(_BuildConfig)
223+
extraVariablesTemplates:
224+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
225+
parameters:
226+
testGroup: innerloop
227+
liveLibrariesBuildConfig: Release
228+
condition: >-
229+
or(
230+
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
231+
eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
232+
eq(variables['isRollingBuild'], true))
233+
196234
# Run net48 tests on win-x64
197235
- template: /eng/pipelines/common/platform-matrix.yml
198236
parameters:

src/tests/JIT/opt/Devirtualization/Comparer_get_Default.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Optimize>True</Optimize>
4+
5+
<!-- https://github.com/dotnet/runtime/issues/89918 -->
6+
<NativeAotIncompatible>true</NativeAotIncompatible>
47
</PropertyGroup>
58
<ItemGroup>
69
<Compile Include="Comparer_get_Default.cs" />

src/tests/build.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@
595595
<GroupBuildCmd Condition="'$(CrossBuild)' == 'true'">$(GroupBuildCmd) "/p:CrossBuild=true"</GroupBuildCmd>
596596
<GroupBuildCmd Condition="'$(TestBuildMode)' == 'nativeaot'">$(GroupBuildCmd) "/p:DefaultBuildAllTarget=BuildNativeAot"</GroupBuildCmd>
597597
<GroupBuildCmd Condition="'$(IlcMultiModule)' == 'true'">$(GroupBuildCmd) "/p:IlcMultiModule=true"</GroupBuildCmd>
598+
<GroupBuildCmd Condition="'$(IlcUseServerGc)' == 'false'">$(GroupBuildCmd) "/p:IlcUseServerGc=false"</GroupBuildCmd>
598599
<GroupBuildCmd Condition="'$(BuildNativeAotFrameworkObjects)' == 'true'">$(GroupBuildCmd) "/p:BuildNativeAotFrameworkObjects=true"</GroupBuildCmd>
599600
</PropertyGroup>
600601

src/tests/issues.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,9 @@
694694

695695
<!-- NativeAOT specific -->
696696
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
697+
<ExcludeList Condition="'$(RuntimeConfiguration)' == 'checked'" Include="$(XunitTestBinBase)/JIT/Generics/Exceptions/GenericCatchInterfaceProgram/**">
698+
<Issue>https://github.com/dotnet/runtime/issues/90848</Issue>
699+
</ExcludeList>
697700
<ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/StaticVirtualMethods/Regression/GetInterfaceMapWithStaticVirtualsAndConstraints/**">
698701
<Issue>https://github.com/dotnet/runtime/issues/89157</Issue>
699702
</ExcludeList>

0 commit comments

Comments
 (0)