From 15072524a5a0095982d4ce7a80ecdaa7d50ae88e Mon Sep 17 00:00:00 2001 From: filzrev <103790468+filzrev@users.noreply.github.com> Date: Wed, 5 Nov 2025 12:42:19 +0900 Subject: [PATCH 1/4] fix: increase build timeout seconds to fix flaky CI tests --- .../CustomBuildConfigurationTests.cs | 2 ++ tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs b/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs index cf3542435b..4b5e8c2a65 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs @@ -1,6 +1,7 @@ using System; using System.Reflection; using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Configs; using BenchmarkDotNet.Extensions; using BenchmarkDotNet.Jobs; using BenchmarkDotNet.Portability; @@ -24,6 +25,7 @@ public void UserCanSpecifyCustomBuildConfiguration() var jobWithCustomConfiguration = Job.Dry.WithCustomBuildConfiguration("CUSTOM"); var config = CreateSimpleConfig(job: jobWithCustomConfiguration); + config = ((ManualConfig)config).WithBuildTimeout(TimeSpan.FromSeconds(240)); var report = CanExecute(config); diff --git a/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs b/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs index 6d3519a9c5..dfa67fd2ce 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs @@ -37,6 +37,7 @@ public void WasmIsSupported() .WithArguments([new MsBuildArgument($"/p:WasmMainJSPath={mainJsPath}")]) .WithRuntime(new WasmRuntime(dotnetVersion, moniker: RuntimeMoniker.WasmNet80, javaScriptEngineArguments: "--expose_wasm --module")) .WithToolchain(WasmToolchain.From(netCoreAppSettings))) + .WithBuildTimeout(TimeSpan.FromSeconds(240)) .WithOption(ConfigOptions.GenerateMSBuildBinLog, true); CanExecute(config); From 7823f0da0fcb7b4b3be571b723a86b04e238cfe2 Mon Sep 17 00:00:00 2001 From: filzrev <103790468+filzrev@users.noreply.github.com> Date: Wed, 5 Nov 2025 15:28:40 +0900 Subject: [PATCH 2/4] chore: add net8.0 tfm to dotMemory/dotTrace projects --- .../BenchmarkDotNet.Diagnostics.dotMemory.csproj | 2 +- .../BenchmarkDotNet.Diagnostics.dotTrace.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BenchmarkDotNet.Diagnostics.dotMemory/BenchmarkDotNet.Diagnostics.dotMemory.csproj b/src/BenchmarkDotNet.Diagnostics.dotMemory/BenchmarkDotNet.Diagnostics.dotMemory.csproj index cc209f4258..0c99bebea9 100644 --- a/src/BenchmarkDotNet.Diagnostics.dotMemory/BenchmarkDotNet.Diagnostics.dotMemory.csproj +++ b/src/BenchmarkDotNet.Diagnostics.dotMemory/BenchmarkDotNet.Diagnostics.dotMemory.csproj @@ -1,7 +1,7 @@ - net6.0;net462;netcoreapp3.1 + net8.0;net6.0;net462;netcoreapp3.1 $(NoWarn);1591 BenchmarkDotNet.Diagnostics.dotMemory BenchmarkDotNet.Diagnostics.dotMemory diff --git a/src/BenchmarkDotNet.Diagnostics.dotTrace/BenchmarkDotNet.Diagnostics.dotTrace.csproj b/src/BenchmarkDotNet.Diagnostics.dotTrace/BenchmarkDotNet.Diagnostics.dotTrace.csproj index 8206182d6a..69275d9978 100644 --- a/src/BenchmarkDotNet.Diagnostics.dotTrace/BenchmarkDotNet.Diagnostics.dotTrace.csproj +++ b/src/BenchmarkDotNet.Diagnostics.dotTrace/BenchmarkDotNet.Diagnostics.dotTrace.csproj @@ -1,7 +1,7 @@ - net6.0;net462;netcoreapp3.1 + net8.0;net6.0;net462;netcoreapp3.1 $(NoWarn);1591 BenchmarkDotNet.Diagnostics.dotTrace BenchmarkDotNet.Diagnostics.dotTrace From 7778afb280db52c4541520cb1ea3f9d078293019 Mon Sep 17 00:00:00 2001 From: filzrev <103790468+filzrev@users.noreply.github.com> Date: Thu, 6 Nov 2025 13:06:39 +0900 Subject: [PATCH 3/4] chore: increase timeout for Mono80IsSupported --- tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs index 17309832ef..d08e9166b7 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs @@ -20,7 +20,8 @@ public void Mono80IsSupported() var logger = new OutputLogger(Output); var config = ManualConfig.CreateEmpty() .AddLogger(logger) - .AddJob(Job.Dry.WithRuntime(MonoRuntime.Mono80)); + .AddJob(Job.Dry.WithRuntime(MonoRuntime.Mono80)) + .WithBuildTimeout(TimeSpan.FromSeconds(240)); CanExecute(config); } From 515be8d7a0db2342e41a40d7ed49aaeb935fd4e8 Mon Sep 17 00:00:00 2001 From: filzrev <103790468+filzrev@users.noreply.github.com> Date: Thu, 6 Nov 2025 14:12:54 +0900 Subject: [PATCH 4/4] chore: increase timeout value for MemoryDiagnoserSupportsModernMono test --- tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs index 7221a80595..2a1daa470f 100755 --- a/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs @@ -386,6 +386,7 @@ private IConfig CreateConfig(IToolchain toolchain, new EnvironmentVariable("COMPlus_TieredCompilation", "0") ) : job) + .WithBuildTimeout(TimeSpan.FromSeconds(240)) // Increase timeout for `MemoryDiagnoserSupportsModernMono` test on macos(x64) .AddColumnProvider(DefaultColumnProviders.Instance) .AddDiagnoser(MemoryDiagnoser.Default) .AddLogger(toolchain.IsInProcess ? ConsoleLogger.Default : new OutputLogger(output)); // we can't use OutputLogger for the InProcess toolchains because it allocates memory on the same thread