[libvirt] [PATCH] Fix nodeinfotest on NUMA machines
The nodeinfotest was reliant on the host NUMA topology, but all the test data files assumed 1 single NUMA node. This test thus failed on any NUMA machine with > 1 node * tests/nodeinfotest.c: Hardcode 1 single numa node --- tests/nodeinfotest.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 768fd4d..9aeb459 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -46,6 +46,11 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile } fclose(cpuinfo); + /* 'nodes' is filled using libnuma.so from current machine + * topology, which makes it unsuitable for the test suite + * so blank it to a predictable value */ + nodeinfo.nodes = 1; + snprintf(actualData, MAX_FILE, "CPUs: %u, MHz: %u, Nodes: %u, Cores: %u\n", nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes, nodeinfo.cores); -- 1.6.6.1
On Tue, Apr 13, 2010 at 11:40:23AM +0100, Daniel P. Berrange wrote:
The nodeinfotest was reliant on the host NUMA topology, but all the test data files assumed 1 single NUMA node. This test thus failed on any NUMA machine with > 1 node
* tests/nodeinfotest.c: Hardcode 1 single numa node --- tests/nodeinfotest.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 768fd4d..9aeb459 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -46,6 +46,11 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile } fclose(cpuinfo);
+ /* 'nodes' is filled using libnuma.so from current machine + * topology, which makes it unsuitable for the test suite + * so blank it to a predictable value */ + nodeinfo.nodes = 1; + snprintf(actualData, MAX_FILE, "CPUs: %u, MHz: %u, Nodes: %u, Cores: %u\n", nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes, nodeinfo.cores);
ACK, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (2)
-
Daniel P. Berrange -
Daniel Veillard