Skip to content

Commit 296c996

Browse files
Remove ConfigCompatibilityValidator, fix #2599
1 parent ae4bb9b commit 296c996

File tree

4 files changed

+2
-231
lines changed

4 files changed

+2
-231
lines changed

src/BenchmarkDotNet/Reports/Summary.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private static IOrderer GetConfiguredOrdererOrDefaultOne(IEnumerable<ImmutableCo
160160
.Where(config => config.Orderer != DefaultOrderer.Instance)
161161
.Select(config => config.Orderer)
162162
.Distinct()
163-
.SingleOrDefault()
163+
.FirstOrDefault()
164164
?? DefaultOrderer.Instance;
165165

166166
private static SummaryStyle GetConfiguredSummaryStyleOrDefaultOne(ImmutableArray<BenchmarkCase> benchmarkCases)
@@ -173,7 +173,7 @@ private static SummaryStyle GetConfiguredSummaryStyleOrDefaultOne(ImmutableArray
173173
#nullable enable
174174
.Select(benchmark => benchmark.Config.SummaryStyle)
175175
.Distinct()
176-
.SingleOrDefault()
176+
.FirstOrDefault()
177177
?? SummaryStyle.Default;
178178

179179
// TODO: GcStats

src/BenchmarkDotNet/Running/BenchmarkRunnerClean.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -353,17 +353,6 @@ private static ImmutableArray<ValidationError> Validate(params BenchmarkRunInfo[
353353
{
354354
var validationErrors = new List<ValidationError>();
355355

356-
if (benchmarks.Any(b => b.Config.Options.IsSet(ConfigOptions.JoinSummary)))
357-
{
358-
var joinedCases = benchmarks.SelectMany(b => b.BenchmarksCases).ToArray();
359-
360-
validationErrors.AddRange(
361-
ConfigCompatibilityValidator
362-
.FailOnError
363-
.Validate(new ValidationParameters(joinedCases, null))
364-
);
365-
}
366-
367356
foreach (var benchmarkRunInfo in benchmarks)
368357
validationErrors.AddRange(benchmarkRunInfo.Config.GetCompositeValidator().Validate(new ValidationParameters(benchmarkRunInfo.BenchmarksCases, benchmarkRunInfo.Config)));
369358

src/BenchmarkDotNet/Validators/ConfigCompatibilityValidator.cs

Lines changed: 0 additions & 37 deletions
This file was deleted.

tests/BenchmarkDotNet.Tests/Validators/ConfigCompatibilityValidatorTests.cs

Lines changed: 0 additions & 181 deletions
This file was deleted.

0 commit comments

Comments
 (0)