Skip to content

Commit a98016b

Browse files
Add some linux-arm test coverage (#98022)
1 parent 1bd0b5b commit a98016b

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,17 @@ extends:
6060
- osx_x64
6161
- osx_arm64
6262
- linux_x64
63+
- linux_arm
6364
- linux_arm64
6465
- linux_musl_x64
66+
- linux_musl_arm64
6567
jobParameters:
6668
testGroup: innerloop
6769
isSingleFile: true
6870
nameSuffix: NativeAOT_Libs
6971
buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:ArchiveTests=true /p:IlcUseServerGc=false
7072
timeoutInMinutes: 300 # doesn't normally take this long, but I've seen Helix queues backed up for 160 minutes
73+
includeAllPlatforms: true
7174
# extra steps, run tests
7275
postBuildSteps:
7376
- template: /eng/pipelines/libraries/helix.yml
@@ -162,6 +165,7 @@ extends:
162165
platforms:
163166
- windows_x64
164167
- linux_x64
168+
- linux_arm
165169
variables:
166170
- name: timeoutPerTestInMinutes
167171
value: 60

src/libraries/tests.proj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,10 @@
447447
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn4.4.Tests.csproj"
448448
Condition="'$(TargetOS)' == 'linux'" />
449449

450+
<!-- https://github.com/dotnet/runtime/issues/98795 -->
451+
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Globalization.Calendars.Tests\System.Globalization.Calendars.Tests.csproj"
452+
Condition="'$(TargetArchitecture)' == 'arm'" />
453+
450454
<!-- Not applicable to NativeAOT -->
451455
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.HostFactoryResolver\tests\Microsoft.Extensions.HostFactoryResolver.Tests.csproj" />
452456
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Loader\tests\DefaultContext\System.Runtime.Loader.DefaultContext.Tests.csproj" />

src/tests/issues.targets

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,6 +1160,16 @@
11601160
</ExcludeList>
11611161
</ItemGroup>
11621162

1163+
<!-- NativeAOT arm32 specific excludes -->
1164+
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetArchitecture)' == 'arm' or '$(AltJitArch)' == 'arm')">
1165+
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_*/**">
1166+
<Issue>https://github.com/dotnet/runtime/issues/95517</Issue>
1167+
</ExcludeList>
1168+
<ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/nullabletypes/castclassvaluetype_*/**">
1169+
<Issue>https://github.com/dotnet/runtime/issues/95517</Issue>
1170+
</ExcludeList>
1171+
</ItemGroup>
1172+
11631173
<!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.
11641174
Exclude these scripts to avoid creating such methods for the superpmicollect dependent test projects
11651175
and running them separately from superpmicollect test. These should be excluded regardless of RuntimeFlavor/os/arch-->

0 commit comments

Comments
 (0)