mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
tests: consolidate arch constants into modules
This avoids having cfg(...) for each individual line. No functional change. Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
parent
d0bafc72f8
commit
3e0bf235bb
@ -52,45 +52,45 @@ mod tests {
|
|||||||
impl std::panic::RefUnwindSafe for Guest {}
|
impl std::panic::RefUnwindSafe for Guest {}
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-amd64.raw";
|
mod x86_64 {
|
||||||
|
pub const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-amd64.raw";
|
||||||
|
pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210609-0.raw";
|
||||||
|
pub const FOCAL_SGX_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-sgx.raw";
|
||||||
|
pub const HIRSUTE_NVIDIA_IMAGE_NAME: &str = "hirsute-server-cloudimg-amd64-nvidia.raw";
|
||||||
|
pub const FOCAL_IMAGE_NAME_QCOW2: &str =
|
||||||
|
"focal-server-cloudimg-amd64-custom-20210609-0.qcow2";
|
||||||
|
pub const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-amd64-custom-20210609-0.vhd";
|
||||||
|
pub const FOCAL_IMAGE_NAME_VHDX: &str =
|
||||||
|
"focal-server-cloudimg-amd64-custom-20210609-0.vhdx";
|
||||||
|
pub const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw";
|
||||||
|
pub const OVMF_NAME: &str = "OVMF-4b47d0c6c8.fd";
|
||||||
|
pub const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'IO-APIC.*ttyS0' /proc/interrupts || true";
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210609-0.raw";
|
use x86_64::*;
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
const FOCAL_SGX_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-sgx.raw";
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
const HIRSUTE_NVIDIA_IMAGE_NAME: &str = "hirsute-server-cloudimg-amd64-nvidia.raw";
|
|
||||||
#[cfg(target_arch = "aarch64")]
|
#[cfg(target_arch = "aarch64")]
|
||||||
const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-arm64.raw";
|
mod aarch64 {
|
||||||
|
pub const BIONIC_IMAGE_NAME: &str = "bionic-server-cloudimg-arm64.raw";
|
||||||
|
pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0.raw";
|
||||||
|
pub const FOCAL_IMAGE_UPDATE_KERNEL_NAME: &str =
|
||||||
|
"focal-server-cloudimg-arm64-custom-20210929-0-update-kernel.raw";
|
||||||
|
pub const FOCAL_IMAGE_NAME_QCOW2: &str =
|
||||||
|
"focal-server-cloudimg-arm64-custom-20210929-0.qcow2";
|
||||||
|
pub const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-arm64-custom-20210929-0.vhd";
|
||||||
|
pub const FOCAL_IMAGE_NAME_VHDX: &str =
|
||||||
|
"focal-server-cloudimg-arm64-custom-20210929-0.vhdx";
|
||||||
|
pub const GREP_SERIAL_IRQ_CMD: &str =
|
||||||
|
"grep -c 'GICv3.*uart-pl011' /proc/interrupts || true";
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(target_arch = "aarch64")]
|
#[cfg(target_arch = "aarch64")]
|
||||||
const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0.raw";
|
use aarch64::*;
|
||||||
#[cfg(target_arch = "aarch64")]
|
|
||||||
const FOCAL_IMAGE_UPDATE_KERNEL_NAME: &str =
|
|
||||||
"focal-server-cloudimg-arm64-custom-20210929-0-update-kernel.raw";
|
|
||||||
#[cfg(target_arch = "aarch64")]
|
|
||||||
const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-arm64-custom-20210929-0.qcow2";
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
const FOCAL_IMAGE_NAME_QCOW2: &str = "focal-server-cloudimg-amd64-custom-20210609-0.qcow2";
|
|
||||||
#[cfg(target_arch = "aarch64")]
|
|
||||||
const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-arm64-custom-20210929-0.vhd";
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
const FOCAL_IMAGE_NAME_VHD: &str = "focal-server-cloudimg-amd64-custom-20210609-0.vhd";
|
|
||||||
#[cfg(target_arch = "aarch64")]
|
|
||||||
const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-arm64-custom-20210929-0.vhdx";
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
const FOCAL_IMAGE_NAME_VHDX: &str = "focal-server-cloudimg-amd64-custom-20210609-0.vhdx";
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
const WINDOWS_IMAGE_NAME: &str = "windows-server-2019.raw";
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
const OVMF_NAME: &str = "OVMF-4b47d0c6c8.fd";
|
|
||||||
|
|
||||||
const DIRECT_KERNEL_BOOT_CMDLINE: &str =
|
const DIRECT_KERNEL_BOOT_CMDLINE: &str =
|
||||||
"root=/dev/vda1 console=hvc0 rw systemd.journald.forward_to_console=1";
|
"root=/dev/vda1 console=hvc0 rw systemd.journald.forward_to_console=1";
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'IO-APIC.*ttyS0' /proc/interrupts || true";
|
|
||||||
#[cfg(target_arch = "aarch64")]
|
|
||||||
const GREP_SERIAL_IRQ_CMD: &str = "grep -c 'GICv3.*uart-pl011' /proc/interrupts || true";
|
|
||||||
|
|
||||||
const PIPE_SIZE: i32 = 32 << 20;
|
const PIPE_SIZE: i32 = 32 << 20;
|
||||||
|
|
||||||
const CONSOLE_TEST_STRING: &str = "Started OpenBSD Secure Shell server";
|
const CONSOLE_TEST_STRING: &str = "Started OpenBSD Secure Shell server";
|
||||||
|
Loading…
Reference in New Issue
Block a user