From a07374f3769e53d70882f43b26a456188c17e7ea Mon Sep 17 00:00:00 2001 From: Anton Baliasnikov Date: Fri, 24 Jan 2025 12:54:01 +0000 Subject: [PATCH] test --- .../test/codegen/versioned/executable/run/mod.rs | 6 ++++++ benchmark_analyzer/src/output/format/json/lnt/mod.rs | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/benchmark_analyzer/src/model/benchmark/test/codegen/versioned/executable/run/mod.rs b/benchmark_analyzer/src/model/benchmark/test/codegen/versioned/executable/run/mod.rs index 15b1f10..16650d6 100644 --- a/benchmark_analyzer/src/model/benchmark/test/codegen/versioned/executable/run/mod.rs +++ b/benchmark_analyzer/src/model/benchmark/test/codegen/versioned/executable/run/mod.rs @@ -14,8 +14,10 @@ pub struct Run { #[serde(default, skip_serializing_if = "Option::is_none")] pub size: Option, /// The number of cycles. + #[serde(default, skip_serializing_if = "is_zero_usize")] pub cycles: usize, /// The amount of ergs. + #[serde(default, skip_serializing_if = "is_zero")] pub ergs: u64, /// The amount of EVM gas. #[serde(default, skip_serializing_if = "is_zero")] @@ -26,6 +28,10 @@ fn is_zero(value: &u64) -> bool { *value == 0 } +fn is_zero_usize(value: &usize) -> bool { + *value == 0 +} + impl Run { /// /// A shortcut constructor. diff --git a/benchmark_analyzer/src/output/format/json/lnt/mod.rs b/benchmark_analyzer/src/output/format/json/lnt/mod.rs index d8b7f36..7daa35b 100644 --- a/benchmark_analyzer/src/output/format/json/lnt/mod.rs +++ b/benchmark_analyzer/src/output/format/json/lnt/mod.rs @@ -35,6 +35,17 @@ pub struct JsonLNT; fn test_name(selector: &Selector, version: impl std::fmt::Display) -> String { fn shorten_file_name(name: &str) -> String { let path_buf = PathBuf::from(name); + if let Some(parent) = path_buf.parent() { + if let Some(file_name) = path_buf.file_name() { + if let Some(dir_name) = parent.file_name() { + return format!( + "{}/{}", + dir_name.to_string_lossy(), + file_name.to_string_lossy() + ); + } + } + } path_buf.to_str().expect("Always valid").to_string() } let Selector { path, case, input } = selector;