diff options
| author |   Eric Blake <eblake@redhat.com> | 2012-05-14 17:11:47 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-05-16 10:23:06 -0600 |
| commit | 5a8262a0aebe64f7cf5dff1a784833788c966279 (patch) | |
| tree | 2e6dd714134023085d437bdf57468c324c70d962 /tests/nodeinfotest.c | |
| parent | Add a virLogMessage alternative taking va_list args (diff) | |
| download | libvirt-5a8262a0aebe64f7cf5dff1a784833788c966279.tar.gz libvirt-5a8262a0aebe64f7cf5dff1a784833788c966279.tar.bz2 libvirt-5a8262a0aebe64f7cf5dff1a784833788c966279.zip | |
nodeinfo: test more details
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.
Diffstat (limited to 'tests/nodeinfotest.c')
| -rw-r--r-- | tests/nodeinfotest.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 2b4c3a0b6..a2b89dd94 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -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)) { |