mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-06 02:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

disk: fix composite unit test build

Browse source 
This was unintentionally broken when changing ReadWriteVolatile to
ReadWriteVolatileAt (the composite unit tests aren't built or run by
default since they are behind a feature flag).

BUG=None
TEST=cargo test --features=composite-disk -p disk

Change-Id: I864d7063bd27a401c3d878fcd22b52e2357fde8d
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1913960
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Cody Schuffelen <schuffelen@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
This commit is contained in:
Daniel Verkamp 2019-11-13 09:43:22 -08:00 committed by Commit Bot
parent e7d7728701
commit bdd708edd2
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
disk/src/composite.rs
View file

@ -384,13 +384,12 @@ mod tests {
let mut input_memory = [55u8; 5]; let mut input_memory = [55u8; 5];
let input_volatile_memory = &mut input_memory[..]; let input_volatile_memory = &mut input_memory[..];
composite composite
.write_all_volatile(input_volatile_memory.get_slice(0, 5).unwrap()) .write_all_at_volatile(input_volatile_memory.get_slice(0, 5).unwrap(), 0)
.unwrap(); .unwrap();
composite.seek(SeekFrom::Start(0)).unwrap();
let mut output_memory = [0u8; 5]; let mut output_memory = [0u8; 5];
let output_volatile_memory = &mut output_memory[..]; let output_volatile_memory = &mut output_memory[..];
composite composite
.read_exact_volatile(output_volatile_memory.get_slice(0, 5).unwrap()) .read_exact_at_volatile(output_volatile_memory.get_slice(0, 5).unwrap(), 0)
.unwrap(); .unwrap();
assert_eq!(input_memory, output_memory); assert_eq!(input_memory, output_memory);
} }
@ -445,17 +444,15 @@ mod tests {
}; };
let mut composite = let mut composite =
CompositeDiskFile::new(vec![disk_part1, disk_part2, disk_part3]).unwrap(); CompositeDiskFile::new(vec![disk_part1, disk_part2, disk_part3]).unwrap();
composite.seek(SeekFrom::Start(50)).unwrap();
let mut input_memory = [55u8; 200]; let mut input_memory = [55u8; 200];
let input_volatile_memory = &mut input_memory[..]; let input_volatile_memory = &mut input_memory[..];
composite composite
.write_all_volatile(input_volatile_memory.get_slice(0, 200).unwrap()) .write_all_at_volatile(input_volatile_memory.get_slice(0, 200).unwrap(), 50)
.unwrap(); .unwrap();
composite.seek(SeekFrom::Start(50)).unwrap();
let mut output_memory = [0u8; 200]; let mut output_memory = [0u8; 200];
let output_volatile_memory = &mut output_memory[..]; let output_volatile_memory = &mut output_memory[..];
composite composite
.read_exact_volatile(output_volatile_memory.get_slice(0, 200).unwrap()) .read_exact_at_volatile(output_volatile_memory.get_slice(0, 200).unwrap(), 50)
.unwrap(); .unwrap();
assert!(input_memory.into_iter().eq(output_memory.into_iter())); assert!(input_memory.into_iter().eq(output_memory.into_iter()));
} }
@ -482,18 +479,16 @@ mod tests {
}; };
let mut composite = let mut composite =
CompositeDiskFile::new(vec![disk_part1, disk_part2, disk_part3]).unwrap(); CompositeDiskFile::new(vec![disk_part1, disk_part2, disk_part3]).unwrap();
composite.seek(SeekFrom::Start(0)).unwrap();
let mut input_memory = [55u8; 300]; let mut input_memory = [55u8; 300];
let input_volatile_memory = &mut input_memory[..]; let input_volatile_memory = &mut input_memory[..];
composite composite
.write_all_volatile(input_volatile_memory.get_slice(0, 300).unwrap()) .write_all_at_volatile(input_volatile_memory.get_slice(0, 300).unwrap(), 0)
.unwrap(); .unwrap();
composite.punch_hole(50, 200).unwrap(); composite.punch_hole(50, 200).unwrap();
composite.seek(SeekFrom::Start(0)).unwrap();
let mut output_memory = [0u8; 300]; let mut output_memory = [0u8; 300];
let output_volatile_memory = &mut output_memory[..]; let output_volatile_memory = &mut output_memory[..];
composite composite
.read_exact_volatile(output_volatile_memory.get_slice(0, 300).unwrap()) .read_exact_at_volatile(output_volatile_memory.get_slice(0, 300).unwrap(), 0)
.unwrap(); .unwrap();
for i in 50..250 { for i in 50..250 {
@ -524,22 +519,20 @@ mod tests {
}; };
let mut composite = let mut composite =
CompositeDiskFile::new(vec![disk_part1, disk_part2, disk_part3]).unwrap(); CompositeDiskFile::new(vec![disk_part1, disk_part2, disk_part3]).unwrap();
composite.seek(SeekFrom::Start(0)).unwrap();
let mut input_memory = [55u8; 300]; let mut input_memory = [55u8; 300];
let input_volatile_memory = &mut input_memory[..]; let input_volatile_memory = &mut input_memory[..];
composite composite
.write_all_volatile(input_volatile_memory.get_slice(0, 300).unwrap()) .write_all_at_volatile(input_volatile_memory.get_slice(0, 300).unwrap(), 0)
.unwrap(); .unwrap();
composite.seek(SeekFrom::Start(50)).unwrap(); composite.seek(SeekFrom::Start(50)).unwrap();
let mut zeroes_written = 0; let mut zeroes_written = 0;
while zeroes_written < 200 { while zeroes_written < 200 {
zeroes_written += composite.write_zeroes(200 - zeroes_written).unwrap(); zeroes_written += composite.write_zeroes(200 - zeroes_written).unwrap();
} }
composite.seek(SeekFrom::Start(0)).unwrap();
let mut output_memory = [0u8; 300]; let mut output_memory = [0u8; 300];
let output_volatile_memory = &mut output_memory[..]; let output_volatile_memory = &mut output_memory[..];
composite composite
.read_exact_volatile(output_volatile_memory.get_slice(0, 300).unwrap()) .read_exact_at_volatile(output_volatile_memory.get_slice(0, 300).unwrap(), 0)
.unwrap(); .unwrap();
for i in 50..250 { for i in 50..250 {