Skip to content

Commit d56723b

Browse files
kotlarmiloskotlarmilos
authored
[nativeaot][ios] Improve Native AOT test coverage on apple mobile platforms (#89301)
* Enable TestLinqExpressions test * Test maccatalyst job on Native AOT * Test other smoke runtime tests on Native AOT * Add tracking issue for disabled tests
1 parent 5eb82ac commit d56723b

16 files changed

+30
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,5 @@ jobs:
121121
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
122122
extraStepsParameters:
123123
creator: dotnet-bot
124-
testBuildArgs: tree nativeaot/SmokeTests/UnitTests /p:BuildNativeAOTRuntimePack=true
124+
testBuildArgs: tree nativeaot/SmokeTests /p:BuildNativeAOTRuntimePack=true
125125
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,5 +130,5 @@ jobs:
130130
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
131131
extraStepsParameters:
132132
creator: dotnet-bot
133-
testBuildArgs: tree nativeaot/SmokeTests/UnitTests /p:BuildNativeAOTRuntimePack=true
133+
testBuildArgs: tree nativeaot/SmokeTests /p:BuildNativeAOTRuntimePack=true
134134
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)

‎src/tests/nativeaot/SmokeTests/Exceptions/Exceptions.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<CLRTestPriority>0</CLRTestPriority>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<ServerGarbageCollection>true</ServerGarbageCollection>
8+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
9+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
810
</PropertyGroup>
911
<ItemGroup>
1012
<Compile Include="Exceptions.cs" />

‎src/tests/nativeaot/SmokeTests/FrameworkStrings/Baseline.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<OutputType>Exe</OutputType>
44
<CLRTestKind>BuildAndRun</CLRTestKind>
55
<CLRTestPriority>0</CLRTestPriority>
6+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
7+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
68
</PropertyGroup>
79
<ItemGroup>
810
<Compile Include="Program.cs" />

‎src/tests/nativeaot/SmokeTests/FrameworkStrings/UseSystemResourceKeys.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
<!-- Requires the framework to also be compiled with UseSystemResourceKeys -->
99
<CLRTestTargetUnsupported Condition="'$(IlcMultiModule)' == 'true'">true</CLRTestTargetUnsupported>
10+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
11+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
1012
</PropertyGroup>
1113

1214
<ItemGroup>

‎src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64'">true</CLRTestTargetUnsupported>
77
<!-- Sanitizers increase the binary size, so it ends up outside of our expected range. -->
88
<CLRTestTargetUnsupported Condition="'$(EnableNativeSanitizers)' != ''">true</CLRTestTargetUnsupported>
9+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
911
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1012
<DefineConstants>$(DefineConstants);AVX_INTRINSICS;VECTORT128_INTRINSICS</DefineConstants>
1113
</PropertyGroup>

‎src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx2.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64'">true</CLRTestTargetUnsupported>
77
<!-- Sanitizers increase the binary size, so it ends up outside of our expected range. -->
88
<CLRTestTargetUnsupported Condition="'$(EnableNativeSanitizers)' != ''">true</CLRTestTargetUnsupported>
9+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
911
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1012
<DefineConstants>$(DefineConstants);AVX2_INTRINSICS;VECTORT256_INTRINSICS</DefineConstants>
1113
</PropertyGroup>

‎src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx512.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
<OutputType>Exe</OutputType>
44
<CLRTestKind>BuildAndRun</CLRTestKind>
55
<CLRTestPriority>0</CLRTestPriority>
6-
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64' OR '$(TargetsOSX)' == 'true'">true</CLRTestTargetUnsupported>
6+
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64' or '$(TargetsOSX)' == 'true'">true</CLRTestTargetUnsupported>
77
<!-- Sanitizers increase the binary size, so it ends up outside of our expected range. -->
88
<CLRTestTargetUnsupported Condition="'$(EnableNativeSanitizers)' != ''">true</CLRTestTargetUnsupported>
9+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
911
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1012
<DefineConstants>$(DefineConstants);AVX512_INTRINSICS;VECTORT256_INTRINSICS</DefineConstants>
1113
</PropertyGroup>

‎src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Avx_NoAvx2.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64'">true</CLRTestTargetUnsupported>
77
<!-- Sanitizers increase the binary size, so it ends up outside of our expected range. -->
88
<CLRTestTargetUnsupported Condition="'$(EnableNativeSanitizers)' != ''">true</CLRTestTargetUnsupported>
9+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
911
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1012
<DefineConstants>$(DefineConstants);AVX_INTRINSICS;VECTORT128_INTRINSICS</DefineConstants>
1113
</PropertyGroup>

‎src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Baseline.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64'">true</CLRTestTargetUnsupported>
77
<!-- Sanitizers increase the binary size, so it ends up outside of our expected range. -->
88
<CLRTestTargetUnsupported Condition="'$(EnableNativeSanitizers)' != ''">true</CLRTestTargetUnsupported>
9+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
911
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1012
<DefineConstants>$(DefineConstants);BASELINE_INTRINSICS;VECTORT128_INTRINSICS</DefineConstants>
1113
</PropertyGroup>

‎src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Sse42.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x64'">true</CLRTestTargetUnsupported>
77
<!-- Sanitizers increase the binary size, so it ends up outside of our expected range. -->
88
<CLRTestTargetUnsupported Condition="'$(EnableNativeSanitizers)' != ''">true</CLRTestTargetUnsupported>
9+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
911
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1012
<DefineConstants>$(DefineConstants);SSE42_INTRINSICS;VECTORT128_INTRINSICS</DefineConstants>
1113
</PropertyGroup>

‎src/tests/nativeaot/SmokeTests/PInvoke/PInvoke.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
<!-- Look for MULTIMODULE_BUILD #define for the more specific incompatible parts -->
1010
<CLRTestTargetUnsupported Condition="'$(IlcMultiModule)' == 'true'">true</CLRTestTargetUnsupported>
11+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
12+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
1113
</PropertyGroup>
1214
<ItemGroup>
1315
<Compile Include="PInvoke.cs" />

‎src/tests/nativeaot/SmokeTests/Reflection/Reflection_FromUsage.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
<!-- Look for MULTIMODULE_BUILD #define for the more specific incompatible parts -->
1414
<CLRTestTargetUnsupported Condition="'$(IlcMultiModule)' == 'true'">true</CLRTestTargetUnsupported>
15+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
16+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
1517

1618
<IlcTrimMetadata>false</IlcTrimMetadata>
1719
</PropertyGroup>

‎src/tests/nativeaot/SmokeTests/SharedLibrary/SharedLibrary.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<CLRTestPriority>0</CLRTestPriority>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<NativeLib>Shared</NativeLib>
8+
<!-- Unable to compile a project with the Library output type for apple mobile devices -->
9+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
810
</PropertyGroup>
911

1012
<PropertyGroup>

‎src/tests/nativeaot/SmokeTests/StackTraceMetadata/StackTraceMetadata_Stripped.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<InvariantGlobalization>true</InvariantGlobalization>
88
<CLRTestTargetUnsupported Condition="'$(IlcMultiModule)' == 'true'">true</CLRTestTargetUnsupported>
9+
<!-- Test infra issue on apple devices: https://github.com/dotnet/runtime/issues/89917 -->
10+
<CLRTestTargetUnsupported Condition="'$(TargetsAppleMobile)' == 'true'">true</CLRTestTargetUnsupported>
911
<DefineConstants>$(DefineConstants);STRIPPED</DefineConstants>
1012
<StackTraceSupport>false</StackTraceSupport>
1113
</PropertyGroup>

‎src/tests/nativeaot/SmokeTests/UnitTests/Delegates.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,7 @@ public static int Run()
5151
result = Fail;
5252
}
5353

54-
// ActiveIssue https://github.com/dotnet/runtime/issues/87924
55-
if (!OperatingSystem.IsIOS() && !OperatingSystem.IsTvOS() && !OperatingSystem.IsMacCatalyst())
56-
{
57-
TestLinqExpressions.Run();
58-
}
59-
54+
TestLinqExpressions.Run();
6055
TestDefaultInterfaceMethods.Run();
6156

6257
return result;

0 commit comments

Comments
 (0)