kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Adapt topology tests on ARM64 for new lscpu output

Browse Source 
The lscpu output is now different on ARM64 (referencing clusters vs
sockets).

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-05-11 15:53:41 +01:00
parent c392274f09
commit 9b7260e630
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cloud-hypervisor/tests/common/tests_wrappers.rs
View File

@@ -343,9 +343,16 @@ pub(crate) fn test_cpu_topology(
threads_per_core
);
#[cfg(target_arch = "x86_64")]
let cores_per_package_grep = "per socket";
#[cfg(target_arch = "aarch64")]
let cores_per_package_grep = if use_fw { "per socket" } else { "per cluster" };
assert_eq!(
guest
.ssh_command("lscpu | grep \"per socket\" | cut -f 2 -d \":\" | sed \"s# *##\"")
.ssh_command(&format!(
"lscpu | grep \"{cores_per_package_grep}\" | cut -f 2 -d \":\" | sed \"s# *##\""
))
.unwrap()
.trim()
.parse::<u8>()
@@ -353,9 +360,16 @@ pub(crate) fn test_cpu_topology(
cores_per_package
);
#[cfg(target_arch = "x86_64")]
let packages_grep = "Socket";
#[cfg(target_arch = "aarch64")]
let packages_grep = if use_fw { "Socket" } else { "Cluster" };
assert_eq!(
guest
.ssh_command("lscpu | grep \"Socket\" | cut -f 2 -d \":\" | sed \"s# *##\"")
.ssh_command(&format!(
"lscpu | grep \"{packages_grep}\" | cut -f 2 -d \":\" | sed \"s# *##\""
))
.unwrap()
.trim()
.parse::<u8>()