openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 06:23:18 +02:00
Code Issues Releases Wiki Activity

flashrom_tester: Add _into_file to function names

Browse Source 
Rename Flashrom trait function names to reflect that the data is read
to/from a file provided as an argument.

BUG=None
BRANCH=None
TEST=cargo test; cargo check

Change-Id: I0015c9bf64349a5512dbdb0ef6f3dad38aa2fd8e
Signed-off-by: Evan Benn <evanbenn@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66956
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Evan Benn
2022-08-23 12:43:47 +10:00
committed by Edward O'Callaghan
parent 1acef16895
commit b41bb5622c
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/flashrom_tester/src/tester.rs
View File

@ -78,8 +78,8 @@ impl<'a> TestEnv<'a> {
};
info!("Stashing golden image for verification/recovery on completion");
out.cmd.read(&out.original_flash_contents)?;
out.cmd.verify(&out.original_flash_contents)?;
out.cmd.read_into_file(&out.original_flash_contents)?;
out.cmd.verify_from_file(&out.original_flash_contents)?;
info!("Generating random flash-sized data");
rand_util::gen_rand_testdata(&out.random_data, rom_sz as usize)
@ -124,14 +124,16 @@ impl<'a> TestEnv<'a> {
/// Return true if the current Flash contents are the same as the golden image
/// that was present at the start of testing.
pub fn is_golden(&self) -> bool {
self.cmd.verify(&self.original_flash_contents).is_ok()
self.cmd
.verify_from_file(&self.original_flash_contents)
.is_ok()
}
/// Do whatever is necessary to make the current Flash contents the same as they
/// were at the start of testing.
pub fn ensure_golden(&mut self) -> Result<(), FlashromError> {
self.wp.set_hw(false)?.set_sw(false)?;
self.cmd.write(&self.original_flash_contents)?;
self.cmd.write_from_file(&self.original_flash_contents)?;
Ok(())
}
@ -146,7 +148,7 @@ impl<'a> TestEnv<'a> {
///
/// Returns Err if they are not the same.
pub fn verify(&self, contents_path: &str) -> Result<(), FlashromError> {
self.cmd.verify(contents_path)?;
self.cmd.verify_from_file(contents_path)?;
Ok(())
}
}

3
util/flashrom_tester/src/tests.rs
View File

@ -243,7 +243,8 @@ fn elog_sanity_test(env: &mut TestEnv) -> TestResult {
env.ensure_golden()?;
const ELOG_RW_REGION_NAME: &str = "RW_ELOG";
env.cmd.read_region(ELOG_FILE, ELOG_RW_REGION_NAME)?;
env.cmd
.read_region_into_file(ELOG_FILE, ELOG_RW_REGION_NAME)?;
// Just checking for the magic numer
// TODO: improve this test to read the events