2006-05-09 15:35:46 +00:00
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
|
2008-03-24 10:19:36 +00:00
|
|
|
SHELL = $(PREFERABLY_POSIX_SHELL)
|
|
|
|
|
2006-05-09 15:35:46 +00:00
|
|
|
INCLUDES = \
|
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
|
|
|
-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
|
2006-05-09 15:35:46 +00:00
|
|
|
-I$(top_builddir)/include \
|
2006-05-29 16:05:05 +00:00
|
|
|
-I$(top_srcdir)/include \
|
|
|
|
-I$(top_srcdir)/src \
|
Move all shared utility files to src/util/
* src/bridge.c, src/bridge.h, src/buf.c, src/buf.h, src/cgroup.c,
src/cgroup.h, src/conf.c, src/conf.h, src/event.c, src/event.h,
src/hash.c, src/hash.h, src/hostusb.c, src/hostusb.h,
src/iptables.c, src/iptables.h, src/logging.c, src/logging.h,
src/memory.c, src/memory.h, src/pci.c, src/pci.h, src/qparams.c,
src/qparams.h, src/stats_linux.c, src/stats_linux.h,
src/threads-pthread.c, src/threads-pthread.h, src/threads-win32.c,
src/threads-win32.h, src/threads.c, src/threads.h, src/util.c,
src/util.h, src/uuid.c, src/uuid.h, src/virterror.c,
src/virterror_internal.h, src/xml.c, src/xml.h: Move all files
into src/util/
* daemon/Makefile.am: Add -Isrc/util/ to build flags
* src/Makefile.am: Add -Isrc/util/ to build flags and update for
moved files
* src/libvirt_private.syms: Export cgroup APIs since they're now
in util rather than linking directly to drivers
* src/xen/xs_internal.c: Disable bogus virEventRemoveHandle call
when built under PROXY
* proxy/Makefile.am: Update for changed file locations. Remove
bogus build of event.c
* tools/Makefile.am, tests/Makefile.am: Add -Isrc/util/ to build flags
2009-09-16 15:28:46 +00:00
|
|
|
-I$(top_srcdir)/src/util \
|
build: consistently use CFLAGS
According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process. Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.
* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.
2011-05-31 22:15:28 +00:00
|
|
|
-I$(top_srcdir)/src/conf
|
|
|
|
|
|
|
|
AM_CFLAGS = \
|
2007-09-19 17:42:40 +00:00
|
|
|
$(LIBXML_CFLAGS) \
|
|
|
|
$(GNUTLS_CFLAGS) \
|
2007-12-05 15:24:15 +00:00
|
|
|
$(SASL_CFLAGS) \
|
2008-02-20 15:38:29 +00:00
|
|
|
$(SELINUX_CFLAGS) \
|
2009-10-08 14:34:22 +00:00
|
|
|
$(APPARMOR_CFLAGS) \
|
2011-06-30 14:08:29 +00:00
|
|
|
$(YAJL_CFLAGS) \
|
build: consistently use CFLAGS
According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process. Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.
* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.
2011-05-31 22:15:28 +00:00
|
|
|
$(COVERAGE_CFLAGS) \
|
|
|
|
$(WARN_CFLAGS)
|
2007-02-14 02:12:41 +00:00
|
|
|
|
2008-11-21 12:16:08 +00:00
|
|
|
if WITH_DRIVER_MODULES
|
|
|
|
INCLUDES += \
|
|
|
|
-DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\"
|
|
|
|
endif
|
|
|
|
|
2006-05-09 15:35:46 +00:00
|
|
|
LDADDS = \
|
2010-01-15 10:09:01 +00:00
|
|
|
$(STATIC_BINARIES) \
|
2007-09-19 17:42:40 +00:00
|
|
|
$(LIBXML_LIBS) \
|
|
|
|
$(GNUTLS_LIBS) \
|
2007-12-05 15:24:15 +00:00
|
|
|
$(SASL_LIBS) \
|
2008-02-20 15:38:29 +00:00
|
|
|
$(SELINUX_LIBS) \
|
2009-10-08 14:34:22 +00:00
|
|
|
$(APPARMOR_LIBS) \
|
2011-06-30 14:08:29 +00:00
|
|
|
$(YAJL_LIBS) \
|
2007-05-29 14:44:15 +00:00
|
|
|
$(WARN_CFLAGS) \
|
2008-02-28 17:06:32 +00:00
|
|
|
../src/libvirt_test.la \
|
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
|
|
|
../gnulib/lib/libgnu.la \
|
2009-01-08 20:42:01 +00:00
|
|
|
$(LIBSOCKET) \
|
2007-02-14 02:12:41 +00:00
|
|
|
$(COVERAGE_LDFLAGS)
|
2006-05-09 15:35:46 +00:00
|
|
|
|
2007-11-14 10:35:58 +00:00
|
|
|
EXTRA_DIST = \
|
2009-01-27 15:29:53 +00:00
|
|
|
capabilityschemadata \
|
2010-12-16 18:24:00 +00:00
|
|
|
capabilityschematest \
|
|
|
|
commanddata \
|
|
|
|
confdata \
|
|
|
|
cputestdata \
|
2009-01-27 15:29:53 +00:00
|
|
|
domainschemadata \
|
2010-12-16 18:24:00 +00:00
|
|
|
domainschematest \
|
|
|
|
domainsnapshotschematest \
|
|
|
|
domainsnapshotxml2xmlin \
|
|
|
|
domainsnapshotxml2xmlout \
|
2009-07-22 09:07:07 +00:00
|
|
|
interfaceschemadata \
|
2010-12-16 18:24:00 +00:00
|
|
|
networkschematest \
|
|
|
|
networkxml2xmlin \
|
|
|
|
networkxml2xmlout \
|
2011-06-24 10:04:37 +00:00
|
|
|
networkxml2argvdata \
|
2010-12-16 18:24:00 +00:00
|
|
|
nodedevschemadata \
|
|
|
|
nodedevschematest \
|
|
|
|
nodeinfodata \
|
|
|
|
nwfilterschematest \
|
|
|
|
nwfilterxml2xmlin \
|
|
|
|
nwfilterxml2xmlout \
|
|
|
|
oomtrace.pl \
|
|
|
|
qemuhelpdata \
|
|
|
|
qemuxml2argvdata \
|
|
|
|
qemuxml2xmloutdata \
|
|
|
|
schematestutils.sh \
|
|
|
|
sexpr2xmldata \
|
2009-01-27 15:29:53 +00:00
|
|
|
storagepoolschematest \
|
2009-10-08 21:26:30 +00:00
|
|
|
storagepoolxml2xmlin \
|
2010-12-16 18:24:00 +00:00
|
|
|
storagepoolxml2xmlout \
|
2009-01-27 15:29:53 +00:00
|
|
|
storagevolschematest \
|
2009-10-09 18:17:21 +00:00
|
|
|
storagevolxml2xmlin \
|
2010-12-16 18:24:00 +00:00
|
|
|
storagevolxml2xmlout \
|
|
|
|
test-lib.sh \
|
2009-12-23 22:02:44 +00:00
|
|
|
vmx2xmldata \
|
2010-12-16 18:24:00 +00:00
|
|
|
xencapsdata \
|
|
|
|
xmconfigdata \
|
|
|
|
xml2sexprdata \
|
2011-06-30 15:23:23 +00:00
|
|
|
xml2vmxdata \
|
|
|
|
.valgrind.supp
|
2006-05-09 15:35:46 +00:00
|
|
|
|
2010-10-21 18:11:50 +00:00
|
|
|
check_PROGRAMS = virshtest conftest sockettest \
|
2010-05-25 11:14:06 +00:00
|
|
|
nodeinfotest qparamtest virbuftest \
|
2011-04-15 11:15:37 +00:00
|
|
|
commandtest commandhelper seclabeltest \
|
2010-12-06 17:03:35 +00:00
|
|
|
hashtest virnetmessagetest virnetsockettest ssh
|
|
|
|
|
|
|
|
# This is a fake SSH we use from virnetsockettest
|
|
|
|
ssh_SOURCES = ssh.c
|
|
|
|
ssh_LDADD = $(COVERAGE_LDFLAGS)
|
2006-08-24 15:05:19 +00:00
|
|
|
|
2008-11-24 19:23:39 +00:00
|
|
|
if WITH_XEN
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += xml2sexprtest sexpr2xmltest \
|
2010-10-29 16:30:50 +00:00
|
|
|
xmconfigtest xencapstest
|
|
|
|
if ENABLE_XEN_TESTS
|
|
|
|
check_PROGRAMS += statstest reconnect
|
|
|
|
endif
|
2008-11-24 19:23:39 +00:00
|
|
|
endif
|
2008-11-18 12:46:13 +00:00
|
|
|
if WITH_QEMU
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest
|
2008-11-18 12:46:13 +00:00
|
|
|
endif
|
|
|
|
|
2011-05-26 17:45:41 +00:00
|
|
|
if WITH_OPENVZ
|
|
|
|
check_PROGRAMS += openvzutilstest
|
|
|
|
endif
|
|
|
|
|
2009-09-23 12:25:52 +00:00
|
|
|
if WITH_ESX
|
2010-12-21 21:39:55 +00:00
|
|
|
check_PROGRAMS += esxutilstest
|
|
|
|
endif
|
|
|
|
|
|
|
|
if WITH_VMX
|
|
|
|
check_PROGRAMS += vmx2xmltest xml2vmxtest
|
2009-09-23 12:25:52 +00:00
|
|
|
endif
|
|
|
|
|
2009-05-19 10:17:17 +00:00
|
|
|
if WITH_CIL
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += object-locking
|
2009-05-19 10:17:17 +00:00
|
|
|
endif
|
|
|
|
|
2011-06-30 14:08:29 +00:00
|
|
|
if HAVE_YAJL
|
|
|
|
check_PROGRAMS += jsontest
|
|
|
|
endif
|
|
|
|
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += networkxml2xmltest
|
2009-10-09 12:47:43 +00:00
|
|
|
|
2011-06-24 10:04:37 +00:00
|
|
|
check_PROGRAMS += networkxml2argvtest
|
|
|
|
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += nwfilterxml2xmltest
|
2010-04-02 17:28:28 +00:00
|
|
|
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += storagevolxml2xmltest storagepoolxml2xmltest
|
2009-10-08 21:26:30 +00:00
|
|
|
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += nodedevxml2xmltest
|
2009-02-24 14:58:32 +00:00
|
|
|
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += interfacexml2xmltest
|
2009-07-15 17:50:34 +00:00
|
|
|
|
2010-10-07 14:35:17 +00:00
|
|
|
check_PROGRAMS += cputest
|
|
|
|
|
2009-01-27 15:29:53 +00:00
|
|
|
test_scripts = \
|
|
|
|
capabilityschematest \
|
2009-07-15 17:50:34 +00:00
|
|
|
interfaceschematest \
|
2009-01-27 15:29:53 +00:00
|
|
|
networkschematest \
|
|
|
|
storagepoolschematest \
|
|
|
|
storagevolschematest \
|
|
|
|
domainschematest \
|
2010-04-06 15:09:46 +00:00
|
|
|
nodedevschematest \
|
2010-05-03 21:15:18 +00:00
|
|
|
nwfilterschematest \
|
|
|
|
domainsnapshotschematest
|
2009-01-27 15:29:53 +00:00
|
|
|
|
2008-06-26 09:37:51 +00:00
|
|
|
if WITH_LIBVIRTD
|
2009-01-16 18:07:24 +00:00
|
|
|
test_scripts += \
|
|
|
|
test_conf.sh \
|
|
|
|
cpuset \
|
|
|
|
daemon-conf \
|
|
|
|
define-dev-segfault \
|
|
|
|
int-overflow \
|
2009-03-02 20:01:05 +00:00
|
|
|
libvirtd-fail \
|
|
|
|
libvirtd-pool \
|
2009-01-16 18:07:24 +00:00
|
|
|
read-bufsiz \
|
|
|
|
read-non-seekable \
|
|
|
|
start \
|
|
|
|
undefine \
|
|
|
|
vcpupin \
|
|
|
|
virsh-all \
|
2011-04-12 21:59:19 +00:00
|
|
|
virsh-optparse \
|
2010-05-11 13:38:21 +00:00
|
|
|
virsh-schedinfo \
|
2008-11-24 07:13:29 +00:00
|
|
|
virsh-synopsis
|
2011-05-13 08:03:20 +00:00
|
|
|
else
|
|
|
|
EXTRA_DIST += \
|
|
|
|
test_conf.sh \
|
|
|
|
cpuset \
|
|
|
|
daemon-conf \
|
|
|
|
define-dev-segfault \
|
|
|
|
int-overflow \
|
|
|
|
libvirtd-fail \
|
|
|
|
libvirtd-pool \
|
|
|
|
read-bufsiz \
|
|
|
|
read-non-seekable \
|
|
|
|
start \
|
|
|
|
undefine \
|
|
|
|
vcpupin \
|
|
|
|
virsh-all \
|
|
|
|
virsh-optparse \
|
|
|
|
virsh-schedinfo \
|
|
|
|
virsh-synopsis
|
2008-06-26 09:37:51 +00:00
|
|
|
endif
|
2007-12-11 21:20:13 +00:00
|
|
|
|
2009-10-08 14:34:22 +00:00
|
|
|
if WITH_SECDRIVER_APPARMOR
|
|
|
|
test_scripts += virt-aa-helper-test
|
2009-12-14 12:40:42 +00:00
|
|
|
else
|
|
|
|
EXTRA_DIST += virt-aa-helper-test
|
2009-10-08 14:34:22 +00:00
|
|
|
endif
|
2009-12-14 12:40:42 +00:00
|
|
|
|
2007-11-14 10:35:58 +00:00
|
|
|
EXTRA_DIST += $(test_scripts)
|
|
|
|
|
2008-11-24 19:23:39 +00:00
|
|
|
TESTS = virshtest \
|
|
|
|
nodeinfotest \
|
|
|
|
qparamtest \
|
buf: Fix possible infinite loop in EscapeString, VSnprintf
The current code will go into an infinite loop if the printf generated
string is >= 1000, AND exactly 1 character smaller than the amount of free
space in the buffer. When this happens, we are dropped into the loop body,
but nothing will actually change, because count == (buf->size - buf->use - 1),
and virBufferGrow returns unchanged if count < (buf->size - buf->use)
Fix this by removing the '- 1' bit from 'size'. The *nprintf functions handle
the NULL byte for us anyways, so we shouldn't need to manually accommodate
for it.
Here's a bug where we are actually hitting this issue:
https://bugzilla.redhat.com/show_bug.cgi?id=602772
v2: Eric's improvements: while -> if (), remove extra va_list variable,
make sure we report buffer error if snprintf fails
v3: Add tests/virbuftest which reproduces the infinite loop before this
patch, works correctly after
2010-09-01 17:51:35 +00:00
|
|
|
virbuftest \
|
2010-10-21 18:11:50 +00:00
|
|
|
sockettest \
|
2010-05-25 11:14:06 +00:00
|
|
|
commandtest \
|
2011-01-14 21:37:55 +00:00
|
|
|
seclabeltest \
|
2011-04-15 11:15:37 +00:00
|
|
|
hashtest \
|
2010-12-06 17:03:22 +00:00
|
|
|
virnetmessagetest \
|
2010-12-06 17:03:35 +00:00
|
|
|
virnetsockettest \
|
2008-11-24 19:23:39 +00:00
|
|
|
$(test_scripts)
|
|
|
|
|
2011-06-30 14:08:29 +00:00
|
|
|
if HAVE_YAJL
|
|
|
|
TESTS += jsontest
|
|
|
|
endif
|
|
|
|
|
2008-11-24 19:23:39 +00:00
|
|
|
if WITH_XEN
|
|
|
|
TESTS += xml2sexprtest \
|
|
|
|
sexpr2xmltest \
|
|
|
|
xmconfigtest \
|
|
|
|
xencapstest
|
2007-02-07 13:41:44 +00:00
|
|
|
if ENABLE_XEN_TESTS
|
2010-10-29 16:30:50 +00:00
|
|
|
TESTS += reconnect statstest
|
2008-11-24 19:23:39 +00:00
|
|
|
endif
|
2007-02-07 13:41:44 +00:00
|
|
|
endif
|
2008-11-24 19:23:39 +00:00
|
|
|
|
2008-11-18 12:46:13 +00:00
|
|
|
if WITH_QEMU
|
2009-06-11 14:17:42 +00:00
|
|
|
TESTS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest
|
2010-04-02 17:28:28 +00:00
|
|
|
TESTS += nwfilterxml2xmltest
|
2008-11-18 12:46:13 +00:00
|
|
|
endif
|
2006-05-09 15:35:46 +00:00
|
|
|
|
2011-05-26 17:45:41 +00:00
|
|
|
if WITH_OPENVZ
|
|
|
|
TESTS += openvzutilstest
|
|
|
|
endif
|
|
|
|
|
2009-09-23 12:25:52 +00:00
|
|
|
if WITH_ESX
|
2010-12-21 21:39:55 +00:00
|
|
|
TESTS += esxutilstest
|
|
|
|
endif
|
|
|
|
|
|
|
|
if WITH_VMX
|
|
|
|
TESTS += vmx2xmltest xml2vmxtest
|
2009-09-23 12:25:52 +00:00
|
|
|
endif
|
|
|
|
|
2009-05-12 16:45:14 +00:00
|
|
|
if WITH_LIBVIRTD
|
2010-08-10 12:38:57 +00:00
|
|
|
check_PROGRAMS += eventtest
|
2009-05-12 16:45:14 +00:00
|
|
|
TESTS += eventtest
|
|
|
|
endif
|
|
|
|
|
2009-10-09 12:47:43 +00:00
|
|
|
TESTS += networkxml2xmltest
|
|
|
|
|
2011-06-24 10:04:37 +00:00
|
|
|
TESTS += networkxml2argvtest
|
|
|
|
|
2009-10-09 18:17:21 +00:00
|
|
|
TESTS += storagevolxml2xmltest storagepoolxml2xmltest
|
2009-10-08 21:26:30 +00:00
|
|
|
|
2009-02-24 14:58:32 +00:00
|
|
|
TESTS += nodedevxml2xmltest
|
|
|
|
|
2009-07-15 17:50:34 +00:00
|
|
|
TESTS += interfacexml2xmltest
|
|
|
|
|
2010-10-07 14:35:17 +00:00
|
|
|
TESTS += cputest
|
|
|
|
|
2010-12-06 17:03:35 +00:00
|
|
|
path_add = $$abs_top_builddir/daemon$(PATH_SEPARATOR)$$abs_top_builddir/tools$(PATH_SEPARATOR)$$abs_top_builddir/tests
|
2008-03-24 10:18:36 +00:00
|
|
|
|
2007-11-17 13:16:47 +00:00
|
|
|
# NB, automake < 1.10 does not provide the real
|
2010-12-15 00:23:22 +00:00
|
|
|
# abs_top_{src/build}dir or builddir variables, so don't rely
|
2007-11-17 13:16:47 +00:00
|
|
|
# on them here. Fake them with 'pwd'
|
2007-11-12 14:00:32 +00:00
|
|
|
TESTS_ENVIRONMENT = \
|
2008-03-24 10:18:36 +00:00
|
|
|
abs_top_builddir=`cd '$(top_builddir)'; pwd` \
|
|
|
|
abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \
|
2010-12-15 00:23:22 +00:00
|
|
|
abs_builddir=`pwd` \
|
2008-04-18 15:28:33 +00:00
|
|
|
abs_srcdir=`cd '$(srcdir)'; pwd` \
|
2009-03-04 13:04:06 +00:00
|
|
|
CONFIG_HEADER="`cd '$(top_builddir)'; pwd`/config.h" \
|
2008-03-24 10:18:36 +00:00
|
|
|
PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \
|
2008-03-24 10:19:36 +00:00
|
|
|
SHELL="$(SHELL)" \
|
2008-11-21 12:16:08 +00:00
|
|
|
LIBVIRT_DRIVER_DIR="$(abs_top_builddir)/src/.libs" \
|
2008-12-20 23:23:50 +00:00
|
|
|
LC_ALL=C \
|
2007-11-12 14:00:32 +00:00
|
|
|
$(VG)
|
|
|
|
|
2006-08-24 16:00:19 +00:00
|
|
|
valgrind:
|
2008-04-28 13:36:48 +00:00
|
|
|
$(MAKE) check VG="valgrind --quiet --leak-check=full --suppressions=$(srcdir)/.valgrind.supp"
|
2006-08-24 16:00:19 +00:00
|
|
|
|
2010-10-21 18:11:50 +00:00
|
|
|
sockettest_SOURCES = \
|
|
|
|
sockettest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
sockettest_LDADD = ../src/libvirt_util.la $(LDADDS)
|
|
|
|
|
2008-11-24 19:23:39 +00:00
|
|
|
if WITH_XEN
|
2006-08-24 15:05:19 +00:00
|
|
|
xml2sexprtest_SOURCES = \
|
2008-07-25 13:17:27 +00:00
|
|
|
xml2sexprtest.c testutilsxen.c testutilsxen.h \
|
2006-08-24 15:05:19 +00:00
|
|
|
testutils.c testutils.h
|
2008-11-21 12:16:08 +00:00
|
|
|
xml2sexprtest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
2006-08-24 15:05:19 +00:00
|
|
|
|
|
|
|
sexpr2xmltest_SOURCES = \
|
2009-01-22 18:19:20 +00:00
|
|
|
sexpr2xmltest.c testutilsxen.c testutilsxen.h \
|
2006-08-24 15:05:19 +00:00
|
|
|
testutils.c testutils.h
|
2008-11-21 12:16:08 +00:00
|
|
|
sexpr2xmltest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
2006-08-24 15:05:19 +00:00
|
|
|
|
2007-01-19 20:30:05 +00:00
|
|
|
xmconfigtest_SOURCES = \
|
2008-07-25 13:39:02 +00:00
|
|
|
xmconfigtest.c testutilsxen.c testutilsxen.h \
|
2007-01-19 20:30:05 +00:00
|
|
|
testutils.c testutils.h
|
2008-11-21 12:16:08 +00:00
|
|
|
xmconfigtest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
2007-01-19 20:30:05 +00:00
|
|
|
|
2008-11-24 19:23:39 +00:00
|
|
|
xencapstest_SOURCES = \
|
|
|
|
xencapstest.c testutils.h testutils.c
|
|
|
|
xencapstest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
|
|
|
|
|
|
|
reconnect_SOURCES = \
|
|
|
|
reconnect.c
|
|
|
|
reconnect_LDADD = $(LDADDS)
|
|
|
|
|
2010-10-14 12:22:18 +00:00
|
|
|
statstest_SOURCES = \
|
|
|
|
statstest.c testutils.h testutils.c
|
|
|
|
statstest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
|
|
|
|
2008-11-24 19:23:39 +00:00
|
|
|
else
|
|
|
|
EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
|
|
|
|
xencapstest.c reconnect.c \
|
|
|
|
testutilsxen.c testutilsxen.h
|
|
|
|
endif
|
|
|
|
|
2008-11-18 12:46:13 +00:00
|
|
|
if WITH_QEMU
|
2007-07-18 21:34:22 +00:00
|
|
|
qemuxml2argvtest_SOURCES = \
|
2008-05-16 16:51:30 +00:00
|
|
|
qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \
|
2007-07-18 21:34:22 +00:00
|
|
|
testutils.c testutils.h
|
2008-11-17 12:18:18 +00:00
|
|
|
qemuxml2argvtest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS)
|
2007-07-18 21:34:22 +00:00
|
|
|
|
|
|
|
qemuxml2xmltest_SOURCES = \
|
2008-05-16 16:51:30 +00:00
|
|
|
qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
2007-07-18 21:34:22 +00:00
|
|
|
testutils.c testutils.h
|
2008-11-17 12:18:18 +00:00
|
|
|
qemuxml2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS)
|
2009-05-21 14:22:51 +00:00
|
|
|
|
|
|
|
qemuargv2xmltest_SOURCES = \
|
|
|
|
qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \
|
|
|
|
testutils.c testutils.h
|
|
|
|
qemuargv2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS)
|
2009-06-11 14:17:42 +00:00
|
|
|
|
|
|
|
qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h
|
|
|
|
qemuhelptest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS)
|
2008-11-18 12:46:13 +00:00
|
|
|
else
|
2009-06-11 14:17:42 +00:00
|
|
|
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c qemuhelptest.c testutilsqemu.c testutilsqemu.h
|
2008-11-18 12:46:13 +00:00
|
|
|
endif
|
2007-07-18 21:34:22 +00:00
|
|
|
|
2011-05-26 17:45:41 +00:00
|
|
|
if WITH_OPENVZ
|
|
|
|
openvzutilstest_SOURCES = \
|
|
|
|
openvzutilstest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
openvzutilstest_LDADD = ../src/libvirt_driver_openvz.la $(LDADDS)
|
|
|
|
else
|
|
|
|
EXTRA_DIST += openvzutilstest.c
|
|
|
|
endif
|
|
|
|
EXTRA_DIST += openvzutilstest.conf
|
|
|
|
|
2009-09-23 12:25:52 +00:00
|
|
|
if WITH_ESX
|
|
|
|
esxutilstest_SOURCES = \
|
|
|
|
esxutilstest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
esxutilstest_LDADD = ../src/libvirt_driver_esx.la $(LDADDS)
|
2010-12-21 21:39:55 +00:00
|
|
|
else
|
|
|
|
EXTRA_DIST += esxutilstest.c
|
|
|
|
endif
|
2009-09-23 12:25:52 +00:00
|
|
|
|
2010-12-21 21:39:55 +00:00
|
|
|
if WITH_VMX
|
2009-09-23 12:25:52 +00:00
|
|
|
vmx2xmltest_SOURCES = \
|
|
|
|
vmx2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
2010-12-21 21:39:55 +00:00
|
|
|
vmx2xmltest_LDADD = ../src/libvirt_vmx.la $(LDADDS)
|
2009-09-23 12:25:52 +00:00
|
|
|
|
|
|
|
xml2vmxtest_SOURCES = \
|
|
|
|
xml2vmxtest.c \
|
|
|
|
testutils.c testutils.h
|
2010-12-21 21:39:55 +00:00
|
|
|
xml2vmxtest_LDADD = ../src/libvirt_vmx.la $(LDADDS)
|
2009-09-23 12:25:52 +00:00
|
|
|
else
|
2010-12-21 21:39:55 +00:00
|
|
|
EXTRA_DIST += vmx2xmltest.c xml2vmxtest.c
|
2009-09-23 12:25:52 +00:00
|
|
|
endif
|
|
|
|
|
2009-10-09 12:47:43 +00:00
|
|
|
networkxml2xmltest_SOURCES = \
|
|
|
|
networkxml2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
networkxml2xmltest_LDADD = $(LDADDS)
|
|
|
|
|
2011-06-24 10:04:37 +00:00
|
|
|
networkxml2argvtest_SOURCES = \
|
|
|
|
networkxml2argvtest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
networkxml2argvtest_LDADD = ../src/libvirt_driver_network.la $(LDADDS)
|
|
|
|
|
2010-04-02 17:28:28 +00:00
|
|
|
nwfilterxml2xmltest_SOURCES = \
|
|
|
|
nwfilterxml2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
nwfilterxml2xmltest_LDADD = $(LDADDS)
|
|
|
|
|
2009-10-09 18:17:21 +00:00
|
|
|
storagevolxml2xmltest_SOURCES = \
|
|
|
|
storagevolxml2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
storagevolxml2xmltest_LDADD = $(LDADDS)
|
|
|
|
|
2009-10-08 21:26:30 +00:00
|
|
|
storagepoolxml2xmltest_SOURCES = \
|
|
|
|
storagepoolxml2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
storagepoolxml2xmltest_LDADD = $(LDADDS)
|
|
|
|
|
2009-02-24 14:58:32 +00:00
|
|
|
nodedevxml2xmltest_SOURCES = \
|
|
|
|
nodedevxml2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
2009-03-03 17:00:18 +00:00
|
|
|
nodedevxml2xmltest_LDADD = $(LDADDS)
|
2009-02-24 14:58:32 +00:00
|
|
|
|
2009-07-15 17:50:34 +00:00
|
|
|
interfacexml2xmltest_SOURCES = \
|
|
|
|
interfacexml2xmltest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
interfacexml2xmltest_LDADD = $(LDADDS)
|
|
|
|
|
2010-10-07 14:35:17 +00:00
|
|
|
cputest_SOURCES = \
|
|
|
|
cputest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
cputest_LDADD = $(LDADDS)
|
|
|
|
|
2006-08-24 21:46:28 +00:00
|
|
|
virshtest_SOURCES = \
|
|
|
|
virshtest.c \
|
|
|
|
testutils.c testutils.h
|
|
|
|
virshtest_LDADD = $(LDADDS)
|
|
|
|
|
2006-08-29 22:27:07 +00:00
|
|
|
conftest_SOURCES = \
|
|
|
|
conftest.c
|
|
|
|
conftest_LDADD = $(LDADDS)
|
|
|
|
|
2007-07-25 23:16:30 +00:00
|
|
|
nodeinfotest_SOURCES = \
|
|
|
|
nodeinfotest.c testutils.h testutils.c
|
|
|
|
nodeinfotest_LDADD = $(LDADDS)
|
|
|
|
|
2010-05-25 11:14:06 +00:00
|
|
|
commandtest_SOURCES = \
|
|
|
|
commandtest.c testutils.h testutils.c
|
build: consistently use CFLAGS
According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process. Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.
* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.
2011-05-31 22:15:28 +00:00
|
|
|
commandtest_CFLAGS = -Dabs_builddir="\"`pwd`\"" $(AM_CFLAGS)
|
2010-05-25 11:14:06 +00:00
|
|
|
commandtest_LDADD = $(LDADDS)
|
|
|
|
|
|
|
|
commandhelper_SOURCES = \
|
|
|
|
commandhelper.c
|
build: consistently use CFLAGS
According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process. Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.
* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.
2011-05-31 22:15:28 +00:00
|
|
|
commandhelper_CFLAGS = -Dabs_builddir="\"`pwd`\"" $(AM_CFLAGS)
|
2010-05-25 11:14:06 +00:00
|
|
|
commandhelper_LDADD = $(LDADDS)
|
|
|
|
|
2010-12-06 17:03:22 +00:00
|
|
|
virnetmessagetest_SOURCES = \
|
|
|
|
virnetmessagetest.c testutils.h testutils.c
|
build: consistently use CFLAGS
According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process. Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.
* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.
2011-05-31 22:15:28 +00:00
|
|
|
virnetmessagetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
2010-12-06 17:03:22 +00:00
|
|
|
virnetmessagetest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
|
|
|
|
2010-12-06 17:03:35 +00:00
|
|
|
virnetsockettest_SOURCES = \
|
|
|
|
virnetsockettest.c testutils.h testutils.c
|
build: consistently use CFLAGS
According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process. Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.
* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.
2011-05-31 22:15:28 +00:00
|
|
|
virnetsockettest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
2010-12-06 17:03:35 +00:00
|
|
|
virnetsockettest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
|
|
|
|
2010-12-06 17:03:22 +00:00
|
|
|
|
2009-04-03 10:55:51 +00:00
|
|
|
seclabeltest_SOURCES = \
|
|
|
|
seclabeltest.c
|
|
|
|
seclabeltest_LDADD = ../src/libvirt_driver_security.la $(LDADDS)
|
2009-10-08 14:34:22 +00:00
|
|
|
|
2008-05-22 23:49:36 +00:00
|
|
|
qparamtest_SOURCES = \
|
|
|
|
qparamtest.c testutils.h testutils.c
|
|
|
|
qparamtest_LDADD = $(LDADDS)
|
|
|
|
|
buf: Fix possible infinite loop in EscapeString, VSnprintf
The current code will go into an infinite loop if the printf generated
string is >= 1000, AND exactly 1 character smaller than the amount of free
space in the buffer. When this happens, we are dropped into the loop body,
but nothing will actually change, because count == (buf->size - buf->use - 1),
and virBufferGrow returns unchanged if count < (buf->size - buf->use)
Fix this by removing the '- 1' bit from 'size'. The *nprintf functions handle
the NULL byte for us anyways, so we shouldn't need to manually accommodate
for it.
Here's a bug where we are actually hitting this issue:
https://bugzilla.redhat.com/show_bug.cgi?id=602772
v2: Eric's improvements: while -> if (), remove extra va_list variable,
make sure we report buffer error if snprintf fails
v3: Add tests/virbuftest which reproduces the infinite loop before this
patch, works correctly after
2010-09-01 17:51:35 +00:00
|
|
|
virbuftest_SOURCES = \
|
|
|
|
virbuftest.c testutils.h testutils.c
|
|
|
|
virbuftest_LDADD = $(LDADDS)
|
|
|
|
|
2011-04-15 11:15:37 +00:00
|
|
|
hashtest_SOURCES = \
|
|
|
|
hashtest.c hashdata.h testutils.h testutils.c
|
|
|
|
hashtest_LDADD = $(LDADDS)
|
|
|
|
|
2011-06-30 14:08:29 +00:00
|
|
|
jsontest_SOURCES = \
|
2011-07-01 09:16:33 +00:00
|
|
|
jsontest.c testutils.h testutils.c
|
2011-06-30 14:08:29 +00:00
|
|
|
jsontest_LDADD = $(LDADDS)
|
|
|
|
|
2009-05-12 16:45:14 +00:00
|
|
|
if WITH_LIBVIRTD
|
|
|
|
eventtest_SOURCES = \
|
2011-02-24 17:58:04 +00:00
|
|
|
eventtest.c testutils.h testutils.c
|
2009-05-12 16:45:14 +00:00
|
|
|
eventtest_LDADD = -lrt $(LDADDS)
|
|
|
|
endif
|
|
|
|
|
2009-05-19 10:17:17 +00:00
|
|
|
if WITH_CIL
|
|
|
|
CILOPTFLAGS =
|
|
|
|
CILOPTINCS =
|
|
|
|
CILOPTPACKAGES = -package unix,str,cil
|
|
|
|
CILOPTLIBS = -linkpkg
|
|
|
|
|
|
|
|
object_locking_SOURCES = object-locking.ml
|
|
|
|
|
|
|
|
%.cmx: %.ml
|
|
|
|
ocamlfind ocamlopt $(CILOPTFLAGS) $(CILOPTINCS) $(CILOPTPACKAGES) -c $<
|
|
|
|
|
|
|
|
object-locking: object-locking.cmx object-locking-files.txt
|
|
|
|
ocamlfind ocamlopt $(CILOPTFLAGS) $(CILOPTINCS) $(CILOPTPACKAGES) $(CILOPTLIBS) $< -o $@
|
|
|
|
|
|
|
|
object-locking-files.txt:
|
|
|
|
find $(top_builddir)/src/ -name '*.i' > $@
|
|
|
|
|
|
|
|
else
|
|
|
|
EXTRA_DIST += object-locking.ml
|
|
|
|
endif
|
|
|
|
|
2009-05-27 12:07:43 +00:00
|
|
|
CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx object-locking-files.txt
|