Skip to content

Commit 2e5d409

Browse files
authored
Disable building Swift interop tests on macOS with Native AOT (#98667)
* Disable Swift interop tests on macOS with Native AOT * Disable building Swift interop tests with Native AOT * Remove redundant ExcludeList item * Update CLRTestTargetUnsupported property
1 parent cf56f72 commit 2e5d409

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
<!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
44
<RequiresProcessIsolation>true</RequiresProcessIsolation>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6-
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/93631 -->
6+
<!-- Swift interop is supported on Apple platforms only -->
77
<CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
8+
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/93631 -->
9+
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' != 'mono'">true</CLRTestTargetUnsupported>
810
</PropertyGroup>
911
<ItemGroup>
1012
<Compile Include="$(MSBuildProjectName).cs" />

src/tests/Interop/Swift/SwiftInvalidCallConv/SwiftInvalidCallConv.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
<!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
44
<RequiresProcessIsolation>true</RequiresProcessIsolation>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6-
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/93631 -->
6+
<!-- Swift interop is supported on Apple platforms only -->
77
<CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
8+
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/93631 -->
9+
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' != 'mono'">true</CLRTestTargetUnsupported>
810
</PropertyGroup>
911
<ItemGroup>
1012
<Compile Include="$(MSBuildProjectName).cs" />

src/tests/Interop/Swift/SwiftSelfContext/SwiftSelfContext.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
<!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
44
<RequiresProcessIsolation>true</RequiresProcessIsolation>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6-
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/93631 -->
6+
<!-- Swift interop is supported on Apple platforms only -->
77
<CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
8+
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/93631 -->
9+
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' != 'mono'">true</CLRTestTargetUnsupported>
810
</PropertyGroup>
911
<ItemGroup>
1012
<Compile Include="$(MSBuildProjectName).cs" />

src/tests/issues.targets

-4
Original file line numberDiff line numberDiff line change
@@ -1158,10 +1158,6 @@
11581158
<ExcludeList Include="$(XunitTestBinBase)/Loader/CustomAttributes/**">
11591159
<Issue>Dynamic code generation is not supported on this platform</Issue>
11601160
</ExcludeList>
1161-
1162-
<ExcludeList Include="$(XunitTestBinBase)/Interop/Swift/**">
1163-
<Issue>https://github.com/dotnet/runtime/issues/93631</Issue>
1164-
</ExcludeList>
11651161
</ItemGroup>
11661162

11671163
<!-- run.proj finds all the *.cmd/*.sh scripts in a test folder and creates corresponding test methods.

0 commit comments

Comments
 (0)