From d1680b9ff9d1a861ebcc646d1c3abf8bb1948fcb Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Tue, 18 Nov 2025 07:24:05 +0100 Subject: [PATCH] tests: streamline module names to unit_tests This better aligns with the rest of the code and makes it clearer that these tests can run "as is" in a normal hosted environments without the special test environment. Signed-off-by: Philipp Schuster On-behalf-of: SAP philipp.schuster@sap.com --- arch/src/aarch64/mod.rs | 2 +- arch/src/riscv64/mod.rs | 2 +- arch/src/x86_64/mod.rs | 2 +- arch/src/x86_64/mptable.rs | 2 +- arch/src/x86_64/regs.rs | 2 +- arch/src/x86_64/smbios.rs | 2 +- arch/src/x86_64/tdx/mod.rs | 2 +- block/src/qcow/mod.rs | 2 +- block/src/qcow/vec_cache.rs | 2 +- block/src/vhd.rs | 2 +- devices/src/legacy/fw_cfg.rs | 2 +- devices/src/legacy/gpio_pl061.rs | 2 +- devices/src/legacy/rtc_pl031.rs | 2 +- devices/src/legacy/serial.rs | 2 +- devices/src/legacy/uart_pl011.rs | 2 +- devices/src/tpm.rs | 2 +- fuzz/fuzz_targets/vsock.rs | 2 +- hypervisor/src/arch/x86/emulator/instructions/cmp.rs | 2 +- hypervisor/src/arch/x86/emulator/instructions/mov.rs | 2 +- hypervisor/src/arch/x86/emulator/instructions/movs.rs | 2 +- hypervisor/src/arch/x86/emulator/instructions/or.rs | 2 +- hypervisor/src/arch/x86/emulator/instructions/stos.rs | 2 +- hypervisor/src/arch/x86/emulator/mod.rs | 2 +- hypervisor/src/arch/x86/gdt.rs | 2 +- hypervisor/src/kvm/aarch64/gic/mod.rs | 2 +- hypervisor/src/kvm/mod.rs | 2 +- hypervisor/src/kvm/riscv64/aia.rs | 2 +- net_util/src/lib.rs | 2 +- net_util/src/mac.rs | 2 +- net_util/src/tap.rs | 2 +- option_parser/src/lib.rs | 2 +- pci/src/configuration.rs | 2 +- performance-metrics/src/performance_tests.rs | 2 +- rate_limiter/src/group.rs | 2 +- rate_limiter/src/lib.rs | 2 +- src/bin/ch-remote.rs | 2 +- tpm/src/lib.rs | 2 +- virtio-devices/src/transport/pci_common_config.rs | 2 +- virtio-devices/src/vsock/csm/connection.rs | 4 ++-- virtio-devices/src/vsock/csm/txbuf.rs | 2 +- virtio-devices/src/vsock/device.rs | 4 ++-- virtio-devices/src/vsock/mod.rs | 2 +- virtio-devices/src/vsock/packet.rs | 4 ++-- virtio-devices/src/vsock/unix/muxer.rs | 4 ++-- vm-allocator/src/address.rs | 2 +- vm-device/src/bus.rs | 2 +- vm-migration/src/bitpos_iterator.rs | 2 +- vm-migration/src/protocol.rs | 2 +- vmm/src/config.rs | 2 +- vmm/src/cpu.rs | 4 ++-- vmm/src/device_manager.rs | 2 +- vmm/src/device_tree.rs | 2 +- vmm/src/vm.rs | 4 ++-- 53 files changed, 59 insertions(+), 59 deletions(-) diff --git a/arch/src/aarch64/mod.rs b/arch/src/aarch64/mod.rs index 95c4cb3fd..910c14998 100644 --- a/arch/src/aarch64/mod.rs +++ b/arch/src/aarch64/mod.rs @@ -192,7 +192,7 @@ pub fn get_host_cpu_phys_bits(hypervisor: &dyn hypervisor::Hypervisor) -> u8 { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/arch/src/riscv64/mod.rs b/arch/src/riscv64/mod.rs index b4feb99d5..0ee66db32 100644 --- a/arch/src/riscv64/mod.rs +++ b/arch/src/riscv64/mod.rs @@ -218,7 +218,7 @@ pub fn get_host_cpu_phys_bits(_hypervisor: &dyn hypervisor::Hypervisor) -> u8 { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/arch/src/x86_64/mod.rs b/arch/src/x86_64/mod.rs index 9a02ed296..91fba56c0 100644 --- a/arch/src/x86_64/mod.rs +++ b/arch/src/x86_64/mod.rs @@ -1428,7 +1428,7 @@ fn update_cpuid_topology( } } #[cfg(test)] -mod tests { +mod unit_tests { use linux_loader::loader::bootparam::boot_e820_entry; use super::*; diff --git a/arch/src/x86_64/mptable.rs b/arch/src/x86_64/mptable.rs index 2e2669b38..a0e6dc47e 100644 --- a/arch/src/x86_64/mptable.rs +++ b/arch/src/x86_64/mptable.rs @@ -297,7 +297,7 @@ pub fn setup_mptable( } #[cfg(test)] -mod tests { +mod unit_tests { use vm_memory::bitmap::BitmapSlice; use vm_memory::{GuestUsize, VolatileMemoryError, VolatileSlice, WriteVolatile}; diff --git a/arch/src/x86_64/regs.rs b/arch/src/x86_64/regs.rs index 199398570..6e7292f3c 100644 --- a/arch/src/x86_64/regs.rs +++ b/arch/src/x86_64/regs.rs @@ -196,7 +196,7 @@ pub fn configure_segments_and_sregs( } #[cfg(test)] -mod tests { +mod unit_tests { use vm_memory::GuestAddress; use super::*; diff --git a/arch/src/x86_64/smbios.rs b/arch/src/x86_64/smbios.rs index 7d867a43c..ee1499982 100644 --- a/arch/src/x86_64/smbios.rs +++ b/arch/src/x86_64/smbios.rs @@ -272,7 +272,7 @@ pub fn setup_smbios( } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/arch/src/x86_64/tdx/mod.rs b/arch/src/x86_64/tdx/mod.rs index c68b878be..814c16aaf 100644 --- a/arch/src/x86_64/tdx/mod.rs +++ b/arch/src/x86_64/tdx/mod.rs @@ -519,7 +519,7 @@ impl TdHob { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/block/src/qcow/mod.rs b/block/src/qcow/mod.rs index d9684a4ad..e4f9790c9 100644 --- a/block/src/qcow/mod.rs +++ b/block/src/qcow/mod.rs @@ -1815,7 +1815,7 @@ pub fn detect_image_type(file: &mut RawFile) -> Result { } #[cfg(test)] -mod tests { +mod unit_tests { use std::fs::File; use std::path::Path; diff --git a/block/src/qcow/vec_cache.rs b/block/src/qcow/vec_cache.rs index 4b18518b0..d0c3acf08 100644 --- a/block/src/qcow/vec_cache.rs +++ b/block/src/qcow/vec_cache.rs @@ -135,7 +135,7 @@ impl CacheMap { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; struct NumCache(()); diff --git a/block/src/vhd.rs b/block/src/vhd.rs index 6659ed038..5a8e59de3 100644 --- a/block/src/vhd.rs +++ b/block/src/vhd.rs @@ -117,7 +117,7 @@ pub fn is_fixed_vhd(f: &mut File) -> std::io::Result { } #[cfg(test)] -mod tests { +mod unit_tests { use std::fs::File; use std::io::{Seek, SeekFrom, Write}; diff --git a/devices/src/legacy/fw_cfg.rs b/devices/src/legacy/fw_cfg.rs index 00b5bd745..1a5c6478c 100644 --- a/devices/src/legacy/fw_cfg.rs +++ b/devices/src/legacy/fw_cfg.rs @@ -798,7 +798,7 @@ impl BusDevice for FwCfg { } #[cfg(test)] -mod tests { +mod unit_tests { use std::ffi::CString; use std::io::Write; diff --git a/devices/src/legacy/gpio_pl061.rs b/devices/src/legacy/gpio_pl061.rs index 3a61238dd..a5ec570b8 100644 --- a/devices/src/legacy/gpio_pl061.rs +++ b/devices/src/legacy/gpio_pl061.rs @@ -323,7 +323,7 @@ impl Transportable for Gpio {} impl Migratable for Gpio {} #[cfg(test)] -mod tests { +mod unit_tests { use vm_device::interrupt::{InterruptIndex, InterruptSourceConfig}; use vmm_sys_util::eventfd::EventFd; diff --git a/devices/src/legacy/rtc_pl031.rs b/devices/src/legacy/rtc_pl031.rs index 9ff0c8c1b..985edd570 100644 --- a/devices/src/legacy/rtc_pl031.rs +++ b/devices/src/legacy/rtc_pl031.rs @@ -216,7 +216,7 @@ impl BusDevice for Rtc { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; use crate::{ read_be_u16, read_be_u32, read_le_i32, read_le_u16, read_le_u64, write_be_u16, diff --git a/devices/src/legacy/serial.rs b/devices/src/legacy/serial.rs index cbfb2c10b..11c5769b6 100644 --- a/devices/src/legacy/serial.rs +++ b/devices/src/legacy/serial.rs @@ -340,7 +340,7 @@ impl Transportable for Serial {} impl Migratable for Serial {} #[cfg(test)] -mod tests { +mod unit_tests { use std::sync::Mutex; use vm_device::interrupt::{InterruptIndex, InterruptSourceConfig}; diff --git a/devices/src/legacy/uart_pl011.rs b/devices/src/legacy/uart_pl011.rs index 364dd5927..8af77d0e4 100644 --- a/devices/src/legacy/uart_pl011.rs +++ b/devices/src/legacy/uart_pl011.rs @@ -453,7 +453,7 @@ impl Transportable for Pl011 {} impl Migratable for Pl011 {} #[cfg(test)] -mod tests { +mod unit_tests { use std::sync::Mutex; use vm_device::interrupt::{InterruptIndex, InterruptSourceConfig}; diff --git a/devices/src/tpm.rs b/devices/src/tpm.rs index fa8d468b8..1c6879b1a 100644 --- a/devices/src/tpm.rs +++ b/devices/src/tpm.rs @@ -531,7 +531,7 @@ impl BusDevice for Tpm { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/fuzz/fuzz_targets/vsock.rs b/fuzz/fuzz_targets/vsock.rs index 24763de26..144b8b405 100644 --- a/fuzz/fuzz_targets/vsock.rs +++ b/fuzz/fuzz_targets/vsock.rs @@ -9,7 +9,7 @@ use std::sync::Arc; use libfuzzer_sys::{fuzz_target, Corpus}; use seccompiler::SeccompAction; -use virtio_devices::vsock::tests::TestBackend; +use virtio_devices::vsock::unit_tests::TestBackend; use virtio_devices::{VirtioDevice, VirtioInterrupt, VirtioInterruptType}; use virtio_queue::{Queue, QueueT}; use vm_memory::bitmap::AtomicBitmap; diff --git a/hypervisor/src/arch/x86/emulator/instructions/cmp.rs b/hypervisor/src/arch/x86/emulator/instructions/cmp.rs index 21974a578..4dd139c9d 100644 --- a/hypervisor/src/arch/x86/emulator/instructions/cmp.rs +++ b/hypervisor/src/arch/x86/emulator/instructions/cmp.rs @@ -208,7 +208,7 @@ impl InstructionHandler for Cmp_rm64_imm8 { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; use crate::arch::x86::emulator::mock_vmm::*; diff --git a/hypervisor/src/arch/x86/emulator/instructions/mov.rs b/hypervisor/src/arch/x86/emulator/instructions/mov.rs index 98d71a107..660462fbd 100644 --- a/hypervisor/src/arch/x86/emulator/instructions/mov.rs +++ b/hypervisor/src/arch/x86/emulator/instructions/mov.rs @@ -268,7 +268,7 @@ impl InstructionHandler for Mov_RAX_moffs64 { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; use crate::arch::x86::emulator::mock_vmm::*; diff --git a/hypervisor/src/arch/x86/emulator/instructions/movs.rs b/hypervisor/src/arch/x86/emulator/instructions/movs.rs index 039172e8a..5642e04f4 100644 --- a/hypervisor/src/arch/x86/emulator/instructions/movs.rs +++ b/hypervisor/src/arch/x86/emulator/instructions/movs.rs @@ -104,7 +104,7 @@ impl InstructionHandler for Movsb_m8_m8 { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; use crate::arch::x86::emulator::mock_vmm::*; diff --git a/hypervisor/src/arch/x86/emulator/instructions/or.rs b/hypervisor/src/arch/x86/emulator/instructions/or.rs index 0e5fbc02a..903c64be4 100644 --- a/hypervisor/src/arch/x86/emulator/instructions/or.rs +++ b/hypervisor/src/arch/x86/emulator/instructions/or.rs @@ -49,7 +49,7 @@ impl InstructionHandler for Or_rm8_r8 { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; use crate::arch::x86::emulator::mock_vmm::*; diff --git a/hypervisor/src/arch/x86/emulator/instructions/stos.rs b/hypervisor/src/arch/x86/emulator/instructions/stos.rs index b959ff464..38233eea4 100644 --- a/hypervisor/src/arch/x86/emulator/instructions/stos.rs +++ b/hypervisor/src/arch/x86/emulator/instructions/stos.rs @@ -90,7 +90,7 @@ impl InstructionHandler for Stosb_m8_AL { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; use crate::arch::x86::emulator::mock_vmm::*; diff --git a/hypervisor/src/arch/x86/emulator/mod.rs b/hypervisor/src/arch/x86/emulator/mod.rs index 778fd47f5..15239a4f8 100644 --- a/hypervisor/src/arch/x86/emulator/mod.rs +++ b/hypervisor/src/arch/x86/emulator/mod.rs @@ -786,7 +786,7 @@ mod mock_vmm { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; use crate::arch::x86::emulator::mock_vmm::*; diff --git a/hypervisor/src/arch/x86/gdt.rs b/hypervisor/src/arch/x86/gdt.rs index 88eeb350d..6d0a81c8b 100644 --- a/hypervisor/src/arch/x86/gdt.rs +++ b/hypervisor/src/arch/x86/gdt.rs @@ -114,7 +114,7 @@ pub fn segment_from_gdt(entry: u64, table_index: u8) -> SegmentRegister { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/hypervisor/src/kvm/aarch64/gic/mod.rs b/hypervisor/src/kvm/aarch64/gic/mod.rs index 8bd0ed240..2e5523e97 100644 --- a/hypervisor/src/kvm/aarch64/gic/mod.rs +++ b/hypervisor/src/kvm/aarch64/gic/mod.rs @@ -481,7 +481,7 @@ impl Vgic for KvmGicV3Its { } #[cfg(test)] -mod tests { +mod unit_tests { use crate::HypervisorVmConfig; use crate::aarch64::gic::{ get_dist_regs, get_icc_regs, get_redist_regs, set_dist_regs, set_icc_regs, set_redist_regs, diff --git a/hypervisor/src/kvm/mod.rs b/hypervisor/src/kvm/mod.rs index 5ce110d89..f4738cbf0 100644 --- a/hypervisor/src/kvm/mod.rs +++ b/hypervisor/src/kvm/mod.rs @@ -2937,7 +2937,7 @@ impl KvmVcpu { } #[cfg(test)] -mod tests { +mod unit_tests { #[test] #[cfg(target_arch = "riscv64")] fn test_get_and_set_regs() { diff --git a/hypervisor/src/kvm/riscv64/aia.rs b/hypervisor/src/kvm/riscv64/aia.rs index 88ca061c0..9eb6e5f39 100644 --- a/hypervisor/src/kvm/riscv64/aia.rs +++ b/hypervisor/src/kvm/riscv64/aia.rs @@ -250,7 +250,7 @@ impl Vaia for KvmAiaImsics { } #[cfg(test)] -mod tests { +mod unit_tests { use crate::HypervisorVmConfig; use crate::arch::riscv64::aia::VaiaConfig; use crate::kvm::KvmAiaImsics; diff --git a/net_util/src/lib.rs b/net_util/src/lib.rs index 4ad7a1c77..1cc43d475 100644 --- a/net_util/src/lib.rs +++ b/net_util/src/lib.rs @@ -189,7 +189,7 @@ pub fn virtio_features_to_tap_offload(features: u64) -> c_uint { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/net_util/src/mac.rs b/net_util/src/mac.rs index 432bfebae..d3a3c9575 100644 --- a/net_util/src/mac.rs +++ b/net_util/src/mac.rs @@ -139,7 +139,7 @@ impl FromStr for MacAddr { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/net_util/src/tap.rs b/net_util/src/tap.rs index 45d6a77de..111bf07de 100644 --- a/net_util/src/tap.rs +++ b/net_util/src/tap.rs @@ -550,7 +550,7 @@ impl AsRawFd for Tap { #[cfg(test)] #[cfg(devcli_testenv)] // we need special permissions in the ENV to create Tap devices -mod tests { +mod unit_tests { use std::net::Ipv4Addr; use std::sync::{LazyLock, Mutex, mpsc}; use std::time::Duration; diff --git a/option_parser/src/lib.rs b/option_parser/src/lib.rs index d28c2db5e..39fb1e51e 100644 --- a/option_parser/src/lib.rs +++ b/option_parser/src/lib.rs @@ -442,7 +442,7 @@ impl Parseable for StringList { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/pci/src/configuration.rs b/pci/src/configuration.rs index 799837068..b3dd5a610 100644 --- a/pci/src/configuration.rs +++ b/pci/src/configuration.rs @@ -1180,7 +1180,7 @@ impl PciBarConfiguration { } #[cfg(test)] -mod tests { +mod unit_tests { use vm_memory::ByteValued; use super::*; diff --git a/performance-metrics/src/performance_tests.rs b/performance-metrics/src/performance_tests.rs index f52156c70..cf8a70c14 100644 --- a/performance-metrics/src/performance_tests.rs +++ b/performance-metrics/src/performance_tests.rs @@ -553,7 +553,7 @@ pub fn performance_restore_latency(control: &PerformanceTestControl) -> f64 { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/rate_limiter/src/group.rs b/rate_limiter/src/group.rs index e89dddae7..9ef2a56cd 100644 --- a/rate_limiter/src/group.rs +++ b/rate_limiter/src/group.rs @@ -297,7 +297,7 @@ impl Drop for RateLimiterGroup { } #[cfg(test)] -pub(crate) mod tests { +pub(crate) mod unit_tests { use std::os::fd::AsRawFd; use std::thread; use std::time::Duration; diff --git a/rate_limiter/src/lib.rs b/rate_limiter/src/lib.rs index 72221416f..6c71036b2 100644 --- a/rate_limiter/src/lib.rs +++ b/rate_limiter/src/lib.rs @@ -522,7 +522,7 @@ impl Default for RateLimiter { } #[cfg(test)] -pub(crate) mod tests { +pub(crate) mod unit_tests { use std::{fmt, thread}; use super::*; diff --git a/src/bin/ch-remote.rs b/src/bin/ch-remote.rs index 803ffc7ee..1393d25f1 100644 --- a/src/bin/ch-remote.rs +++ b/src/bin/ch-remote.rs @@ -1205,7 +1205,7 @@ fn main() { } #[cfg(test)] -mod tests { +mod unit_tests { use std::cmp::Ordering; use super::*; diff --git a/tpm/src/lib.rs b/tpm/src/lib.rs index 915386979..80c28fa97 100644 --- a/tpm/src/lib.rs +++ b/tpm/src/lib.rs @@ -381,7 +381,7 @@ impl Ptm for PtmSetBufferSize { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] fn test_ptmresult() -> Result<()> { diff --git a/virtio-devices/src/transport/pci_common_config.rs b/virtio-devices/src/transport/pci_common_config.rs index 0680b4a30..448935cde 100644 --- a/virtio-devices/src/transport/pci_common_config.rs +++ b/virtio-devices/src/transport/pci_common_config.rs @@ -392,7 +392,7 @@ impl Snapshottable for VirtioPciCommonConfig { } #[cfg(test)] -mod tests { +mod unit_tests { use vm_memory::GuestMemoryAtomic; use vmm_sys_util::eventfd::EventFd; diff --git a/virtio-devices/src/vsock/csm/connection.rs b/virtio-devices/src/vsock/csm/connection.rs index e36f58ccb..69589a45b 100644 --- a/virtio-devices/src/vsock/csm/connection.rs +++ b/virtio-devices/src/vsock/csm/connection.rs @@ -670,14 +670,14 @@ where } #[cfg(test)] -mod tests { +mod unit_tests { use std::io::{Error as IoError, Result as IoResult}; use libc::EFD_NONBLOCK; use virtio_queue::QueueOwnedT; use vmm_sys_util::eventfd::EventFd; - use super::super::super::tests::TestContext; + use super::super::super::unit_tests::TestContext; use super::super::defs as csm_defs; use super::*; diff --git a/virtio-devices/src/vsock/csm/txbuf.rs b/virtio-devices/src/vsock/csm/txbuf.rs index 1a8c5dd15..38906fc83 100644 --- a/virtio-devices/src/vsock/csm/txbuf.rs +++ b/virtio-devices/src/vsock/csm/txbuf.rs @@ -142,7 +142,7 @@ impl TxBuf { } #[cfg(test)] -mod tests { +mod unit_tests { use std::io::{Error as IoError, ErrorKind, Result as IoResult}; use super::*; diff --git a/virtio-devices/src/vsock/device.rs b/virtio-devices/src/vsock/device.rs index 657e80879..364b78a25 100644 --- a/virtio-devices/src/vsock/device.rs +++ b/virtio-devices/src/vsock/device.rs @@ -514,10 +514,10 @@ impl Transportable for Vsock where B: VsockBackend + Sync + 'static {} impl Migratable for Vsock where B: VsockBackend + Sync + 'static {} #[cfg(test)] -mod tests { +mod unit_tests { use libc::EFD_NONBLOCK; - use super::super::tests::{NoopVirtioInterrupt, TestContext}; + use super::super::unit_tests::{NoopVirtioInterrupt, TestContext}; use super::super::*; use super::*; use crate::ActivateError; diff --git a/virtio-devices/src/vsock/mod.rs b/virtio-devices/src/vsock/mod.rs index 3cd9592a6..789558785 100644 --- a/virtio-devices/src/vsock/mod.rs +++ b/virtio-devices/src/vsock/mod.rs @@ -161,7 +161,7 @@ pub trait VsockChannel { pub trait VsockBackend: VsockChannel + VsockEpollListener + Send {} #[cfg(any(test, fuzzing))] -pub mod tests { +pub mod unit_tests { use std::os::unix::io::AsRawFd; use std::path::PathBuf; use std::sync::{Arc, RwLock}; diff --git a/virtio-devices/src/vsock/packet.rs b/virtio-devices/src/vsock/packet.rs index 4606c93b1..d28b7b508 100644 --- a/virtio-devices/src/vsock/packet.rs +++ b/virtio-devices/src/vsock/packet.rs @@ -418,13 +418,13 @@ impl VsockPacket { #[cfg(test)] #[allow(clippy::undocumented_unsafe_blocks)] -mod tests { +mod unit_tests { use virtio_bindings::virtio_ring::VRING_DESC_F_WRITE; use virtio_queue::QueueOwnedT; use vm_memory::GuestAddress; use vm_virtio::queue::testing::VirtqDesc as GuestQDesc; - use super::super::tests::TestContext; + use super::super::unit_tests::TestContext; use super::*; use crate::GuestMemoryMmap; use crate::vsock::defs::MAX_PKT_BUF_SIZE; diff --git a/virtio-devices/src/vsock/unix/muxer.rs b/virtio-devices/src/vsock/unix/muxer.rs index e2e9fe2e2..e02d3429f 100644 --- a/virtio-devices/src/vsock/unix/muxer.rs +++ b/virtio-devices/src/vsock/unix/muxer.rs @@ -867,7 +867,7 @@ impl VsockMuxer { } #[cfg(test)] -mod tests { +mod unit_tests { use std::cmp::min; use std::io::Write; use std::path::{Path, PathBuf}; @@ -875,7 +875,7 @@ mod tests { use virtio_queue::QueueOwnedT; use super::super::super::csm::defs as csm_defs; - use super::super::super::tests::TestContext as VsockTestContext; + use super::super::super::unit_tests::TestContext as VsockTestContext; use super::*; impl PartiallyReadCommand { diff --git a/vm-allocator/src/address.rs b/vm-allocator/src/address.rs index c847dd473..3cc5ed9c8 100644 --- a/vm-allocator/src/address.rs +++ b/vm-allocator/src/address.rs @@ -215,7 +215,7 @@ impl AddressAllocator { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/vm-device/src/bus.rs b/vm-device/src/bus.rs index fdfb82c9f..fc3bbeb46 100644 --- a/vm-device/src/bus.rs +++ b/vm-device/src/bus.rs @@ -259,7 +259,7 @@ impl Bus { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; struct DummyDevice; diff --git a/vm-migration/src/bitpos_iterator.rs b/vm-migration/src/bitpos_iterator.rs index cce89ff0f..35d088634 100644 --- a/vm-migration/src/bitpos_iterator.rs +++ b/vm-migration/src/bitpos_iterator.rs @@ -74,7 +74,7 @@ pub trait BitposIteratorExt: Iterator + Sized { impl + Sized> BitposIteratorExt for I {} #[cfg(test)] -mod tests { +mod unit_tests { use super::*; fn bitpos_check(inp: &[u64], out: &[u64]) { diff --git a/vm-migration/src/protocol.rs b/vm-migration/src/protocol.rs index b66c9a7ad..eb2bcb0e6 100644 --- a/vm-migration/src/protocol.rs +++ b/vm-migration/src/protocol.rs @@ -320,7 +320,7 @@ impl MemoryRangeTable { } #[cfg(test)] -mod tests { +mod unit_tests { use crate::protocol::{MemoryRange, MemoryRangeTable}; #[test] diff --git a/vmm/src/config.rs b/vmm/src/config.rs index 6ecdd3c80..86136c9ec 100644 --- a/vmm/src/config.rs +++ b/vmm/src/config.rs @@ -3170,7 +3170,7 @@ impl Drop for VmConfig { } #[cfg(test)] -mod tests { +mod unit_tests { use std::fs::File; use std::os::unix::io::AsRawFd; diff --git a/vmm/src/cpu.rs b/vmm/src/cpu.rs index 02e1cc315..5c80e5bb1 100644 --- a/vmm/src/cpu.rs +++ b/vmm/src/cpu.rs @@ -2992,7 +2992,7 @@ impl CpuElf64Writable for CpuManager { #[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(test)] -mod tests { +mod unit_tests { use arch::layout::{BOOT_STACK_POINTER, ZERO_PAGE_START}; use arch::x86_64::interrupts::*; use arch::x86_64::regs::*; @@ -3140,7 +3140,7 @@ mod tests { #[cfg(target_arch = "aarch64")] #[cfg(test)] -mod tests { +mod unit_tests { #[cfg(feature = "kvm")] use std::{mem, mem::offset_of}; diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index e52c5900b..fed3eee63 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -5496,7 +5496,7 @@ impl Drop for DeviceManager { } #[cfg(test)] -mod tests { +mod unit_tests { use super::*; #[test] diff --git a/vmm/src/device_tree.rs b/vmm/src/device_tree.rs index f83788687..e84cb524d 100644 --- a/vmm/src/device_tree.rs +++ b/vmm/src/device_tree.rs @@ -152,7 +152,7 @@ impl DoubleEndedIterator for BftIter<'_> { } #[cfg(test)] -mod tests { +mod unit_tests { use super::{DeviceNode, DeviceTree}; #[test] diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index 2271c65fd..3aa77a69b 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -3167,7 +3167,7 @@ impl GuestDebuggable for Vm { #[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(test)] -mod tests { +mod unit_tests { use super::*; fn test_vm_state_transitions(state: VmState) { @@ -3443,7 +3443,7 @@ mod tests { #[cfg(target_arch = "aarch64")] #[cfg(test)] -mod tests { +mod unit_tests { use arch::aarch64::fdt::create_fdt; use arch::aarch64::layout; use arch::{DeviceType, MmioDeviceInfo};