External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 04:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodeinfo: test more details

Browse Source 
Make it obvious why we need Osier's patch in commit 10d9038b
to fix NUMA parsing of an AMD machine with two cores sharing
a socket id.

* tests/nodeinfotest.c (linuxTestCompareFiles): Enhance the test.
* tests/nodeinfodata/linux-nodeinfo-sysfs-test-*-output.txt: Update.
This commit is contained in:
Eric Blake 2012-05-14 17:11:47 -06:00
parent e7df360d56
commit 5a8262a0ae
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt
View File

@ -1 +1 @@
CPUs: 2, MHz: 8, Nodes: 1, Cores: 2
CPUs: 2/2, MHz: 8, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1

2
tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt
View File

@ -1 +1 @@
CPUs: 2, MHz: 2800, Nodes: 1, Cores: 2
CPUs: 2/2, MHz: 2800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1

2
tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt
View File

@ -1 +1 @@
CPUs: 2, MHz: 800, Nodes: 1, Cores: 2
CPUs: 2/2, MHz: 800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1

2
tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt
View File

@ -1 +1 @@
CPUs: 48, MHz: 2100, Nodes: 1, Cores: 12
CPUs: 48/48, MHz: 2100, Nodes: 1, Sockets: 4, Cores: 12, Threads: 1

9
tests/nodeinfotest.c
View File

@ -60,9 +60,12 @@ linuxTestCompareFiles(const char *cpuinfofile,
}
VIR_FORCE_FCLOSE(cpuinfo);
if (virAsprintf(&actualData, "CPUs: %u, MHz: %u, Nodes: %u, Cores: %u\n",
nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes,
nodeinfo.cores) < 0)
if (virAsprintf(&actualData,
"CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, "
"Cores: %u, Threads: %u\n",
nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo),
nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets,
nodeinfo.cores, nodeinfo.threads) < 0)
goto fail;
if (STRNEQ(actualData, expectData)) {