2006-05-09 19:35:46 +04:00
## Process this file with automake to produce Makefile.in
2011-07-28 22:56:24 +04:00
## Copyright (C) 2005-2011 Red Hat, Inc.
## See COPYING.LIB for the License of this software
2008-03-24 13:19:36 +03:00
SHELL = $( PREFERABLY_POSIX_SHELL)
2006-05-09 19:35:46 +04: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-06 00:31:07 +03:00
-I$( top_srcdir) /gnulib/lib -I../gnulib/lib \
2006-05-09 19:35:46 +04:00
-I$( top_builddir) /include \
2006-05-29 20:05:05 +04: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 19:28:46 +04:00
-I$( top_srcdir) /src/util \
2011-07-28 16:55:21 +04:00
-I$( top_srcdir) /src/conf \
$( GETTEXT_CPPFLAGS)
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-06-01 02:15:28 +04:00
AM_CFLAGS = \
2007-09-19 21:42:40 +04:00
$( LIBXML_CFLAGS) \
$( GNUTLS_CFLAGS) \
2007-12-05 18:24:15 +03:00
$( SASL_CFLAGS) \
2008-02-20 18:38:29 +03:00
$( SELINUX_CFLAGS) \
2009-10-08 18:34:22 +04:00
$( APPARMOR_CFLAGS) \
2011-06-30 18:08:29 +04: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-06-01 02:15:28 +04:00
$( COVERAGE_CFLAGS) \
$( WARN_CFLAGS)
2007-02-14 05:12:41 +03:00
2008-11-21 15:16:08 +03:00
i f W I T H _ D R I V E R _ M O D U L E S
INCLUDES += \
-DTEST_DRIVER_DIR= \" $( top_builddir) /src/.libs\"
e n d i f
2006-05-09 19:35:46 +04:00
LDADDS = \
2010-01-15 13:09:01 +03:00
$( STATIC_BINARIES) \
2007-09-19 21:42:40 +04:00
$( LIBXML_LIBS) \
$( GNUTLS_LIBS) \
2007-12-05 18:24:15 +03:00
$( SASL_LIBS) \
2008-02-20 18:38:29 +03:00
$( SELINUX_LIBS) \
2009-10-08 18:34:22 +04:00
$( APPARMOR_LIBS) \
2011-06-30 18:08:29 +04:00
$( YAJL_LIBS) \
2007-05-29 18:44:15 +04:00
$( WARN_CFLAGS) \
2008-02-28 20:06:32 +03: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-06 00:31:07 +03:00
../gnulib/lib/libgnu.la \
2009-01-08 23:42:01 +03:00
$( LIBSOCKET) \
2007-02-14 05:12:41 +03:00
$( COVERAGE_LDFLAGS)
2006-05-09 19:35:46 +04:00
2007-11-14 13:35:58 +03:00
EXTRA_DIST = \
2009-01-27 18:29:53 +03:00
capabilityschemadata \
2010-12-16 21:24:00 +03:00
capabilityschematest \
commanddata \
confdata \
cputestdata \
2009-01-27 18:29:53 +03:00
domainschemadata \
2010-12-16 21:24:00 +03:00
domainschematest \
domainsnapshotschematest \
domainsnapshotxml2xmlin \
domainsnapshotxml2xmlout \
2009-07-22 13:07:07 +04:00
interfaceschemadata \
2010-12-16 21:24:00 +03:00
networkschematest \
networkxml2xmlin \
networkxml2xmlout \
2011-06-24 14:04:37 +04:00
networkxml2argvdata \
2010-12-16 21:24:00 +03:00
nodedevschemadata \
nodedevschematest \
nodeinfodata \
nwfilterschematest \
nwfilterxml2xmlin \
nwfilterxml2xmlout \
oomtrace.pl \
qemuhelpdata \
qemuxml2argvdata \
qemuxml2xmloutdata \
schematestutils.sh \
sexpr2xmldata \
2009-01-27 18:29:53 +03:00
storagepoolschematest \
2009-10-09 01:26:30 +04:00
storagepoolxml2xmlin \
2010-12-16 21:24:00 +03:00
storagepoolxml2xmlout \
2009-01-27 18:29:53 +03:00
storagevolschematest \
2009-10-09 22:17:21 +04:00
storagevolxml2xmlin \
2010-12-16 21:24:00 +03:00
storagevolxml2xmlout \
test-lib.sh \
2009-12-24 01:02:44 +03:00
vmx2xmldata \
2010-12-16 21:24:00 +03:00
xencapsdata \
xmconfigdata \
xml2sexprdata \
2011-06-30 19:23:23 +04:00
xml2vmxdata \
.valgrind.supp
2006-05-09 19:35:46 +04:00
2010-10-21 22:11:50 +04:00
check_PROGRAMS = virshtest conftest sockettest \
2010-05-25 15:14:06 +04:00
nodeinfotest qparamtest virbuftest \
2011-04-15 15:15:37 +04:00
commandtest commandhelper seclabeltest \
2011-07-01 21:58:15 +04:00
hashtest virnetmessagetest virnetsockettest ssh \
2011-07-20 22:04:18 +04:00
utiltest virnettlscontexttest
2010-12-06 20:03:35 +03:00
# This is a fake SSH we use from virnetsockettest
ssh_SOURCES = ssh.c
ssh_LDADD = $( COVERAGE_LDFLAGS)
2006-08-24 19:05:19 +04:00
2008-11-24 22:23:39 +03:00
i f W I T H _ X E N
2010-08-10 16:38:57 +04:00
check_PROGRAMS += xml2sexprtest sexpr2xmltest \
2011-07-08 01:53:41 +04:00
xmconfigtest xencapstest statstest reconnect
2008-11-24 22:23:39 +03:00
e n d i f
2008-11-18 15:46:13 +03:00
i f W I T H _ Q E M U
2010-08-10 16:38:57 +04:00
check_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest
2008-11-18 15:46:13 +03:00
e n d i f
2011-05-26 21:45:41 +04:00
i f W I T H _ O P E N V Z
check_PROGRAMS += openvzutilstest
e n d i f
2009-09-23 16:25:52 +04:00
i f W I T H _ E S X
2010-12-22 00:39:55 +03:00
check_PROGRAMS += esxutilstest
e n d i f
i f W I T H _ V M X
check_PROGRAMS += vmx2xmltest xml2vmxtest
2009-09-23 16:25:52 +04:00
e n d i f
2009-05-19 14:17:17 +04:00
i f W I T H _ C I L
2010-08-10 16:38:57 +04:00
check_PROGRAMS += object-locking
2009-05-19 14:17:17 +04:00
e n d i f
2011-06-30 18:08:29 +04:00
i f H A V E _ Y A J L
check_PROGRAMS += jsontest
e n d i f
2010-08-10 16:38:57 +04:00
check_PROGRAMS += networkxml2xmltest
2009-10-09 16:47:43 +04:00
2011-07-05 17:26:18 +04:00
i f W I T H _ N E T W O R K
2011-06-24 14:04:37 +04:00
check_PROGRAMS += networkxml2argvtest
2011-07-05 17:26:18 +04:00
e n d i f
2011-06-24 14:04:37 +04:00
2010-08-10 16:38:57 +04:00
check_PROGRAMS += nwfilterxml2xmltest
2010-04-02 21:28:28 +04:00
2010-08-10 16:38:57 +04:00
check_PROGRAMS += storagevolxml2xmltest storagepoolxml2xmltest
2009-10-09 01:26:30 +04:00
2010-08-10 16:38:57 +04:00
check_PROGRAMS += nodedevxml2xmltest
2009-02-24 17:58:32 +03:00
2010-08-10 16:38:57 +04:00
check_PROGRAMS += interfacexml2xmltest
2009-07-15 21:50:34 +04:00
2010-10-07 18:35:17 +04:00
check_PROGRAMS += cputest
2009-01-27 18:29:53 +03:00
test_scripts = \
capabilityschematest \
2009-07-15 21:50:34 +04:00
interfaceschematest \
2009-01-27 18:29:53 +03:00
networkschematest \
storagepoolschematest \
storagevolschematest \
domainschematest \
2010-04-06 19:09:46 +04:00
nodedevschematest \
2010-05-04 01:15:18 +04:00
nwfilterschematest \
domainsnapshotschematest
2009-01-27 18:29:53 +03:00
2008-06-26 13:37:51 +04:00
i f W I T H _ L I B V I R T D
2009-01-16 21:07:24 +03:00
test_scripts += \
test_conf.sh \
cpuset \
daemon-conf \
define-dev-segfault \
int-overflow \
2009-03-02 23:01:05 +03:00
libvirtd-fail \
libvirtd-pool \
2009-01-16 21:07:24 +03:00
read-bufsiz \
read-non-seekable \
start \
undefine \
vcpupin \
virsh-all \
2011-04-13 01:59:19 +04:00
virsh-optparse \
2010-05-11 17:38:21 +04:00
virsh-schedinfo \
2008-11-24 10:13:29 +03:00
virsh-synopsis
2011-05-13 12:03:20 +04:00
e l s e
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 13:37:51 +04:00
e n d i f
2007-12-12 00:20:13 +03:00
2009-10-08 18:34:22 +04:00
i f W I T H _ S E C D R I V E R _ A P P A R M O R
test_scripts += virt-aa-helper-test
2009-12-14 15:40:42 +03:00
e l s e
EXTRA_DIST += virt-aa-helper-test
2009-10-08 18:34:22 +04:00
e n d i f
2009-12-14 15:40:42 +03:00
2007-11-14 13:35:58 +03:00
EXTRA_DIST += $( test_scripts)
2008-11-24 22:23:39 +03: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 21:51:35 +04:00
virbuftest \
2010-10-21 22:11:50 +04:00
sockettest \
2010-05-25 15:14:06 +04:00
commandtest \
2011-01-15 00:37:55 +03:00
seclabeltest \
2011-04-15 15:15:37 +04:00
hashtest \
2010-12-06 20:03:22 +03:00
virnetmessagetest \
2010-12-06 20:03:35 +03:00
virnetsockettest \
2011-07-20 22:04:18 +04:00
virnettlscontexttest \
2011-07-01 21:58:15 +04:00
utiltest \
2008-11-24 22:23:39 +03:00
$( test_scripts)
2011-06-30 18:08:29 +04:00
i f H A V E _ Y A J L
TESTS += jsontest
e n d i f
2008-11-24 22:23:39 +03:00
i f W I T H _ X E N
TESTS += xml2sexprtest \
sexpr2xmltest \
xmconfigtest \
2011-07-08 01:53:41 +04:00
xencapstest \
reconnect \
statstest
2007-02-07 16:41:44 +03:00
e n d i f
2008-11-24 22:23:39 +03:00
2008-11-18 15:46:13 +03:00
i f W I T H _ Q E M U
2009-06-11 18:17:42 +04:00
TESTS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest
2010-04-02 21:28:28 +04:00
TESTS += nwfilterxml2xmltest
2008-11-18 15:46:13 +03:00
e n d i f
2006-05-09 19:35:46 +04:00
2011-05-26 21:45:41 +04:00
i f W I T H _ O P E N V Z
TESTS += openvzutilstest
e n d i f
2009-09-23 16:25:52 +04:00
i f W I T H _ E S X
2010-12-22 00:39:55 +03:00
TESTS += esxutilstest
e n d i f
i f W I T H _ V M X
TESTS += vmx2xmltest xml2vmxtest
2009-09-23 16:25:52 +04:00
e n d i f
2009-05-12 20:45:14 +04:00
i f W I T H _ L I B V I R T D
2010-08-10 16:38:57 +04:00
check_PROGRAMS += eventtest
2009-05-12 20:45:14 +04:00
TESTS += eventtest
e n d i f
2009-10-09 16:47:43 +04:00
TESTS += networkxml2xmltest
2011-07-05 17:26:18 +04:00
i f W I T H _ N E T W O R K
2011-06-24 14:04:37 +04:00
TESTS += networkxml2argvtest
2011-07-05 17:26:18 +04:00
e n d i f
2011-06-24 14:04:37 +04:00
2009-10-09 22:17:21 +04:00
TESTS += storagevolxml2xmltest storagepoolxml2xmltest
2009-10-09 01:26:30 +04:00
2009-02-24 17:58:32 +03:00
TESTS += nodedevxml2xmltest
2009-07-15 21:50:34 +04:00
TESTS += interfacexml2xmltest
2010-10-07 18:35:17 +04:00
TESTS += cputest
2007-11-17 16:16:47 +03:00
# NB, automake < 1.10 does not provide the real
2010-12-15 03:23:22 +03:00
# abs_top_{src/build}dir or builddir variables, so don't rely
2007-11-17 16:16:47 +03:00
# on them here. Fake them with 'pwd'
2011-07-29 18:52:27 +04:00
# Also, BSD sh doesn't like 'a=b b=$$a', so we can't use an
# intermediate shell variable, but must do all the expansion in make
lv_abs_top_builddir = ` cd '$(top_builddir)' ; pwd `
path_add = $( lv_abs_top_builddir) /daemon$( PATH_SEPARATOR) $( lv_abs_top_builddir) /tools$( PATH_SEPARATOR) $( lv_abs_top_builddir) /tests
2007-11-12 17:00:32 +03:00
TESTS_ENVIRONMENT = \
2011-07-29 18:52:27 +04:00
abs_top_builddir = $( lv_abs_top_builddir) \
2008-03-24 13:18:36 +03:00
abs_top_srcdir = ` cd '$(top_srcdir)' ; pwd ` \
2010-12-15 03:23:22 +03:00
abs_builddir = ` pwd ` \
2008-04-18 19:28:33 +04:00
abs_srcdir = ` cd '$(srcdir)' ; pwd ` \
2009-03-04 16:04:06 +03:00
CONFIG_HEADER = " `cd ' $( top_builddir) '; pwd`/config.h " \
2008-03-24 13:18:36 +03:00
PATH = " $( path_add) $( PATH_SEPARATOR) $$ PATH " \
2008-03-24 13:19:36 +03:00
SHELL = " $( SHELL) " \
2008-11-21 15:16:08 +03:00
LIBVIRT_DRIVER_DIR = " $( abs_top_builddir) /src/.libs " \
2008-12-21 02:23:50 +03:00
LC_ALL = C \
2007-11-12 17:00:32 +03:00
$( VG)
2006-08-24 20:00:19 +04:00
valgrind :
2008-04-28 17:36:48 +04:00
$( MAKE) check VG = " valgrind --quiet --leak-check=full --suppressions= $( srcdir) /.valgrind.supp "
2006-08-24 20:00:19 +04:00
2010-10-21 22:11:50 +04:00
sockettest_SOURCES = \
sockettest.c \
testutils.c testutils.h
sockettest_LDADD = ../src/libvirt_util.la $( LDADDS)
2008-11-24 22:23:39 +03:00
i f W I T H _ X E N
2006-08-24 19:05:19 +04:00
xml2sexprtest_SOURCES = \
2008-07-25 17:17:27 +04:00
xml2sexprtest.c testutilsxen.c testutilsxen.h \
2006-08-24 19:05:19 +04:00
testutils.c testutils.h
2008-11-21 15:16:08 +03:00
xml2sexprtest_LDADD = ../src/libvirt_driver_xen.la $( LDADDS)
2006-08-24 19:05:19 +04:00
sexpr2xmltest_SOURCES = \
2009-01-22 21:19:20 +03:00
sexpr2xmltest.c testutilsxen.c testutilsxen.h \
2006-08-24 19:05:19 +04:00
testutils.c testutils.h
2008-11-21 15:16:08 +03:00
sexpr2xmltest_LDADD = ../src/libvirt_driver_xen.la $( LDADDS)
2006-08-24 19:05:19 +04:00
2007-01-19 23:30:05 +03:00
xmconfigtest_SOURCES = \
2008-07-25 17:39:02 +04:00
xmconfigtest.c testutilsxen.c testutilsxen.h \
2007-01-19 23:30:05 +03:00
testutils.c testutils.h
2008-11-21 15:16:08 +03:00
xmconfigtest_LDADD = ../src/libvirt_driver_xen.la $( LDADDS)
2007-01-19 23:30:05 +03:00
2008-11-24 22:23:39 +03:00
xencapstest_SOURCES = \
xencapstest.c testutils.h testutils.c
xencapstest_LDADD = ../src/libvirt_driver_xen.la $( LDADDS)
reconnect_SOURCES = \
2011-07-09 13:50:38 +04:00
reconnect.c testutils.h testutils.c
2008-11-24 22:23:39 +03:00
reconnect_LDADD = $( LDADDS)
2010-10-14 16:22:18 +04:00
statstest_SOURCES = \
statstest.c testutils.h testutils.c
statstest_LDADD = ../src/libvirt_driver_xen.la $( LDADDS)
2008-11-24 22:23:39 +03:00
e l s e
EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
xencapstest.c reconnect.c \
testutilsxen.c testutilsxen.h
e n d i f
2008-11-18 15:46:13 +03:00
i f W I T H _ Q E M U
2011-07-04 10:27:12 +04:00
qemu_LDADDS = ../src/libvirt_driver_qemu.la
i f W I T H _ N E T W O R K
qemu_LDADDS += ../src/libvirt_driver_network.la
e n d i f
2007-07-19 01:34:22 +04:00
qemuxml2argvtest_SOURCES = \
2008-05-16 20:51:30 +04:00
qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \
2007-07-19 01:34:22 +04:00
testutils.c testutils.h
2011-07-04 10:27:12 +04:00
qemuxml2argvtest_LDADD = $( qemu_LDADDS) $( LDADDS)
2007-07-19 01:34:22 +04:00
qemuxml2xmltest_SOURCES = \
2008-05-16 20:51:30 +04:00
qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \
2007-07-19 01:34:22 +04:00
testutils.c testutils.h
2011-07-04 10:27:12 +04:00
qemuxml2xmltest_LDADD = $( qemu_LDADDS) $( LDADDS)
2009-05-21 18:22:51 +04:00
qemuargv2xmltest_SOURCES = \
qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \
testutils.c testutils.h
2011-07-04 10:27:12 +04:00
qemuargv2xmltest_LDADD = $( qemu_LDADDS) $( LDADDS)
2009-06-11 18:17:42 +04:00
qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h
2011-07-04 10:27:12 +04:00
qemuhelptest_LDADD = $( qemu_LDADDS) $( LDADDS)
2008-11-18 15:46:13 +03:00
e l s e
2009-06-11 18:17:42 +04:00
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c qemuhelptest.c testutilsqemu.c testutilsqemu.h
2008-11-18 15:46:13 +03:00
e n d i f
2007-07-19 01:34:22 +04:00
2011-05-26 21:45:41 +04:00
i f W I T H _ O P E N V Z
openvzutilstest_SOURCES = \
openvzutilstest.c \
testutils.c testutils.h
openvzutilstest_LDADD = ../src/libvirt_driver_openvz.la $( LDADDS)
e l s e
EXTRA_DIST += openvzutilstest.c
e n d i f
EXTRA_DIST += openvzutilstest.conf
2009-09-23 16:25:52 +04:00
i f W I T H _ E S X
esxutilstest_SOURCES = \
esxutilstest.c \
testutils.c testutils.h
esxutilstest_LDADD = ../src/libvirt_driver_esx.la $( LDADDS)
2010-12-22 00:39:55 +03:00
e l s e
EXTRA_DIST += esxutilstest.c
e n d i f
2009-09-23 16:25:52 +04:00
2010-12-22 00:39:55 +03:00
i f W I T H _ V M X
2009-09-23 16:25:52 +04:00
vmx2xmltest_SOURCES = \
vmx2xmltest.c \
testutils.c testutils.h
2010-12-22 00:39:55 +03:00
vmx2xmltest_LDADD = ../src/libvirt_vmx.la $( LDADDS)
2009-09-23 16:25:52 +04:00
xml2vmxtest_SOURCES = \
xml2vmxtest.c \
testutils.c testutils.h
2010-12-22 00:39:55 +03:00
xml2vmxtest_LDADD = ../src/libvirt_vmx.la $( LDADDS)
2009-09-23 16:25:52 +04:00
e l s e
2010-12-22 00:39:55 +03:00
EXTRA_DIST += vmx2xmltest.c xml2vmxtest.c
2009-09-23 16:25:52 +04:00
e n d i f
2009-10-09 16:47:43 +04:00
networkxml2xmltest_SOURCES = \
networkxml2xmltest.c \
testutils.c testutils.h
networkxml2xmltest_LDADD = $( LDADDS)
2011-07-05 17:26:18 +04:00
i f W I T H _ N E T W O R K
2011-06-24 14:04:37 +04:00
networkxml2argvtest_SOURCES = \
networkxml2argvtest.c \
testutils.c testutils.h
networkxml2argvtest_LDADD = ../src/libvirt_driver_network.la $( LDADDS)
2011-07-05 17:26:18 +04:00
e l s e
EXTRA_DIST += networkxml2argvtest.c
e n d i f
2011-06-24 14:04:37 +04:00
2010-04-02 21:28:28 +04:00
nwfilterxml2xmltest_SOURCES = \
nwfilterxml2xmltest.c \
testutils.c testutils.h
nwfilterxml2xmltest_LDADD = $( LDADDS)
2009-10-09 22:17:21 +04:00
storagevolxml2xmltest_SOURCES = \
storagevolxml2xmltest.c \
testutils.c testutils.h
storagevolxml2xmltest_LDADD = $( LDADDS)
2009-10-09 01:26:30 +04:00
storagepoolxml2xmltest_SOURCES = \
storagepoolxml2xmltest.c \
testutils.c testutils.h
storagepoolxml2xmltest_LDADD = $( LDADDS)
2009-02-24 17:58:32 +03:00
nodedevxml2xmltest_SOURCES = \
nodedevxml2xmltest.c \
testutils.c testutils.h
2009-03-03 20:00:18 +03:00
nodedevxml2xmltest_LDADD = $( LDADDS)
2009-02-24 17:58:32 +03:00
2009-07-15 21:50:34 +04:00
interfacexml2xmltest_SOURCES = \
interfacexml2xmltest.c \
testutils.c testutils.h
interfacexml2xmltest_LDADD = $( LDADDS)
2010-10-07 18:35:17 +04:00
cputest_SOURCES = \
cputest.c \
testutils.c testutils.h
cputest_LDADD = $( LDADDS)
2006-08-25 01:46:28 +04:00
virshtest_SOURCES = \
virshtest.c \
testutils.c testutils.h
virshtest_LDADD = $( LDADDS)
2006-08-30 02:27:07 +04:00
conftest_SOURCES = \
conftest.c
conftest_LDADD = $( LDADDS)
2007-07-26 03:16:30 +04:00
nodeinfotest_SOURCES = \
nodeinfotest.c testutils.h testutils.c
nodeinfotest_LDADD = $( LDADDS)
2010-05-25 15:14:06 +04: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-06-01 02:15:28 +04:00
commandtest_CFLAGS = -Dabs_builddir= "\"`pwd`\"" $( AM_CFLAGS)
2010-05-25 15:14:06 +04: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-06-01 02:15:28 +04:00
commandhelper_CFLAGS = -Dabs_builddir= "\"`pwd`\"" $( AM_CFLAGS)
2010-05-25 15:14:06 +04:00
commandhelper_LDADD = $( LDADDS)
2010-12-06 20:03:22 +03: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-06-01 02:15:28 +04:00
virnetmessagetest_CFLAGS = -Dabs_builddir= " \" $( abs_builddir) \" " $( AM_CFLAGS)
2010-12-06 20:03:22 +03:00
virnetmessagetest_LDADD = ../src/libvirt-net-rpc.la $( LDADDS)
2010-12-06 20:03:35 +03: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-06-01 02:15:28 +04:00
virnetsockettest_CFLAGS = -Dabs_builddir= " \" $( abs_builddir) \" " $( AM_CFLAGS)
2010-12-06 20:03:35 +03:00
virnetsockettest_LDADD = ../src/libvirt-net-rpc.la $( LDADDS)
2011-07-20 22:04:18 +04:00
virnettlscontexttest_SOURCES = \
2011-07-22 21:59:37 +04:00
virnettlscontexttest.c testutils.h testutils.c
2011-07-20 22:04:18 +04:00
virnettlscontexttest_CFLAGS = -Dabs_builddir= " \" $( abs_builddir) \" " $( AM_CFLAGS)
2011-07-22 21:59:37 +04:00
virnettlscontexttest_LDADD = ../src/libvirt-net-rpc.la $( LDADDS)
i f H A V E _ L I B T A S N 1
virnettlscontexttest_SOURCES += pkix_asn1_tab.c
virnettlscontexttest_LDADD += -ltasn1
e l s e
EXTRA_DIST += pkix_asn1_tab.c
e n d i f
2011-07-20 22:04:18 +04:00
2010-12-06 20:03:22 +03:00
2009-04-03 14:55:51 +04:00
seclabeltest_SOURCES = \
seclabeltest.c
seclabeltest_LDADD = ../src/libvirt_driver_security.la $( LDADDS)
2009-10-08 18:34:22 +04:00
2008-05-23 03:49:36 +04: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 21:51:35 +04:00
virbuftest_SOURCES = \
virbuftest.c testutils.h testutils.c
virbuftest_LDADD = $( LDADDS)
2011-04-15 15:15:37 +04:00
hashtest_SOURCES = \
hashtest.c hashdata.h testutils.h testutils.c
hashtest_LDADD = $( LDADDS)
2011-06-30 18:08:29 +04:00
jsontest_SOURCES = \
2011-07-01 13:16:33 +04:00
jsontest.c testutils.h testutils.c
2011-06-30 18:08:29 +04:00
jsontest_LDADD = $( LDADDS)
2011-07-01 21:58:15 +04:00
utiltest_SOURCES = \
utiltest.c testutils.h testutils.c
utiltest_LDADD = $( LDADDS)
2009-05-12 20:45:14 +04:00
i f W I T H _ L I B V I R T D
eventtest_SOURCES = \
2011-02-24 20:58:04 +03:00
eventtest.c testutils.h testutils.c
2009-05-12 20:45:14 +04:00
eventtest_LDADD = -lrt $( LDADDS)
e n d i f
2009-05-19 14:17:17 +04:00
i f W I T H _ C I L
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' > $@
e l s e
EXTRA_DIST += object-locking.ml
e n d i f
2009-05-27 16:07:43 +04:00
CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx object-locking-files.txt