Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0;net462;netcoreapp3.1</TargetFrameworks>
<NoWarn>$(NoWarn);1591</NoWarn>
<AssemblyTitle>BenchmarkDotNet.Diagnostics.dotMemory</AssemblyTitle>
<AssemblyName>BenchmarkDotNet.Diagnostics.dotMemory</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0;net462;netcoreapp3.1</TargetFrameworks>
<NoWarn>$(NoWarn);1591</NoWarn>
<AssemblyTitle>BenchmarkDotNet.Diagnostics.dotTrace</AssemblyTitle>
<AssemblyName>BenchmarkDotNet.Diagnostics.dotTrace</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Reflection;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Configs;
using BenchmarkDotNet.Extensions;
using BenchmarkDotNet.Jobs;
using BenchmarkDotNet.Portability;
Expand All @@ -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<CustomBuildConfiguration>(config);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<MonoBenchmark>(config);
}

Expand Down
1 change: 1 addition & 0 deletions tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<WasmBenchmark>(config);
Expand Down