aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-01-28 14:02:10 -0500
committerMarcoFalke <falke.marco@gmail.com>2020-01-28 14:02:13 -0500
commitfe48ac8580ae7ddf38575f958dcf9d6ea316e90d (patch)
tree9bffbb0aac44086ea47752601a7f1443e8ab0757
parent2755b2b1092d0286022cf3cc3028e96f6bee2b34 (diff)
parent0dae5a5c34ef54ad912382836d12688813745bc5 (diff)
Merge #18013: bench: Fix benchmarks filters
0dae5a5c34ef54ad912382836d12688813745bc5 Fix benchmarks filters (Elichai Turkel) Pull request description: The bug was introduced in https://github.com/bitcoin/bitcoin/pull/17781 before this fix `./src/bench/bench_bitcoin -filter=*` will fail with: ``` # Benchmark, evals, iterations, total, min, max, median bench_bitcoin: bench/bench.cpp:119: static void benchmark::BenchRunner::RunAll(benchmark::Printer&, uint64_t, double, const string&, bool): Assertion `g_testing_setup == nullptr' failed. Aborted (core dumped) ``` ACKs for top commit: MarcoFalke: ACK 0dae5a5c34ef54ad912382836d12688813745bc5 Tree-SHA512: 43de4c7f4a5f29593972cf3bc822429466d0609c159c95d37c9e5370be392ace698b218a65542c7d53bfa52db7377ebdab808501ae109c2249f7f956bd318312
-rw-r--r--src/bench/bench.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index d1b2b938ff..5cf7e43f4b 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -126,6 +126,7 @@ void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double
}
if (!std::regex_match(p.first, baseMatch, reFilter)) {
+ g_testing_setup = nullptr;
continue;
}