From: Eric Blake <eblake@redhat.com>
Date: Mon, 14 May 2012 23:11:47 +0000 (-0600)
Subject: nodeinfo: test more details
X-Git-Tag: v0.9.13-rc1~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a8262a0aebe64f7cf5dff1a784833788c966279;p=thirdparty%2Flibvirt.git

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.
---

diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt
index 433a81f851..80df8321b9 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-ppc-output.txt
@@ -1 +1 @@
-CPUs: 2, MHz: 8, Nodes: 1, Cores: 2
+CPUs: 2/2, MHz: 8, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt
index 09e29464b2..4c868244d4 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-1-cpu-x86-output.txt
@@ -1 +1 @@
-CPUs: 2, MHz: 2800, Nodes: 1, Cores: 2
+CPUs: 2/2, MHz: 2800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt
index 73300a4f8e..33bfbf3e49 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-2-cpu-x86-output.txt
@@ -1 +1 @@
-CPUs: 2, MHz: 800, Nodes: 1, Cores: 2
+CPUs: 2/2, MHz: 800, Nodes: 1, Sockets: 1, Cores: 2, Threads: 1
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt
index 7db386451d..333187ed5b 100644
--- a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt
+++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-3-cpu-x86-output.txt
@@ -1 +1 @@
-CPUs: 48, MHz: 2100, Nodes: 1, Cores: 12
+CPUs: 48/48, MHz: 2100, Nodes: 1, Sockets: 4, Cores: 12, Threads: 1
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index 2b4c3a0b61..a2b89dd941 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)) {