Skip to content

Commit 02b304d

Browse files
authored
Merge branch 'main' into check-windows
2 parents e4df2fd + 029c652 commit 02b304d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

rust-vmm-ci

src/io.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ mod tests {
474474
}
475475

476476
// ---- Test ReadVolatile for File ----
477-
#[cfg(feature = "rawfd")]
477+
#[cfg(all(feature = "rawfd", not(miri)))]
478478
fn read_4_bytes_from_file(source: Vec<u8>, expected_output: [u8; 5]) {
479479
let mut temp_file = TempFile::new().unwrap().into_file();
480480
temp_file.write_all(source.as_ref()).unwrap();
@@ -518,7 +518,7 @@ mod tests {
518518

519519
for (input, output) in test_cases {
520520
read_4_bytes_to_5_byte_memory(input.clone(), output);
521-
#[cfg(feature = "rawfd")]
521+
#[cfg(all(feature = "rawfd", not(miri)))]
522522
read_4_bytes_from_file(input, output);
523523
}
524524
}
@@ -559,7 +559,7 @@ mod tests {
559559
}
560560

561561
// ---- Test ẂriteVolatile for File works ----
562-
#[cfg(feature = "rawfd")]
562+
#[cfg(all(feature = "rawfd", not(miri)))]
563563
fn write_5_bytes_to_file(mut source: Vec<u8>) {
564564
// Test write_volatile for File works
565565
let mut temp_file = TempFile::new().unwrap().into_file();
@@ -603,7 +603,7 @@ mod tests {
603603

604604
for (input, output) in test_cases {
605605
write_4_bytes_to_5_byte_vec(input.clone(), output);
606-
#[cfg(feature = "rawfd")]
606+
#[cfg(all(feature = "rawfd", not(miri)))]
607607
write_5_bytes_to_file(input);
608608
}
609609
}

0 commit comments

Comments
 (0)