From b6de2ffbcf429ca6b9b08293a92a22f5b904cb55 Mon Sep 17 00:00:00 2001
From: filzrev <103790468+filzrev@users.noreply.github.com>
Date: Fri, 27 Feb 2026 20:54:32 +0900
Subject: [PATCH] chore: move flaky dotMemory/dotTrace tests to ManualRunning
 project

---
 .../BenchmarkDotNet.IntegrationTests.ManualRunning.csproj  | 2 ++
 .../DotMemoryTests.cs                                      | 5 ++---
 .../DotTraceTests.cs                                       | 7 +++----
 .../BenchmarkDotNet.IntegrationTests.csproj                | 2 --
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename tests/{BenchmarkDotNet.IntegrationTests => BenchmarkDotNet.IntegrationTests.ManualRunning}/DotMemoryTests.cs (89%)
 rename tests/{BenchmarkDotNet.IntegrationTests => BenchmarkDotNet.IntegrationTests.ManualRunning}/DotTraceTests.cs (86%)

diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj
index c86bd2583f..0a95920e00 100755
--- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj
+++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj
@@ -32,6 +32,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
     <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj" />
+    <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.dotTrace\BenchmarkDotNet.Diagnostics.dotTrace.csproj" />
+    <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.dotMemory\BenchmarkDotNet.Diagnostics.dotMemory.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
diff --git a/tests/BenchmarkDotNet.IntegrationTests/DotMemoryTests.cs b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotMemoryTests.cs
similarity index 89%
rename from tests/BenchmarkDotNet.IntegrationTests/DotMemoryTests.cs
rename to tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotMemoryTests.cs
index 20a1fd64fd..bd10f137be 100644
--- a/tests/BenchmarkDotNet.IntegrationTests/DotMemoryTests.cs
+++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotMemoryTests.cs
@@ -12,7 +12,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace BenchmarkDotNet.IntegrationTests
+namespace BenchmarkDotNet.IntegrationTests.ManualRunning
 {
     public class DotMemoryTests : BenchmarkTestExecutor
     {
@@ -30,8 +30,7 @@ public void DotMemorySmokeTest()
             var config = new ManualConfig().AddJob(
             [
                 Job.Dry.WithId("ExternalProcess"),
-                // TODO: Add InProcessEmitToolchain job when flaky test issue is resolved https://github.com/dotnet/BenchmarkDotNet/issues/2950
-                //Job.Dry.WithToolchain(InProcessEmitToolchain.Default).WithId("InProcess"),
+                Job.Dry.WithToolchain(InProcessEmitToolchain.Default).WithId("InProcess"),
             ]
             );
             string snapshotDirectory = Path.Combine(Directory.GetCurrentDirectory(), "BenchmarkDotNet.Artifacts", "snapshots");
diff --git a/tests/BenchmarkDotNet.IntegrationTests/DotTraceTests.cs b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotTraceTests.cs
similarity index 86%
rename from tests/BenchmarkDotNet.IntegrationTests/DotTraceTests.cs
rename to tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotTraceTests.cs
index 297cb15d4d..98b59a13b3 100644
--- a/tests/BenchmarkDotNet.IntegrationTests/DotTraceTests.cs
+++ b/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/DotTraceTests.cs
@@ -12,7 +12,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace BenchmarkDotNet.IntegrationTests
+namespace BenchmarkDotNet.IntegrationTests.ManualRunning
 {
     public class DotTraceTests : BenchmarkTestExecutor
     {
@@ -29,9 +29,8 @@ public void DotTraceSmokeTest()
 
             var config = new ManualConfig().AddJob(
             [
-                Job.Dry.WithId("ExternalProcess")
-                // TODO: Add InProcessEmitToolchain job when flaky test issue is resolved https://github.com/dotnet/BenchmarkDotNet/issues/2950
-                // Job.Dry.WithToolchain(InProcessEmitToolchain.Default).WithId("InProcess")
+                Job.Dry.WithId("ExternalProcess"),
+                Job.Dry.WithToolchain(InProcessEmitToolchain.Default).WithId("InProcess")
             ]
             );
             string snapshotDirectory = Path.Combine(Directory.GetCurrentDirectory(), "BenchmarkDotNet.Artifacts", "snapshots");
diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj
index 6d3450dea1..9604364c73 100644
--- a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj
+++ b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj
@@ -30,8 +30,6 @@
     <ProjectReference Include="..\BenchmarkDotNet.IntegrationTests.Static\BenchmarkDotNet.IntegrationTests.Static.csproj" />
     <ProjectReference Include="..\BenchmarkDotNet.Tests\BenchmarkDotNet.Tests.csproj" />
     <ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
-    <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.dotTrace\BenchmarkDotNet.Diagnostics.dotTrace.csproj" />
-    <ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.dotMemory\BenchmarkDotNet.Diagnostics.dotMemory.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />