From 32b8bab08c5575cb6bd59a62ebfa7688cdd03d76 Mon Sep 17 00:00:00 2001 From: Daniel Campello Date: Wed, 28 Apr 2021 21:07:23 -0600 Subject: flashrom_tester: update syntax for --wp-range TEST=cargo test Signed-off-by: Daniel Campello Change-Id: If17a40fba1f7d41e09e0163b353d1602c215c8db Reviewed-on: https://review.coreboot.org/c/flashrom/+/52876 Reviewed-by: Edward O'Callaghan Reviewed-by: Peter Marheine Tested-by: build bot (Jenkins) --- util/flashrom_tester/flashrom/src/cmd.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'util/flashrom_tester') diff --git a/util/flashrom_tester/flashrom/src/cmd.rs b/util/flashrom_tester/flashrom/src/cmd.rs index 3fd2ac04d..8775ed44b 100644 --- a/util/flashrom_tester/flashrom/src/cmd.rs +++ b/util/flashrom_tester/flashrom/src/cmd.rs @@ -90,8 +90,7 @@ fn flashrom_decode_opts(opts: FlashromOpt) -> Vec { if opts.wp_opt.range.is_some() { let (x0, x1) = opts.wp_opt.range.unwrap(); params.push("--wp-range".to_string()); - params.push(hex_string(x0)); - params.push(hex_string(x1)); + params.push(hex_range_string(x0, x1)); } if opts.wp_opt.status { params.push("--wp-status".to_string()); @@ -209,8 +208,8 @@ fn dut_ctrl(args: &[&str]) -> Result<(Vec, Vec), FlashromError> { Ok((output.stdout, output.stderr)) } -fn hex_string(v: i64) -> String { - format!("{:#08X}", v).to_string() +fn hex_range_string(s: i64, l: i64) -> String { + format!("{:#08X},{:#08X}", s, l).to_string() } #[cfg(test)] @@ -237,7 +236,7 @@ mod tests { status: true, ..Default::default() }, - &["--wp-range", "0x000000", "0x0004D2", "--wp-status"], + &["--wp-range", "0x000000,0x0004D2", "--wp-status"], ); test_wp_opt( WPOpt { -- cgit v1.2.3