From e2c96f913bdadb04c7843d1c94b3be037511dc17 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 28 Feb 2026 09:33:20 +0000
Subject: [PATCH 1/4] Initial plan


From 4800e37609d18e145ab50216d4a8116add037d96 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 28 Feb 2026 09:46:34 +0000
Subject: [PATCH 2/4] Disable superpmi tests on Mono and fix sub-script
 validation

Add MonoAotIncompatible to superpmicollect.csproj since superpmi tests
are CoreCLR-specific. Fix build.proj GetListOfTestCmds to exclude
scripts under OutOfProcessTest directories from the merged runner
validation, as they are components of the out-of-process test rather
than standalone tests.

Co-authored-by: matouskozak <55735845+matouskozak@users.noreply.github.com>
---
 src/tests/JIT/superpmi/superpmicollect.csproj | 1 +
 src/tests/build.proj                          | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/tests/JIT/superpmi/superpmicollect.csproj b/src/tests/JIT/superpmi/superpmicollect.csproj
index 5b2597c8b888cb..64e029145a6108 100644
--- a/src/tests/JIT/superpmi/superpmicollect.csproj
+++ b/src/tests/JIT/superpmi/superpmicollect.csproj
@@ -26,6 +26,7 @@
     <!-- This test is very specific to RyuJIT tooling. -->
     <DisableProjectBuild Condition="'$(RuntimeFlavor)' != 'coreclr'">true</DisableProjectBuild>
     <NativeAotIncompatible>true</NativeAotIncompatible>
+    <MonoAotIncompatible>true</MonoAotIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
diff --git a/src/tests/build.proj b/src/tests/build.proj
index 338a0aa53dd3b3..b0712ff4492cf2 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -157,6 +157,9 @@
       <MergedRunnableTestPaths Include="$([System.IO.Path]::ChangeExtension('%(MergedAssemblyMarkerPaths.Identity)', '.$(TestScriptExtension)'))" Condition="'@(MergedAssemblyMarkerPaths)' != ''" />
       <OutOfProcessTestMarkerPaths Include="$(XunitTestBinBase)\**\*.OutOfProcessTest"/>
       <OutOfProcessTestPaths Include="$([System.IO.Path]::ChangeExtension('%(OutOfProcessTestMarkerPaths.Identity)', '.$(TestScriptExtension)'))" Condition="'@(OutOfProcessTestMarkerPaths)' != ''" />
+      <!-- Remove scripts under out-of-process test directories; they are components of the out-of-process test, not standalone tests. -->
+      <OutOfProcessTestFolders Include="$([System.IO.Path]::GetDirectoryName('%(OutOfProcessTestMarkerPaths.Identity)'))" />
+      <AllRunnableTestPaths Remove="%(OutOfProcessTestFolders.Identity)\**\*.$(TestScriptExtension)" Condition="'@(OutOfProcessTestFolders)' != ''" />
       <NoMonoAotMarkerPaths Include="$(XunitTestBinBase)\**\*.NoMonoAot" />
       <NoMonoAotAssemblyPaths Include="$([System.IO.Path]::ChangeExtension('%(NoMonoAotMarkerPaths.Identity)', '.dll'))" Condition="'@(NoMonoAotMarkerPaths)' != ''" />
     </ItemGroup>

From fc080bfef114a22da4f9944c261a676045a8bc43 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 2 Mar 2026 11:16:52 +0000
Subject: [PATCH 3/4] Revert build.proj change, keep only MonoAotIncompatible
 in superpmicollect.csproj

Co-authored-by: matouskozak <55735845+matouskozak@users.noreply.github.com>
---
 src/tests/build.proj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/tests/build.proj b/src/tests/build.proj
index b0712ff4492cf2..338a0aa53dd3b3 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -157,9 +157,6 @@
       <MergedRunnableTestPaths Include="$([System.IO.Path]::ChangeExtension('%(MergedAssemblyMarkerPaths.Identity)', '.$(TestScriptExtension)'))" Condition="'@(MergedAssemblyMarkerPaths)' != ''" />
       <OutOfProcessTestMarkerPaths Include="$(XunitTestBinBase)\**\*.OutOfProcessTest"/>
       <OutOfProcessTestPaths Include="$([System.IO.Path]::ChangeExtension('%(OutOfProcessTestMarkerPaths.Identity)', '.$(TestScriptExtension)'))" Condition="'@(OutOfProcessTestMarkerPaths)' != ''" />
-      <!-- Remove scripts under out-of-process test directories; they are components of the out-of-process test, not standalone tests. -->
-      <OutOfProcessTestFolders Include="$([System.IO.Path]::GetDirectoryName('%(OutOfProcessTestMarkerPaths.Identity)'))" />
-      <AllRunnableTestPaths Remove="%(OutOfProcessTestFolders.Identity)\**\*.$(TestScriptExtension)" Condition="'@(OutOfProcessTestFolders)' != ''" />
       <NoMonoAotMarkerPaths Include="$(XunitTestBinBase)\**\*.NoMonoAot" />
       <NoMonoAotAssemblyPaths Include="$([System.IO.Path]::ChangeExtension('%(NoMonoAotMarkerPaths.Identity)', '.dll'))" Condition="'@(NoMonoAotMarkerPaths)' != ''" />
     </ItemGroup>

From 4e77b94b545a435c0c9a930cb2e181fa69fd9b34 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 2 Mar 2026 14:17:02 +0000
Subject: [PATCH 4/4] Remove superpmi from AOT job tree list in
 runtime-llvm.yml

Co-authored-by: matouskozak <55735845+matouskozak@users.noreply.github.com>
---
 eng/pipelines/runtime-llvm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/runtime-llvm.yml b/eng/pipelines/runtime-llvm.yml
index 52ba51aeebcbd3..18e1ac41e41d19 100644
--- a/eng/pipelines/runtime-llvm.yml
+++ b/eng/pipelines/runtime-llvm.yml
@@ -181,7 +181,7 @@ extends:
                     -tree:ilverify -tree:managed -tree:profiler -tree:reflection -tree:tracing
                     -tree:JIT/BBT -tree:JIT/CodeGenBringUpTests -tree:JIT/Directed -tree:JIT/Generics -tree:JIT/IL_Conformance
                     -tree:JIT/Math -tree:JIT/Methodical -tree:JIT/Performance -tree:JIT/Regression -tree:JIT/RyuJIT
-                    -tree:JIT/Stress -tree:JIT/common -tree:JIT/jit64 -tree:JIT/opt -tree:JIT/superpmi
+                    -tree:JIT/Stress -tree:JIT/common -tree:JIT/jit64 -tree:JIT/opt
             extraVariablesTemplates:
               - template: /eng/pipelines/common/templates/runtimes/test-variables.yml