From 65df4a93334d7f2062ac3566b0acdc10fe6a77cf Mon Sep 17 00:00:00 2001 From: Guillaume Thiolliere Date: Fri, 26 Feb 2021 19:50:58 +0100 Subject: [PATCH] Fix ignored error in benchmark tests (#8214) * fix ignored error in benchmark tests * use normal format for str * explicit match Co-authored-by: Shawn Tabrizi --- substrate/frame/benchmarking/src/lib.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/substrate/frame/benchmarking/src/lib.rs b/substrate/frame/benchmarking/src/lib.rs index a1d4467d0a..5b137c3c15 100644 --- a/substrate/frame/benchmarking/src/lib.rs +++ b/substrate/frame/benchmarking/src/lib.rs @@ -1169,9 +1169,16 @@ macro_rules! impl_benchmark_test_suite { let mut anything_failed = false; println!("failing benchmark tests:"); for benchmark_name in $bench_module::<$test>::benchmarks($extra) { - if let Err(err) = std::panic::catch_unwind(|| test_bench_by_name::<$test>(benchmark_name)) { - println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err); - anything_failed = true; + match std::panic::catch_unwind(|| test_bench_by_name::<$test>(benchmark_name)) { + Err(err) => { + println!("{}: {:?}", String::from_utf8_lossy(benchmark_name), err); + anything_failed = true; + }, + Ok(Err(err)) => { + println!("{}: {}", String::from_utf8_lossy(benchmark_name), err); + anything_failed = true; + }, + Ok(Ok(_)) => (), } } assert!(!anything_failed);