From 3c59e54e38f04dbffee845c23579e0ef8ca1ce8b Mon Sep 17 00:00:00 2001
From: Vlad Brezae <brezaevlad@gmail.com>
Date: Tue, 14 Apr 2026 16:22:50 +0300
Subject: [PATCH 1/3] Bump timeouts for interpreter tests

10->20 on individual runtime test
120->180 for runtime test suite
30->90 for library test suite
---
 eng/pipelines/coreclr/interpreter.yml | 5 +++++
 src/libraries/sendtohelixhelp.proj    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/eng/pipelines/coreclr/interpreter.yml b/eng/pipelines/coreclr/interpreter.yml
index 0c7196aa7c712a..fbb9e4df9f5898 100644
--- a/eng/pipelines/coreclr/interpreter.yml
+++ b/eng/pipelines/coreclr/interpreter.yml
@@ -78,6 +78,11 @@ extends:
           - osx_arm64
           helixQueueGroup: ci
           helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+          variables:
+            - name: timeoutPerTestInMinutes
+              value: 20
+            - name: timeoutPerTestCollectionInMinutes
+              value: 180
           jobParameters:
             testGroup: outerloop
             runInterpreter: true
diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 5b7d08b155b1c7..50249bdff8ff95 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -37,6 +37,7 @@
         '$(Scenario)' == 'gcstress0xc_jitstress1' or
         '$(Scenario)' == 'gcstress0xc_jitstress2' or
         '$(Scenario)' == 'gcstress0xc_jitminopts_heapverify1'">06:00:00</_workItemTimeout>
+    <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(Scenario)' == 'interpmode3'">01:30:00</_workItemTimeout>
     <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetsAppleMobile)' == 'true'">01:15:00</_workItemTimeout>
     <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetOS)' == 'android'">00:30:00</_workItemTimeout>
     <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and '$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'CoreCLR'">01:30:00</_workItemTimeout>

From 579c40acb6ba01e34391db80be31e4ac16faa15e Mon Sep 17 00:00:00 2001
From: Vlad Brezae <brezaevlad@gmail.com>
Date: Tue, 14 Apr 2026 16:35:24 +0300
Subject: [PATCH 2/3] Disable swift interop tests on osx-x64 on coreclr

Not yet implemented. Also move the test disabling to a single directory.build.props file
---
 src/tests/Interop/CMakeLists.txt               | 18 ++++++++++--------
 src/tests/Interop/Swift/Directory.Build.props  |  8 ++++++++
 .../Swift/SwiftAbiStress/SwiftAbiStress.csproj |  2 --
 .../SwiftCallbackAbiStress.csproj              |  2 --
 .../SwiftErrorHandling.csproj                  |  2 --
 .../SwiftIndirectResult.csproj                 |  2 --
 .../SwiftInlineArray/SwiftInlineArray.csproj   |  2 --
 .../SwiftInvalidCallConv.csproj                |  2 --
 .../SwiftRetAbiStress/SwiftRetAbiStress.csproj |  2 --
 .../SwiftSelfContext/SwiftSelfContext.csproj   |  2 --
 10 files changed, 18 insertions(+), 24 deletions(-)
 create mode 100644 src/tests/Interop/Swift/Directory.Build.props

diff --git a/src/tests/Interop/CMakeLists.txt b/src/tests/Interop/CMakeLists.txt
index b28f6629188dbb..43074735973856 100644
--- a/src/tests/Interop/CMakeLists.txt
+++ b/src/tests/Interop/CMakeLists.txt
@@ -101,12 +101,14 @@ endif(CLR_CMAKE_TARGET_WIN32)
 if(CLR_CMAKE_TARGET_APPLE)
     add_subdirectory(ObjectiveC/AutoReleaseTest)
     add_subdirectory(ObjectiveC/ObjectiveCMarshalAPI)
-    add_subdirectory(Swift/SwiftAbiStress)
-    add_subdirectory(Swift/SwiftCallbackAbiStress)
-    add_subdirectory(Swift/SwiftErrorHandling)
-    add_subdirectory(Swift/SwiftIndirectResult)
-    add_subdirectory(Swift/SwiftInvalidCallConv)
-    add_subdirectory(Swift/SwiftRetAbiStress)
-    add_subdirectory(Swift/SwiftSelfContext)
-    add_subdirectory(Swift/SwiftInlineArray)
+    if(CLR_CMAKE_HOST_ARCH_ARM64)
+        add_subdirectory(Swift/SwiftAbiStress)
+        add_subdirectory(Swift/SwiftCallbackAbiStress)
+        add_subdirectory(Swift/SwiftErrorHandling)
+        add_subdirectory(Swift/SwiftIndirectResult)
+        add_subdirectory(Swift/SwiftInvalidCallConv)
+        add_subdirectory(Swift/SwiftRetAbiStress)
+        add_subdirectory(Swift/SwiftSelfContext)
+        add_subdirectory(Swift/SwiftInlineArray)
+    endif()
 endif()
diff --git a/src/tests/Interop/Swift/Directory.Build.props b/src/tests/Interop/Swift/Directory.Build.props
new file mode 100644
index 00000000000000..e9a6eb3a720c85
--- /dev/null
+++ b/src/tests/Interop/Swift/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
+    <CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x64'">true</CLRTestTargetUnsupported>
+  </PropertyGroup>
+</Project>
diff --git a/src/tests/Interop/Swift/SwiftAbiStress/SwiftAbiStress.csproj b/src/tests/Interop/Swift/SwiftAbiStress/SwiftAbiStress.csproj
index 89eda99352fd20..edf38fa91a3f66 100644
--- a/src/tests/Interop/Swift/SwiftAbiStress/SwiftAbiStress.csproj
+++ b/src/tests/Interop/Swift/SwiftAbiStress/SwiftAbiStress.csproj
@@ -3,8 +3,6 @@
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Swift interop is supported on Apple platforms only -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/Interop/Swift/SwiftCallbackAbiStress/SwiftCallbackAbiStress.csproj b/src/tests/Interop/Swift/SwiftCallbackAbiStress/SwiftCallbackAbiStress.csproj
index 89eda99352fd20..edf38fa91a3f66 100644
--- a/src/tests/Interop/Swift/SwiftCallbackAbiStress/SwiftCallbackAbiStress.csproj
+++ b/src/tests/Interop/Swift/SwiftCallbackAbiStress/SwiftCallbackAbiStress.csproj
@@ -3,8 +3,6 @@
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Swift interop is supported on Apple platforms only -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.csproj b/src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.csproj
index 89eda99352fd20..edf38fa91a3f66 100644
--- a/src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.csproj
+++ b/src/tests/Interop/Swift/SwiftErrorHandling/SwiftErrorHandling.csproj
@@ -3,8 +3,6 @@
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Swift interop is supported on Apple platforms only -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/Interop/Swift/SwiftIndirectResult/SwiftIndirectResult.csproj b/src/tests/Interop/Swift/SwiftIndirectResult/SwiftIndirectResult.csproj
index 89eda99352fd20..edf38fa91a3f66 100644
--- a/src/tests/Interop/Swift/SwiftIndirectResult/SwiftIndirectResult.csproj
+++ b/src/tests/Interop/Swift/SwiftIndirectResult/SwiftIndirectResult.csproj
@@ -3,8 +3,6 @@
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Swift interop is supported on Apple platforms only -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/Interop/Swift/SwiftInlineArray/SwiftInlineArray.csproj b/src/tests/Interop/Swift/SwiftInlineArray/SwiftInlineArray.csproj
index 89eda99352fd20..edf38fa91a3f66 100644
--- a/src/tests/Interop/Swift/SwiftInlineArray/SwiftInlineArray.csproj
+++ b/src/tests/Interop/Swift/SwiftInlineArray/SwiftInlineArray.csproj
@@ -3,8 +3,6 @@
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Swift interop is supported on Apple platforms only -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/Interop/Swift/SwiftInvalidCallConv/SwiftInvalidCallConv.csproj b/src/tests/Interop/Swift/SwiftInvalidCallConv/SwiftInvalidCallConv.csproj
index 89eda99352fd20..edf38fa91a3f66 100644
--- a/src/tests/Interop/Swift/SwiftInvalidCallConv/SwiftInvalidCallConv.csproj
+++ b/src/tests/Interop/Swift/SwiftInvalidCallConv/SwiftInvalidCallConv.csproj
@@ -3,8 +3,6 @@
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Swift interop is supported on Apple platforms only -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/Interop/Swift/SwiftRetAbiStress/SwiftRetAbiStress.csproj b/src/tests/Interop/Swift/SwiftRetAbiStress/SwiftRetAbiStress.csproj
index 89eda99352fd20..edf38fa91a3f66 100644
--- a/src/tests/Interop/Swift/SwiftRetAbiStress/SwiftRetAbiStress.csproj
+++ b/src/tests/Interop/Swift/SwiftRetAbiStress/SwiftRetAbiStress.csproj
@@ -3,8 +3,6 @@
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Swift interop is supported on Apple platforms only -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/Interop/Swift/SwiftSelfContext/SwiftSelfContext.csproj b/src/tests/Interop/Swift/SwiftSelfContext/SwiftSelfContext.csproj
index 89eda99352fd20..edf38fa91a3f66 100644
--- a/src/tests/Interop/Swift/SwiftSelfContext/SwiftSelfContext.csproj
+++ b/src/tests/Interop/Swift/SwiftSelfContext/SwiftSelfContext.csproj
@@ -3,8 +3,6 @@
     <!-- Needed for CLRTestTargetUnsupported, CMakeProjectReference -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- Swift interop is supported on Apple platforms only -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />

From f5091f56b2ef8ce8d4a5a9c37b2fa07a615fb3ab Mon Sep 17 00:00:00 2001
From: Vlad Brezae <brezaevlad@gmail.com>
Date: Tue, 14 Apr 2026 23:13:21 +0300
Subject: [PATCH 3/3] Revert disabling of native swift bits

Mono tests still need them
---
 src/tests/Interop/CMakeLists.txt | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/tests/Interop/CMakeLists.txt b/src/tests/Interop/CMakeLists.txt
index 43074735973856..b2d1de0b3f9c1c 100644
--- a/src/tests/Interop/CMakeLists.txt
+++ b/src/tests/Interop/CMakeLists.txt
@@ -101,14 +101,12 @@ endif(CLR_CMAKE_TARGET_WIN32)
 if(CLR_CMAKE_TARGET_APPLE)
     add_subdirectory(ObjectiveC/AutoReleaseTest)
     add_subdirectory(ObjectiveC/ObjectiveCMarshalAPI)
-    if(CLR_CMAKE_HOST_ARCH_ARM64)
-        add_subdirectory(Swift/SwiftAbiStress)
-        add_subdirectory(Swift/SwiftCallbackAbiStress)
-        add_subdirectory(Swift/SwiftErrorHandling)
-        add_subdirectory(Swift/SwiftIndirectResult)
-        add_subdirectory(Swift/SwiftInvalidCallConv)
-        add_subdirectory(Swift/SwiftRetAbiStress)
-        add_subdirectory(Swift/SwiftSelfContext)
-        add_subdirectory(Swift/SwiftInlineArray)
-    endif()
+	add_subdirectory(Swift/SwiftAbiStress)
+	add_subdirectory(Swift/SwiftCallbackAbiStress)
+	add_subdirectory(Swift/SwiftErrorHandling)
+	add_subdirectory(Swift/SwiftIndirectResult)
+	add_subdirectory(Swift/SwiftInvalidCallConv)
+	add_subdirectory(Swift/SwiftRetAbiStress)
+	add_subdirectory(Swift/SwiftSelfContext)
+	add_subdirectory(Swift/SwiftInlineArray)
 endif()