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 433a81f8512ca07f4692830f3b82a0d0a850db21..80df8321b93357200b6ec54bf85f373a4bab4f02 100644 (file)
--- 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 09e29464b2cc7b541340faffa2b6cad79c24042c..4c868244d44c6d1e9ad00774a2f93beaabc00790 100644 (file)
--- 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 73300a4f8eaf2b8d1f6f7c8ef662772d5fa31782..33bfbf3e49faa53a2fe118df528c50511e6a7899 100644 (file)
--- 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 7db386451d8ce2d38ce30cdf6ae560a7612f9641..333187ed5bd90a3458b810d11e04cfd03bcb40a9 100644 (file)
--- 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 2b4c3a0b61f7b5b420b63fd01254703d9b64f353..a2b89dd941e66b2d844adefa35286fa8dced71e3 100644 (file)
--- 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)) {