External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-03-07 17:26:14 +00:00
Code

tests: Enable test_multi_cpu case on AArch64

Browse Source 
Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao 2020-08-26 22:10:47 +08:00 committed by Sebastien Boeuf
parent 85c9bd0f47
commit 2b8e08bd36
1 changed files with 21 additions and 6 deletions

27
tests/integration.rs

@ -2098,24 +2098,27 @@ mod tests {
} }
#[cfg_attr(not(feature = "mmio"), test)] #[cfg_attr(not(feature = "mmio"), test)]
#[cfg(target_arch = "x86_64")]
fn test_multi_cpu() { fn test_multi_cpu() {
test_block!(tb, "", { test_block!(tb, "", {
let mut bionic = UbuntuDiskConfig::new(BIONIC_IMAGE_NAME.to_string()); let mut bionic = UbuntuDiskConfig::new(BIONIC_IMAGE_NAME.to_string());
let guest = Guest::new(&mut bionic); let guest = Guest::new(&mut bionic);
let mut child = GuestCommand::new(&guest) let mut cmd = GuestCommand::new(&guest);
.args(&["--cpus", "boot=2,max=4"]) cmd.args(&["--cpus", "boot=2,max=4"])
.args(&["--memory", "size=512M"]) .args(&["--memory", "size=512M"])
.args(&["--kernel", guest.fw_path.as_str()]) .args(&["--kernel", guest.fw_path.as_str()])
.default_raw_disks() .default_raw_disks()
.default_net() .default_net();
.spawn()
.unwrap(); #[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));
aver_eq!(tb, guest.get_cpu_count().unwrap_or_default(), 2); aver_eq!(tb, guest.get_cpu_count().unwrap_or_default(), 2);
#[cfg(target_arch = "x86_64")]
aver_eq!( aver_eq!(
tb, tb,
guest guest
@ -2126,6 +2129,18 @@ mod tests {
.trim(), .trim(),
"smpboot: Allowing 4 CPUs, 2 hotplug CPUs" "smpboot: Allowing 4 CPUs, 2 hotplug CPUs"
); );
#[cfg(target_arch = "aarch64")]
aver_eq!(
tb,
guest
.ssh_command(
r#"dmesg | grep "smp: Brought up" | sed "s/\[\ *[0-9.]*\] //""#
)
.unwrap_or_default()
.trim(),
"smp: Brought up 1 node, 2 CPUs"
);
let _ = child.kill(); let _ = child.kill();
let _ = child.wait(); let _ = child.wait();
Ok(()) Ok(())