mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-05 13:05:45 +00:00
tests: Enable more integration test cases on AArch64
Enabled 3 test cases: - test_large_vm - test_huge_memory - test_serial_null Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
parent
dc71d2765a
commit
f2db346127
@ -2142,19 +2142,22 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(not(feature = "mmio"), test)]
|
#[cfg_attr(not(feature = "mmio"), test)]
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
fn test_large_vm() {
|
fn test_large_vm() {
|
||||||
test_block!(tb, "", {
|
test_block!(tb, "", {
|
||||||
let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
||||||
let guest = Guest::new(&mut focal);
|
let guest = Guest::new(&mut focal);
|
||||||
let mut child = GuestCommand::new(&guest)
|
let mut cmd = GuestCommand::new(&guest);
|
||||||
.args(&["--cpus", "boot=48"])
|
cmd.args(&["--cpus", "boot=48"])
|
||||||
.args(&["--memory", "size=5120M"])
|
.args(&["--memory", "size=5120M"])
|
||||||
.args(&["--kernel", guest.fw_path.as_str()])
|
.args(&["--kernel", guest.fw_path.as_str()])
|
||||||
.default_disks()
|
.default_disks()
|
||||||
.default_net()
|
.default_net();
|
||||||
.spawn()
|
|
||||||
.unwrap();
|
// Now AArch64 can only boot from direct kernel, command-line is needed.
|
||||||
|
#[cfg(target_arch = "aarch64")]
|
||||||
|
cmd.args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE]);
|
||||||
|
|
||||||
|
let mut child = cmd.spawn().unwrap();
|
||||||
|
|
||||||
thread::sleep(std::time::Duration::new(20, 0));
|
thread::sleep(std::time::Duration::new(20, 0));
|
||||||
|
|
||||||
@ -2167,19 +2170,22 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(not(feature = "mmio"), test)]
|
#[cfg_attr(not(feature = "mmio"), test)]
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
fn test_huge_memory() {
|
fn test_huge_memory() {
|
||||||
test_block!(tb, "", {
|
test_block!(tb, "", {
|
||||||
let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
||||||
let guest = Guest::new(&mut focal);
|
let guest = Guest::new(&mut focal);
|
||||||
let mut child = GuestCommand::new(&guest)
|
let mut cmd = GuestCommand::new(&guest);
|
||||||
.args(&["--cpus", "boot=1"])
|
cmd.args(&["--cpus", "boot=1"])
|
||||||
.args(&["--memory", "size=128G"])
|
.args(&["--memory", "size=128G"])
|
||||||
.args(&["--kernel", guest.fw_path.as_str()])
|
.args(&["--kernel", guest.fw_path.as_str()])
|
||||||
.default_disks()
|
.default_disks()
|
||||||
.default_net()
|
.default_net();
|
||||||
.spawn()
|
|
||||||
.unwrap();
|
// Now AArch64 can only boot from direct kernel, command-line is needed.
|
||||||
|
#[cfg(target_arch = "aarch64")]
|
||||||
|
cmd.args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE]);
|
||||||
|
|
||||||
|
let mut child = cmd.spawn().unwrap();
|
||||||
|
|
||||||
thread::sleep(std::time::Duration::new(20, 0));
|
thread::sleep(std::time::Duration::new(20, 0));
|
||||||
|
|
||||||
@ -2937,25 +2943,29 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg_attr(not(feature = "mmio"), test)]
|
#[cfg_attr(not(feature = "mmio"), test)]
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
fn test_serial_null() {
|
fn test_serial_null() {
|
||||||
test_block!(tb, "", {
|
test_block!(tb, "", {
|
||||||
let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
|
||||||
let guest = Guest::new(&mut focal);
|
let guest = Guest::new(&mut focal);
|
||||||
let mut child = GuestCommand::new(&guest)
|
let mut cmd = GuestCommand::new(&guest);
|
||||||
.args(&["--cpus", "boot=1"])
|
cmd.args(&["--cpus", "boot=1"])
|
||||||
.args(&["--memory", "size=512M"])
|
.args(&["--memory", "size=512M"])
|
||||||
.args(&["--kernel", guest.fw_path.as_str()])
|
.args(&["--kernel", guest.fw_path.as_str()])
|
||||||
.default_disks()
|
.default_disks()
|
||||||
.default_net()
|
.default_net()
|
||||||
.args(&["--serial", "null"])
|
.args(&["--serial", "null"])
|
||||||
.args(&["--console", "off"])
|
.args(&["--console", "off"])
|
||||||
.capture_output()
|
.capture_output();
|
||||||
.spawn()
|
|
||||||
.unwrap();
|
// Now AArch64 can only boot from direct kernel, command-line is needed.
|
||||||
|
#[cfg(target_arch = "aarch64")]
|
||||||
|
cmd.args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE]);
|
||||||
|
|
||||||
|
let mut child = cmd.spawn().unwrap();
|
||||||
|
|
||||||
thread::sleep(std::time::Duration::new(20, 0));
|
thread::sleep(std::time::Duration::new(20, 0));
|
||||||
|
|
||||||
|
#[cfg(target_arch = "x86_64")]
|
||||||
// Test that there is a ttyS0
|
// Test that there is a ttyS0
|
||||||
aver_eq!(
|
aver_eq!(
|
||||||
tb,
|
tb,
|
||||||
|
Loading…
Reference in New Issue
Block a user