2008-01-29 18:15:54 +00:00
|
|
|
#include <config.h>
|
2007-11-26 12:03:34 +00:00
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2008-05-29 15:31:49 +00:00
|
|
|
#include <unistd.h>
|
2007-07-25 23:16:30 +00:00
|
|
|
|
|
|
|
#include "testutils.h"
|
|
|
|
#include "internal.h"
|
|
|
|
#include "nodeinfo.h"
|
2008-10-28 17:43:24 +00:00
|
|
|
#include "util.h"
|
2010-11-17 02:13:29 +00:00
|
|
|
#include "files.h"
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2008-12-18 12:08:05 +00:00
|
|
|
#ifndef __linux__
|
|
|
|
|
|
|
|
static int
|
2009-01-06 18:32:03 +00:00
|
|
|
mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
|
2008-12-18 12:08:05 +00:00
|
|
|
{
|
2009-12-15 08:43:29 +00:00
|
|
|
exit (EXIT_AM_SKIP);
|
2008-12-18 12:08:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
static char *progname;
|
2008-05-29 15:31:49 +00:00
|
|
|
static char *abs_srcdir;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2010-03-09 18:22:22 +00:00
|
|
|
# define MAX_FILE 4096
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2010-12-15 20:49:00 +00:00
|
|
|
extern int linuxNodeInfoCPUPopulate(FILE *cpuinfo, virNodeInfoPtr nodeinfo,
|
|
|
|
bool need_hyperthreads);
|
2007-07-25 23:16:30 +00:00
|
|
|
|
Use gnulib, starting with its physmem and getaddrinfo modules.
New files go into these directories:
gnulib/lib
gnulib/m4
gnulib/tests
* bootstrap: A wrapper around gnulib-tool.
* configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY
before any macro that uses AC_COMPILE_IFELSE.
(AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and remove m4. Add gnulib/tests
early enough that those tests run before any libvirt unit tests.
* m4/Makefile.am: Remove file. Not needed.
* src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la.
* src/nodeinfo.c: Include "physmem.h".
* qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h".
(MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions.
(virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate.
* tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS): Add ../gnulib/lib/libgnu.la.
* qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la.
* tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total
memory from a file.
Update expected output not to include "Memory: NNNN"
* tests/nodeinfodata/linux-nodeinfo-1.txt:
* tests/nodeinfodata/linux-nodeinfo-2.txt:
* tests/nodeinfodata/linux-nodeinfo-3.txt:
* tests/nodeinfodata/linux-nodeinfo-4.txt:
* tests/nodeinfodata/linux-nodeinfo-5.txt:
* tests/nodeinfodata/linux-nodeinfo-6.txt:
* src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that
would conflict with the one now in "config.h".
* autogen.sh: Add -I gnulib/m4.
* src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE.
Instead, include "config.h".
* qemud/qemud.c: Remove definition of _GNU_SOURCE.
* src/openvz_driver.c: Likewise.
* src/qemu_driver.c: Likewise.
* src/remote_internal.c: Likewise.
* configure.in: Use AC_CONFIG_AUX_DIR(build-aux), so that a bunch
of gettextize-generated files go into build-aux/, rather than in
the top-level directory.
* .cvsignore: Adjust.
* build-aux/.cvsignore: New file.
Author: Jim Meyering <meyering@redhat.com>
2007-12-05 21:31:07 +00:00
|
|
|
static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile) {
|
2007-07-25 23:16:30 +00:00
|
|
|
char actualData[MAX_FILE];
|
|
|
|
char expectData[MAX_FILE];
|
|
|
|
char *expect = &expectData[0];
|
|
|
|
virNodeInfo nodeinfo;
|
Use gnulib, starting with its physmem and getaddrinfo modules.
New files go into these directories:
gnulib/lib
gnulib/m4
gnulib/tests
* bootstrap: A wrapper around gnulib-tool.
* configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY
before any macro that uses AC_COMPILE_IFELSE.
(AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and remove m4. Add gnulib/tests
early enough that those tests run before any libvirt unit tests.
* m4/Makefile.am: Remove file. Not needed.
* src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la.
* src/nodeinfo.c: Include "physmem.h".
* qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h".
(MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions.
(virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate.
* tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS): Add ../gnulib/lib/libgnu.la.
* qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la.
* tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total
memory from a file.
Update expected output not to include "Memory: NNNN"
* tests/nodeinfodata/linux-nodeinfo-1.txt:
* tests/nodeinfodata/linux-nodeinfo-2.txt:
* tests/nodeinfodata/linux-nodeinfo-3.txt:
* tests/nodeinfodata/linux-nodeinfo-4.txt:
* tests/nodeinfodata/linux-nodeinfo-5.txt:
* tests/nodeinfodata/linux-nodeinfo-6.txt:
* src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that
would conflict with the one now in "config.h".
* autogen.sh: Add -I gnulib/m4.
* src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE.
Instead, include "config.h".
* qemud/qemud.c: Remove definition of _GNU_SOURCE.
* src/openvz_driver.c: Likewise.
* src/qemu_driver.c: Likewise.
* src/remote_internal.c: Likewise.
* configure.in: Use AC_CONFIG_AUX_DIR(build-aux), so that a bunch
of gettextize-generated files go into build-aux/, rather than in
the top-level directory.
* .cvsignore: Adjust.
* build-aux/.cvsignore: New file.
Author: Jim Meyering <meyering@redhat.com>
2007-12-05 21:31:07 +00:00
|
|
|
FILE *cpuinfo;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
|
|
|
if (virtTestLoadFile(outputfile, &expect, MAX_FILE) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
cpuinfo = fopen(cpuinfofile, "r");
|
|
|
|
if (!cpuinfo)
|
|
|
|
return -1;
|
2010-05-18 09:58:32 +00:00
|
|
|
|
|
|
|
memset(&nodeinfo, 0, sizeof(nodeinfo));
|
2010-12-15 20:49:00 +00:00
|
|
|
if (linuxNodeInfoCPUPopulate(cpuinfo, &nodeinfo, false) < 0) {
|
2010-08-23 14:48:33 +00:00
|
|
|
if (virTestGetDebug()) {
|
|
|
|
virErrorPtr error = virSaveLastError();
|
|
|
|
if (error && error->code != VIR_ERR_OK)
|
|
|
|
fprintf(stderr, "\n%s\n", error->message);
|
|
|
|
virFreeError(error);
|
|
|
|
}
|
2010-11-17 02:13:29 +00:00
|
|
|
VIR_FORCE_FCLOSE(cpuinfo);
|
2007-07-25 23:16:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2010-11-17 02:13:29 +00:00
|
|
|
VIR_FORCE_FCLOSE(cpuinfo);
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2010-04-13 10:39:16 +00:00
|
|
|
/* '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;
|
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
snprintf(actualData, MAX_FILE,
|
2010-03-04 22:28:40 +00:00
|
|
|
"CPUs: %u, MHz: %u, Nodes: %u, Cores: %u\n",
|
|
|
|
nodeinfo.cpus, nodeinfo.mhz, nodeinfo.nodes, nodeinfo.cores);
|
2007-07-25 23:16:30 +00:00
|
|
|
|
|
|
|
if (STRNEQ(actualData, expectData)) {
|
|
|
|
if (getenv("DEBUG_TESTS")) {
|
|
|
|
printf("Expect %d '%s'\n", (int)strlen(expectData), expectData);
|
|
|
|
printf("Actual %d '%s'\n", (int)strlen(actualData), actualData);
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int linuxTestNodeInfo(const void *data) {
|
|
|
|
char cpuinfo[PATH_MAX];
|
|
|
|
char output[PATH_MAX];
|
2008-05-29 15:31:49 +00:00
|
|
|
snprintf(cpuinfo, PATH_MAX, "%s/nodeinfodata/linux-%s.cpuinfo",
|
|
|
|
abs_srcdir, (const char*)data);
|
|
|
|
snprintf(output, PATH_MAX, "%s/nodeinfodata/linux-%s.txt",
|
|
|
|
abs_srcdir, (const char*)data);
|
Use gnulib, starting with its physmem and getaddrinfo modules.
New files go into these directories:
gnulib/lib
gnulib/m4
gnulib/tests
* bootstrap: A wrapper around gnulib-tool.
* configure.in: Invoke gl_EARLY and gl_INIT, being careful to put gl_EARLY
before any macro that uses AC_COMPILE_IFELSE.
(AC_OUTPUT): Add lib/Makefile and gl-tests/Makefile. Remove m4/Makefile.
* Makefile.am (SUBDIRS): Add gnulib/lib and remove m4. Add gnulib/tests
early enough that those tests run before any libvirt unit tests.
* m4/Makefile.am: Remove file. Not needed.
* src/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS, libvirt_la_LIBADD): Add ../gnulib/lib/libgnu.la.
* src/nodeinfo.c: Include "physmem.h".
* qemud/qemud.c, src/remote_internal.c: Include "getaddrinfo.h".
(MEMINFO_PATH, linuxNodeInfoMemPopulate): Remove definitions.
(virNodeInfoPopulate): Use physmem_total, not linuxNodeInfoMemPopulate.
* tests/Makefile.am (INCLUDES): Add -I$(top_srcdir)/gnulib/lib -I../gnulib/lib.
(LDADDS): Add ../gnulib/lib/libgnu.la.
* qemud/Makefile.am (libvirtd_LDADD): Add ../gnulib/lib/libgnu.la.
* tests/nodeinfotest.c (linuxTestCompareFiles): No longer read total
memory from a file.
Update expected output not to include "Memory: NNNN"
* tests/nodeinfodata/linux-nodeinfo-1.txt:
* tests/nodeinfodata/linux-nodeinfo-2.txt:
* tests/nodeinfodata/linux-nodeinfo-3.txt:
* tests/nodeinfodata/linux-nodeinfo-4.txt:
* tests/nodeinfodata/linux-nodeinfo-5.txt:
* tests/nodeinfodata/linux-nodeinfo-6.txt:
* src/test.c [WITH_TEST]: Remove definition of _GNU_SOURCE that
would conflict with the one now in "config.h".
* autogen.sh: Add -I gnulib/m4.
* src/conf.c, src/sexpr.c: Don't define _GNU_SOURCE.
Instead, include "config.h".
* qemud/qemud.c: Remove definition of _GNU_SOURCE.
* src/openvz_driver.c: Likewise.
* src/qemu_driver.c: Likewise.
* src/remote_internal.c: Likewise.
* configure.in: Use AC_CONFIG_AUX_DIR(build-aux), so that a bunch
of gettextize-generated files go into build-aux/, rather than in
the top-level directory.
* .cvsignore: Adjust.
* build-aux/.cvsignore: New file.
Author: Jim Meyering <meyering@redhat.com>
2007-12-05 21:31:07 +00:00
|
|
|
return linuxTestCompareFiles(cpuinfo, output);
|
2007-07-25 23:16:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
static int
|
|
|
|
mymain(int argc, char **argv)
|
2007-07-25 23:16:30 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
int i;
|
|
|
|
const char *nodeData[] = {
|
|
|
|
"nodeinfo-1",
|
|
|
|
"nodeinfo-2",
|
|
|
|
"nodeinfo-3",
|
|
|
|
"nodeinfo-4",
|
|
|
|
"nodeinfo-5",
|
|
|
|
"nodeinfo-6",
|
|
|
|
};
|
2008-05-29 15:31:49 +00:00
|
|
|
char cwd[PATH_MAX];
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
abs_srcdir = getenv("abs_srcdir");
|
|
|
|
if (!abs_srcdir)
|
|
|
|
abs_srcdir = getcwd(cwd, sizeof(cwd));
|
2007-11-14 10:35:58 +00:00
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
progname = argv[0];
|
|
|
|
|
|
|
|
if (argc > 1) {
|
|
|
|
fprintf(stderr, "Usage: %s\n", progname);
|
2008-05-29 15:31:49 +00:00
|
|
|
return(EXIT_FAILURE);
|
2007-07-25 23:16:30 +00:00
|
|
|
}
|
|
|
|
|
2010-05-18 10:32:39 +00:00
|
|
|
if (virInitialize() < 0)
|
|
|
|
return EXIT_FAILURE;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2008-10-28 17:43:24 +00:00
|
|
|
for (i = 0 ; i < ARRAY_CARDINALITY(nodeData); i++)
|
2007-07-25 23:16:30 +00:00
|
|
|
if (virtTestRun(nodeData[i], 1, linuxTestNodeInfo, nodeData[i]) != 0)
|
2008-04-10 16:54:54 +00:00
|
|
|
ret = -1;
|
2007-07-25 23:16:30 +00:00
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
2007-07-25 23:16:30 +00:00
|
|
|
}
|
2008-05-29 15:31:49 +00:00
|
|
|
|
2008-12-18 12:08:05 +00:00
|
|
|
#endif /* __linux__ */
|
|
|
|
|
2008-05-29 15:31:49 +00:00
|
|
|
VIRT_TEST_MAIN(mymain)
|