From 647a8d060552379a5b323b9880909712bb3af283 Mon Sep 17 00:00:00 2001
From: Tim <cassell.timothy@gmail.com>
Date: Sun, 28 Apr 2024 00:22:16 -0400
Subject: [PATCH] Reverted moved MemoryDiagnoserTests to ManualRunning.
 Disabled EventSource for integration tests.

---
 .../BenchmarkDotNet.IntegrationTests.csproj   |  2 ++
 .../MemoryDiagnoserTests.cs                   | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)
 rename tests/{BenchmarkDotNet.IntegrationTests.ManualRunning => BenchmarkDotNet.IntegrationTests}/MemoryDiagnoserTests.cs (94%)
 mode change 100644 => 100755

diff --git a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj
index a928af1424..93cc6a8ab7 100644
--- a/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj
+++ b/tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj
@@ -18,6 +18,8 @@
     <Content Include="xunit.runner.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <!-- Disable EventSource to stabilize MemoryDiagnoserTests. https://github.com/dotnet/BenchmarkDotNet/pull/2562#issuecomment-2081317379 -->
+    <RuntimeHostConfigurationOption Include="System.Diagnostics.Tracing.EventSource.IsSupported" Value="false" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BenchmarkDotNet.IntegrationTests.ConfigPerAssembly\BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj" />
diff --git a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/MemoryDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
old mode 100644
new mode 100755
similarity index 94%
rename from tests/BenchmarkDotNet.IntegrationTests.ManualRunning/MemoryDiagnoserTests.cs
rename to tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
index fbe989fa88..cf573f9985
--- a/tests/BenchmarkDotNet.IntegrationTests.ManualRunning/MemoryDiagnoserTests.cs
+++ b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
@@ -24,11 +24,8 @@
 using Xunit.Abstractions;
 using BenchmarkDotNet.Toolchains.Mono;
 
-namespace BenchmarkDotNet.IntegrationTests.ManualRunning
+namespace BenchmarkDotNet.IntegrationTests
 {
-    // #1925
-    // These tests were moved to ManualRunning to stabilize the CI.
-    // Even after disabling tiered jit and blocking the finalizer thread, the tests are still flaky on CI.
     public class MemoryDiagnoserTests
     {
         private readonly ITestOutputHelper output;
@@ -54,6 +51,7 @@ public class AccurateAllocations
         }
 
         [Theory, MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void MemoryDiagnoserIsAccurate(IToolchain toolchain)
         {
             long objectAllocationOverhead = IntPtr.Size * 2; // pointer to method table + object header word
@@ -111,6 +109,7 @@ private void AllocateUntilGcWakesUp()
         }
 
         [Theory, MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void MemoryDiagnoserDoesNotIncludeAllocationsFromSetupAndCleanup(IToolchain toolchain)
         {
             AssertAllocations(toolchain, typeof(AllocatingGlobalSetupAndCleanup), new Dictionary<string, long>
@@ -136,6 +135,7 @@ public ulong TimeConsuming()
         }
 
         [Theory, MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void EngineShouldNotInterfereAllocationResults(IToolchain toolchain)
         {
             AssertAllocations(toolchain, typeof(NoAllocationsAtAll), new Dictionary<string, long>
@@ -146,6 +146,7 @@ public void EngineShouldNotInterfereAllocationResults(IToolchain toolchain)
 
         // #1542
         [Theory, MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void TieredJitShouldNotInterfereAllocationResults(IToolchain toolchain)
         {
             AssertAllocations(toolchain, typeof(NoAllocationsAtAll), new Dictionary<string, long>
@@ -161,6 +162,7 @@ public class NoBoxing
         }
 
         [Theory, MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void EngineShouldNotIntroduceBoxing(IToolchain toolchain)
         {
             AssertAllocations(toolchain, typeof(NoBoxing), new Dictionary<string, long>
@@ -181,6 +183,7 @@ public class NonAllocatingAsynchronousBenchmarks
         }
 
         [Theory, MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void AwaitingTasksShouldNotInterfereAllocationResults(IToolchain toolchain)
         {
             AssertAllocations(toolchain, typeof(NonAllocatingAsynchronousBenchmarks), new Dictionary<string, long>
@@ -205,6 +208,7 @@ public void WithOperationsPerInvoke()
         }
 
         [Theory, MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void AllocatedMemoryShouldBeScaledForOperationsPerInvoke(IToolchain toolchain)
         {
             long objectAllocationOverhead = IntPtr.Size * 2; // pointer to method table + object header word
@@ -230,6 +234,7 @@ public byte[] SixtyFourBytesArray()
         }
 
         [TheoryEnvSpecific("Full Framework cannot measure precisely enough for low invocation counts.", EnvRequirement.DotNetCoreOnly), MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void AllocationQuantumIsNotAnIssueForNetCore21Plus(IToolchain toolchain)
         {
             long objectAllocationOverhead = IntPtr.Size * 2; // pointer to method table + object header word
@@ -295,6 +300,7 @@ public void Allocate()
 
         [TheoryEnvSpecific("Full Framework cannot measure precisely enough", EnvRequirement.DotNetCoreOnly)]
         [MemberData(nameof(GetToolchains))]
+        [Trait(Constants.Category, Constants.BackwardCompatibilityCategory)]
         public void MemoryDiagnoserIsAccurateForMultiThreadedBenchmarks(IToolchain toolchain)
         {
             long objectAllocationOverhead = IntPtr.Size * 2; // pointer to method table + object header word
@@ -319,8 +325,12 @@ private void AssertAllocations(IToolchain toolchain, Type benchmarkType, Diction
             }
             catch (MisconfiguredEnvironmentException e)
             {
-                output.WriteLine(e.SkipMessage);
-                return;
+                if (ContinuousIntegration.IsLocalRun())
+                {
+                    output.WriteLine(e.SkipMessage);
+                    return;
+                }
+                throw;
             }
 
             foreach (var benchmarkAllocationsValidator in benchmarksAllocationsValidators)