From 5ad342c383b62ca1fc3f2f19c81b86384c7a3a87 Mon Sep 17 00:00:00 2001 From: sheffer21 Date: Fri, 17 May 2024 18:11:06 +0300 Subject: [PATCH 1/2] fix VsTestAdapter test filtering --- src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs b/src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs index b13a4eaf4a..28565a725a 100644 --- a/src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs +++ b/src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs @@ -38,7 +38,7 @@ public void RunBenchmarks(string assemblyPath, TestExecutionRecorderWrapper reco foreach (var benchmarkCase in benchmark.BenchmarksCases) { var testId = benchmarkCase.GetTestCaseId(); - if (benchmarkIds != null && benchmarkIds.Contains(testId)) + if (benchmarkIds == null || (benchmarkIds != null && benchmarkIds.Contains(testId))) { filteredCases.Add(benchmarkCase); testCases.Add(benchmarkCase.ToVsTestCase(assemblyPath, needsJobInfo)); From 9569a621c78ff6bc5b5ee14c1d384b8f14a7af02 Mon Sep 17 00:00:00 2001 From: sheffer21 Date: Sat, 18 May 2024 16:29:44 +0300 Subject: [PATCH 2/2] CR fixes --- src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs b/src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs index 28565a725a..f1cd64f34e 100644 --- a/src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs +++ b/src/BenchmarkDotNet.TestAdapter/BenchmarkExecutor.cs @@ -38,7 +38,7 @@ public void RunBenchmarks(string assemblyPath, TestExecutionRecorderWrapper reco foreach (var benchmarkCase in benchmark.BenchmarksCases) { var testId = benchmarkCase.GetTestCaseId(); - if (benchmarkIds == null || (benchmarkIds != null && benchmarkIds.Contains(testId))) + if (benchmarkIds == null || benchmarkIds.Contains(testId)) { filteredCases.Add(benchmarkCase); testCases.Add(benchmarkCase.ToVsTestCase(assemblyPath, needsJobInfo));