mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
Remove libvirt_test.la library
The libvirt_test.la library was introduced to allow test suites to reference internal-only symbols. These days, nearly every symbol we care about is in src/libvirt_private.syms, so there is no need for libvirt_test.la to continue to exist * src/Makefile.am: Delete libvirt_test.la & add new .syms files * src/libvirt_private.syms: Export symbols needed by test suite * tests/Makefile.am: Link to libvirt_test.la. Ensure LXC tests link to network_driver.la * src/libvirt_esx.syms, src/libvirt_openvz.syms: Add exports needed by test suite
This commit is contained in:
parent
1e27f291b3
commit
6cd4b1fe16
@ -1128,6 +1128,7 @@ if test "$with_dbus" = "yes" ; then
|
|||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
CFLAGS="$save_CFLAGS"
|
CFLAGS="$save_CFLAGS"
|
||||||
fi
|
fi
|
||||||
|
AM_CONDITIONAL([HAVE_DBUS], [test "$have_dbus" = "yes"])
|
||||||
|
|
||||||
|
|
||||||
dnl PolicyKit library
|
dnl PolicyKit library
|
||||||
|
@ -1143,6 +1143,10 @@ if WITH_LINUX
|
|||||||
USED_SYM_FILES += libvirt_linux.syms
|
USED_SYM_FILES += libvirt_linux.syms
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if WITH_ESX
|
||||||
|
USED_SYM_FILES += libvirt_esx.syms
|
||||||
|
endif
|
||||||
|
|
||||||
if WITH_LIBVIRTD
|
if WITH_LIBVIRTD
|
||||||
USED_SYM_FILES += libvirt_daemon.syms
|
USED_SYM_FILES += libvirt_daemon.syms
|
||||||
endif
|
endif
|
||||||
@ -1151,6 +1155,10 @@ if WITH_NWFILTER
|
|||||||
USED_SYM_FILES += libvirt_nwfilter.syms
|
USED_SYM_FILES += libvirt_nwfilter.syms
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if WITH_OPENVZ
|
||||||
|
USED_SYM_FILES += libvirt_openvz.syms
|
||||||
|
endif
|
||||||
|
|
||||||
if WITH_VMX
|
if WITH_VMX
|
||||||
USED_SYM_FILES += libvirt_vmx.syms
|
USED_SYM_FILES += libvirt_vmx.syms
|
||||||
endif
|
endif
|
||||||
@ -1173,8 +1181,11 @@ EXTRA_DIST += \
|
|||||||
libvirt_driver_modules.syms \
|
libvirt_driver_modules.syms \
|
||||||
libvirt_daemon.syms \
|
libvirt_daemon.syms \
|
||||||
libvirt_linux.syms \
|
libvirt_linux.syms \
|
||||||
|
libvirt_esx.syms \
|
||||||
libvirt_network.syms \
|
libvirt_network.syms \
|
||||||
libvirt_nwfilter.syms \
|
libvirt_nwfilter.syms \
|
||||||
|
libvirt_openvz.syms \
|
||||||
|
libvirt_qemu.syms \
|
||||||
libvirt_sasl.syms \
|
libvirt_sasl.syms \
|
||||||
libvirt_vmx.syms \
|
libvirt_vmx.syms \
|
||||||
libvirt_xenxs.syms
|
libvirt_xenxs.syms
|
||||||
@ -1265,24 +1276,6 @@ endif
|
|||||||
|
|
||||||
EXTRA_DIST += probes.d
|
EXTRA_DIST += probes.d
|
||||||
|
|
||||||
|
|
||||||
# Create an automake "convenience library" version of libvirt_la,
|
|
||||||
# just for testing, since the test harness requires access to internal
|
|
||||||
# bits and pieces that we don't want to make publicly accessible.
|
|
||||||
noinst_LTLIBRARIES += libvirt_test.la
|
|
||||||
|
|
||||||
# Remove version script from convenience library
|
|
||||||
test_LDFLAGS = \
|
|
||||||
$$(echo '$(libvirt_la_LDFLAGS)' \
|
|
||||||
|sed 's!$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE)!!' \
|
|
||||||
|sed 's!-version-info $(LIBVIRT_VERSION_INFO)!!')
|
|
||||||
|
|
||||||
# Just like the above, but with a slightly different set of public symbols.
|
|
||||||
libvirt_test_la_SOURCES = $(libvirt_la_SOURCES)
|
|
||||||
libvirt_test_la_LIBADD = $(libvirt_la_LIBADD)
|
|
||||||
libvirt_test_la_LDFLAGS = $(test_LDFLAGS) $(AM_LDFLAGS)
|
|
||||||
libvirt_test_la_CFLAGS = $(AM_CFLAGS)
|
|
||||||
|
|
||||||
libvirt_qemu_la_SOURCES = libvirt-qemu.c
|
libvirt_qemu_la_SOURCES = libvirt-qemu.c
|
||||||
libvirt_qemu_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \
|
libvirt_qemu_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \
|
||||||
-version-info $(LIBVIRT_VERSION_INFO) \
|
-version-info $(LIBVIRT_VERSION_INFO) \
|
||||||
|
7
src/libvirt_esx.syms
Normal file
7
src/libvirt_esx.syms
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#
|
||||||
|
# These symbols are dependent upon --with-esx via WITH_ESX
|
||||||
|
#
|
||||||
|
|
||||||
|
esxUtil_EscapeDatastoreItem;
|
||||||
|
esxVI_DateTime_ConvertToCalendarTime;
|
||||||
|
esxUtil_ParseDatastorePath;
|
7
src/libvirt_openvz.syms
Normal file
7
src/libvirt_openvz.syms
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#
|
||||||
|
# These symbols are dependent upon --with-openvz via WITH_OPENVZ
|
||||||
|
#
|
||||||
|
|
||||||
|
openvzReadConfigParam;
|
||||||
|
openvzReadNetworkConf;
|
||||||
|
openvzLocateConfFile;
|
@ -190,6 +190,7 @@ virCPUModeTypeToString;
|
|||||||
|
|
||||||
|
|
||||||
# datatypes.h
|
# datatypes.h
|
||||||
|
virGetConnect;
|
||||||
virGetDomain;
|
virGetDomain;
|
||||||
virGetDomainSnapshot;
|
virGetDomainSnapshot;
|
||||||
virGetInterface;
|
virGetInterface;
|
||||||
@ -432,6 +433,8 @@ virDomainRunningReasonTypeToString;
|
|||||||
virDomainSaveConfig;
|
virDomainSaveConfig;
|
||||||
virDomainSaveStatus;
|
virDomainSaveStatus;
|
||||||
virDomainSaveXML;
|
virDomainSaveXML;
|
||||||
|
virDomainSeclabelTypeFromString;
|
||||||
|
virDomainSeclabelTypeToString;
|
||||||
virDomainShutdownReasonTypeFromString;
|
virDomainShutdownReasonTypeFromString;
|
||||||
virDomainShutdownReasonTypeToString;
|
virDomainShutdownReasonTypeToString;
|
||||||
virDomainShutoffReasonTypeFromString;
|
virDomainShutoffReasonTypeFromString;
|
||||||
@ -440,6 +443,8 @@ virDomainSmartcardDefForeach;
|
|||||||
virDomainSmartcardDefFree;
|
virDomainSmartcardDefFree;
|
||||||
virDomainSmartcardTypeFromString;
|
virDomainSmartcardTypeFromString;
|
||||||
virDomainSmartcardTypeToString;
|
virDomainSmartcardTypeToString;
|
||||||
|
virDomainSmbiosModeTypeFromString;
|
||||||
|
virDomainSmbiosModeTypeToString;
|
||||||
virDomainSnapshotAlignDisks;
|
virDomainSnapshotAlignDisks;
|
||||||
virDomainSnapshotAssignDef;
|
virDomainSnapshotAssignDef;
|
||||||
virDomainSnapshotDefFormat;
|
virDomainSnapshotDefFormat;
|
||||||
@ -562,8 +567,16 @@ ebtablesRemoveForwardAllowIn;
|
|||||||
|
|
||||||
|
|
||||||
# event_poll.h
|
# event_poll.h
|
||||||
virEventPollToNativeEvents;
|
virEventPollAddHandle;
|
||||||
|
virEventPollAddTimeout;
|
||||||
virEventPollFromNativeEvents;
|
virEventPollFromNativeEvents;
|
||||||
|
virEventPollInit;
|
||||||
|
virEventPollRemoveHandle;
|
||||||
|
virEventPollRemoveTimeout;
|
||||||
|
virEventPollRunOnce;
|
||||||
|
virEventPollToNativeEvents;
|
||||||
|
virEventPollUpdateHandle;
|
||||||
|
virEventPollUpdateTimeout;
|
||||||
|
|
||||||
|
|
||||||
# fdstream.h
|
# fdstream.h
|
||||||
@ -576,6 +589,7 @@ virFDStreamCreateFile;
|
|||||||
# hash.h
|
# hash.h
|
||||||
virHashAddEntry;
|
virHashAddEntry;
|
||||||
virHashCreate;
|
virHashCreate;
|
||||||
|
virHashEqual;
|
||||||
virHashForEach;
|
virHashForEach;
|
||||||
virHashFree;
|
virHashFree;
|
||||||
virHashGetItems;
|
virHashGetItems;
|
||||||
@ -789,6 +803,7 @@ virNetworkObjIsDuplicate;
|
|||||||
virNetworkObjListFree;
|
virNetworkObjListFree;
|
||||||
virNetworkObjLock;
|
virNetworkObjLock;
|
||||||
virNetworkObjUnlock;
|
virNetworkObjUnlock;
|
||||||
|
virNetworkObjFree;
|
||||||
virNetworkRemoveInactive;
|
virNetworkRemoveInactive;
|
||||||
virNetworkSaveConfig;
|
virNetworkSaveConfig;
|
||||||
virNetworkSetBridgeMacAddr;
|
virNetworkSetBridgeMacAddr;
|
||||||
@ -1069,6 +1084,7 @@ virMutexUnlock;
|
|||||||
virOnce;
|
virOnce;
|
||||||
virThreadCreate;
|
virThreadCreate;
|
||||||
virThreadID;
|
virThreadID;
|
||||||
|
virThreadInitialize;
|
||||||
virThreadIsSelf;
|
virThreadIsSelf;
|
||||||
virThreadJoin;
|
virThreadJoin;
|
||||||
virThreadSelf;
|
virThreadSelf;
|
||||||
@ -1349,16 +1365,21 @@ virNetlinkStartup;
|
|||||||
|
|
||||||
# virnetmessage.h
|
# virnetmessage.h
|
||||||
virNetMessageClear;
|
virNetMessageClear;
|
||||||
|
virNetMessageDecodeHeader;
|
||||||
virNetMessageDecodeNumFDs;
|
virNetMessageDecodeNumFDs;
|
||||||
|
virNetMessageDecodeLength;
|
||||||
|
virNetMessageDecodePayload;
|
||||||
virNetMessageDupFD;
|
virNetMessageDupFD;
|
||||||
virNetMessageEncodeHeader;
|
virNetMessageEncodeHeader;
|
||||||
virNetMessageEncodePayload;
|
virNetMessageEncodePayload;
|
||||||
|
virNetMessageEncodePayloadRaw;
|
||||||
virNetMessageEncodeNumFDs;
|
virNetMessageEncodeNumFDs;
|
||||||
virNetMessageFree;
|
virNetMessageFree;
|
||||||
virNetMessageNew;
|
virNetMessageNew;
|
||||||
virNetMessageQueuePush;
|
virNetMessageQueuePush;
|
||||||
virNetMessageQueueServe;
|
virNetMessageQueueServe;
|
||||||
virNetMessageSaveError;
|
virNetMessageSaveError;
|
||||||
|
xdr_virNetMessageError;
|
||||||
|
|
||||||
|
|
||||||
# virnetserver.h
|
# virnetserver.h
|
||||||
@ -1418,22 +1439,38 @@ virNetServerProgramSendStreamError;
|
|||||||
|
|
||||||
|
|
||||||
# virnetsocket.h
|
# virnetsocket.h
|
||||||
|
virNetSocketAccept;
|
||||||
virNetSocketDupFD;
|
virNetSocketDupFD;
|
||||||
virNetSocketFree;
|
virNetSocketFree;
|
||||||
virNetSocketGetFD;
|
virNetSocketGetFD;
|
||||||
virNetSocketHasPassFD;
|
virNetSocketHasPassFD;
|
||||||
virNetSocketIsLocal;
|
virNetSocketIsLocal;
|
||||||
virNetSocketListen;
|
virNetSocketListen;
|
||||||
|
virNetSocketLocalAddrString;
|
||||||
|
virNetSocketNewConnectCommand;
|
||||||
|
virNetSocketNewConnectSSH;
|
||||||
virNetSocketNewConnectTCP;
|
virNetSocketNewConnectTCP;
|
||||||
|
virNetSocketNewConnectUNIX;
|
||||||
|
virNetSocketNewListenTCP;
|
||||||
virNetSocketNewListenUNIX;
|
virNetSocketNewListenUNIX;
|
||||||
|
virNetSocketRead;
|
||||||
virNetSocketRecvFD;
|
virNetSocketRecvFD;
|
||||||
|
virNetSocketRemoteAddrString;
|
||||||
virNetSocketSendFD;
|
virNetSocketSendFD;
|
||||||
|
virNetSocketSetBlocking;
|
||||||
|
virNetSocketWrite;
|
||||||
|
|
||||||
|
|
||||||
# virnettlscontext.h
|
# virnettlscontext.h
|
||||||
|
virNetTLSContextCheckCertificate;
|
||||||
virNetTLSContextFree;
|
virNetTLSContextFree;
|
||||||
|
virNetTLSContextNewClient;
|
||||||
virNetTLSContextNewServer;
|
virNetTLSContextNewServer;
|
||||||
virNetTLSContextNewServerPath;
|
virNetTLSContextNewServerPath;
|
||||||
|
virNetTLSSessionFree;
|
||||||
|
virNetTLSSessionHandshake;
|
||||||
|
virNetTLSSessionNew;
|
||||||
|
virNetTLSSessionSetIOCallbacks;
|
||||||
|
|
||||||
|
|
||||||
# virnodesuspend.h
|
# virnodesuspend.h
|
||||||
@ -1486,6 +1523,7 @@ virSocketAddrSetPort;
|
|||||||
|
|
||||||
# virterror_internal.h
|
# virterror_internal.h
|
||||||
virDispatchError;
|
virDispatchError;
|
||||||
|
virErrorInitialize;
|
||||||
virRaiseErrorFull;
|
virRaiseErrorFull;
|
||||||
virReportErrorHelper;
|
virReportErrorHelper;
|
||||||
virReportOOMErrorFull;
|
virReportOOMErrorFull;
|
||||||
|
@ -35,19 +35,10 @@ PROBES_O += ../src/probes.o
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
LDADDS = \
|
LDADDS = \
|
||||||
$(STATIC_BINARIES) \
|
|
||||||
$(LIBXML_LIBS) \
|
|
||||||
$(GNUTLS_LIBS) \
|
|
||||||
$(SASL_LIBS) \
|
|
||||||
$(SELINUX_LIBS) \
|
|
||||||
$(APPARMOR_LIBS) \
|
|
||||||
$(YAJL_LIBS) \
|
|
||||||
$(WARN_CFLAGS) \
|
$(WARN_CFLAGS) \
|
||||||
../src/libvirt_test.la \
|
|
||||||
$(PROBES_O) \
|
$(PROBES_O) \
|
||||||
../gnulib/lib/libgnu.la \
|
../src/libvirt.la \
|
||||||
$(LIBSOCKET) \
|
../gnulib/lib/libgnu.la
|
||||||
$(COVERAGE_LDFLAGS)
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
capabilityschemadata \
|
capabilityschemadata \
|
||||||
@ -254,27 +245,30 @@ valgrind:
|
|||||||
sockettest_SOURCES = \
|
sockettest_SOURCES = \
|
||||||
sockettest.c \
|
sockettest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
sockettest_LDADD = ../src/libvirt_util.la $(LDADDS)
|
sockettest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
if WITH_XEN
|
if WITH_XEN
|
||||||
|
xen_LDADDS = ../src/libvirt_driver_xen.la
|
||||||
|
xen_LDADDS += $(LDADDS)
|
||||||
|
|
||||||
xml2sexprtest_SOURCES = \
|
xml2sexprtest_SOURCES = \
|
||||||
xml2sexprtest.c testutilsxen.c testutilsxen.h \
|
xml2sexprtest.c testutilsxen.c testutilsxen.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
xml2sexprtest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
xml2sexprtest_LDADD = $(xen_LDADDS)
|
||||||
|
|
||||||
sexpr2xmltest_SOURCES = \
|
sexpr2xmltest_SOURCES = \
|
||||||
sexpr2xmltest.c testutilsxen.c testutilsxen.h \
|
sexpr2xmltest.c testutilsxen.c testutilsxen.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
sexpr2xmltest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
sexpr2xmltest_LDADD = $(xen_LDADDS)
|
||||||
|
|
||||||
xmconfigtest_SOURCES = \
|
xmconfigtest_SOURCES = \
|
||||||
xmconfigtest.c testutilsxen.c testutilsxen.h \
|
xmconfigtest.c testutilsxen.c testutilsxen.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
xmconfigtest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
xmconfigtest_LDADD = $(xen_LDADDS)
|
||||||
|
|
||||||
xencapstest_SOURCES = \
|
xencapstest_SOURCES = \
|
||||||
xencapstest.c testutils.h testutils.c
|
xencapstest.c testutils.h testutils.c
|
||||||
xencapstest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
xencapstest_LDADD = $(xen_LDADDS)
|
||||||
|
|
||||||
reconnect_SOURCES = \
|
reconnect_SOURCES = \
|
||||||
reconnect.c testutils.h testutils.c
|
reconnect.c testutils.h testutils.c
|
||||||
@ -282,7 +276,7 @@ reconnect_LDADD = $(LDADDS)
|
|||||||
|
|
||||||
statstest_SOURCES = \
|
statstest_SOURCES = \
|
||||||
statstest.c testutils.h testutils.c
|
statstest.c testutils.h testutils.c
|
||||||
statstest_LDADD = ../src/libvirt_driver_xen.la $(LDADDS)
|
statstest_LDADD = $(xen_LDADDS)
|
||||||
|
|
||||||
else
|
else
|
||||||
EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
|
EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
|
||||||
@ -293,41 +287,41 @@ endif
|
|||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
|
|
||||||
qemu_LDADDS = ../src/libvirt_driver_qemu.la
|
qemu_LDADDS = ../src/libvirt_driver_qemu.la
|
||||||
|
|
||||||
if WITH_NETWORK
|
if WITH_NETWORK
|
||||||
qemu_LDADDS += ../src/libvirt_driver_network.la
|
qemu_LDADDS += ../src/libvirt_driver_network.la
|
||||||
endif
|
endif
|
||||||
|
qemu_LDADDS += $(LDADDS)
|
||||||
|
|
||||||
qemuxml2argvtest_SOURCES = \
|
qemuxml2argvtest_SOURCES = \
|
||||||
qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \
|
qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LDADDS)
|
qemuxml2argvtest_LDADD = $(qemu_LDADDS)
|
||||||
|
|
||||||
qemuxml2xmltest_SOURCES = \
|
qemuxml2xmltest_SOURCES = \
|
||||||
qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
qemuxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
|
qemuxml2xmltest_LDADD = $(qemu_LDADDS)
|
||||||
|
|
||||||
qemuxmlnstest_SOURCES = \
|
qemuxmlnstest_SOURCES = \
|
||||||
qemuxmlnstest.c testutilsqemu.c testutilsqemu.h \
|
qemuxmlnstest.c testutilsqemu.c testutilsqemu.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
qemuxmlnstest_LDADD = $(qemu_LDADDS) $(LDADDS)
|
qemuxmlnstest_LDADD = $(qemu_LDADDS)
|
||||||
|
|
||||||
qemuargv2xmltest_SOURCES = \
|
qemuargv2xmltest_SOURCES = \
|
||||||
qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \
|
qemuargv2xmltest.c testutilsqemu.c testutilsqemu.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
|
qemuargv2xmltest_LDADD = $(qemu_LDADDS)
|
||||||
|
|
||||||
qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h
|
qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h
|
||||||
qemuhelptest_LDADD = $(qemu_LDADDS) $(LDADDS)
|
qemuhelptest_LDADD = $(qemu_LDADDS)
|
||||||
|
|
||||||
qemumonitortest_SOURCES = qemumonitortest.c testutils.c testutils.h
|
qemumonitortest_SOURCES = qemumonitortest.c testutils.c testutils.h
|
||||||
qemumonitortest_LDADD = $(qemu_LDADDS) $(LDADDS)
|
qemumonitortest_LDADD = $(qemu_LDADDS)
|
||||||
|
|
||||||
domainsnapshotxml2xmltest_SOURCES = \
|
domainsnapshotxml2xmltest_SOURCES = \
|
||||||
domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
|
domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS)
|
||||||
else
|
else
|
||||||
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \
|
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \
|
||||||
qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \
|
qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \
|
||||||
@ -337,11 +331,15 @@ endif
|
|||||||
if WITH_LXC
|
if WITH_LXC
|
||||||
|
|
||||||
lxc_LDADDS = ../src/libvirt_driver_lxc.la
|
lxc_LDADDS = ../src/libvirt_driver_lxc.la
|
||||||
|
if WITH_NETWORK
|
||||||
|
lxc_LDADDS += ../src/libvirt_driver_network.la
|
||||||
|
endif
|
||||||
|
lxc_LDADDS += $(LDADDS)
|
||||||
|
|
||||||
lxcxml2xmltest_SOURCES = \
|
lxcxml2xmltest_SOURCES = \
|
||||||
lxcxml2xmltest.c testutilslxc.c testutilslxc.h \
|
lxcxml2xmltest.c testutilslxc.c testutilslxc.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
lxcxml2xmltest_LDADD = $(lxc_LDADDS) $(LDADDS)
|
lxcxml2xmltest_LDADD = $(lxc_LDADDS)
|
||||||
else
|
else
|
||||||
EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h
|
EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h
|
||||||
endif
|
endif
|
||||||
@ -350,7 +348,7 @@ if WITH_OPENVZ
|
|||||||
openvzutilstest_SOURCES = \
|
openvzutilstest_SOURCES = \
|
||||||
openvzutilstest.c \
|
openvzutilstest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
openvzutilstest_LDADD = ../src/libvirt_driver_openvz.la $(LDADDS)
|
openvzutilstest_LDADD = $(LDADDS)
|
||||||
else
|
else
|
||||||
EXTRA_DIST += openvzutilstest.c
|
EXTRA_DIST += openvzutilstest.c
|
||||||
endif
|
endif
|
||||||
@ -360,7 +358,7 @@ if WITH_ESX
|
|||||||
esxutilstest_SOURCES = \
|
esxutilstest_SOURCES = \
|
||||||
esxutilstest.c \
|
esxutilstest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
esxutilstest_LDADD = ../src/libvirt_driver_esx.la $(LDADDS)
|
esxutilstest_LDADD = $(LDADDS)
|
||||||
else
|
else
|
||||||
EXTRA_DIST += esxutilstest.c
|
EXTRA_DIST += esxutilstest.c
|
||||||
endif
|
endif
|
||||||
@ -369,12 +367,12 @@ if WITH_VMX
|
|||||||
vmx2xmltest_SOURCES = \
|
vmx2xmltest_SOURCES = \
|
||||||
vmx2xmltest.c \
|
vmx2xmltest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
vmx2xmltest_LDADD = ../src/libvirt_vmx.la $(LDADDS)
|
vmx2xmltest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
xml2vmxtest_SOURCES = \
|
xml2vmxtest_SOURCES = \
|
||||||
xml2vmxtest.c \
|
xml2vmxtest.c \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
xml2vmxtest_LDADD = ../src/libvirt_vmx.la $(LDADDS)
|
xml2vmxtest_LDADD = $(LDADDS)
|
||||||
else
|
else
|
||||||
EXTRA_DIST += vmx2xmltest.c xml2vmxtest.c
|
EXTRA_DIST += vmx2xmltest.c xml2vmxtest.c
|
||||||
endif
|
endif
|
||||||
@ -445,6 +443,7 @@ commandhelper_SOURCES = \
|
|||||||
commandhelper.c
|
commandhelper.c
|
||||||
commandhelper_CFLAGS = -Dabs_builddir="\"`pwd`\"" $(AM_CFLAGS)
|
commandhelper_CFLAGS = -Dabs_builddir="\"`pwd`\"" $(AM_CFLAGS)
|
||||||
commandhelper_LDADD = $(LDADDS)
|
commandhelper_LDADD = $(LDADDS)
|
||||||
|
commandhelper_LDFLAGS = -static
|
||||||
|
|
||||||
if WITH_LIBVIRTD
|
if WITH_LIBVIRTD
|
||||||
libvirtdconftest_SOURCES = \
|
libvirtdconftest_SOURCES = \
|
||||||
@ -460,17 +459,17 @@ virnetmessagetest_SOURCES = \
|
|||||||
virnetmessagetest.c testutils.h testutils.c
|
virnetmessagetest.c testutils.h testutils.c
|
||||||
virnetmessagetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" \
|
virnetmessagetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" \
|
||||||
$(XDR_CFLAGS) $(AM_CFLAGS)
|
$(XDR_CFLAGS) $(AM_CFLAGS)
|
||||||
virnetmessagetest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
virnetmessagetest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
virnetsockettest_SOURCES = \
|
virnetsockettest_SOURCES = \
|
||||||
virnetsockettest.c testutils.h testutils.c
|
virnetsockettest.c testutils.h testutils.c
|
||||||
virnetsockettest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
virnetsockettest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
||||||
virnetsockettest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
virnetsockettest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
virnettlscontexttest_SOURCES = \
|
virnettlscontexttest_SOURCES = \
|
||||||
virnettlscontexttest.c testutils.h testutils.c
|
virnettlscontexttest.c testutils.h testutils.c
|
||||||
virnettlscontexttest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
virnettlscontexttest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
||||||
virnettlscontexttest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
virnettlscontexttest_LDADD = $(LDADDS)
|
||||||
if HAVE_LIBTASN1
|
if HAVE_LIBTASN1
|
||||||
virnettlscontexttest_SOURCES += pkix_asn1_tab.c
|
virnettlscontexttest_SOURCES += pkix_asn1_tab.c
|
||||||
virnettlscontexttest_LDADD += -ltasn1
|
virnettlscontexttest_LDADD += -ltasn1
|
||||||
@ -481,26 +480,26 @@ endif
|
|||||||
virtimetest_SOURCES = \
|
virtimetest_SOURCES = \
|
||||||
virtimetest.c testutils.h testutils.c
|
virtimetest.c testutils.h testutils.c
|
||||||
virtimetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
virtimetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
||||||
virtimetest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
virtimetest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
viruritest_SOURCES = \
|
viruritest_SOURCES = \
|
||||||
viruritest.c testutils.h testutils.c
|
viruritest.c testutils.h testutils.c
|
||||||
viruritest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
viruritest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
||||||
viruritest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
viruritest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
virkeyfiletest_SOURCES = \
|
virkeyfiletest_SOURCES = \
|
||||||
virkeyfiletest.c testutils.h testutils.c
|
virkeyfiletest.c testutils.h testutils.c
|
||||||
virkeyfiletest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
virkeyfiletest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
||||||
virkeyfiletest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
virkeyfiletest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
virauthconfigtest_SOURCES = \
|
virauthconfigtest_SOURCES = \
|
||||||
virauthconfigtest.c testutils.h testutils.c
|
virauthconfigtest.c testutils.h testutils.c
|
||||||
virauthconfigtest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
virauthconfigtest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
|
||||||
virauthconfigtest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
|
virauthconfigtest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
seclabeltest_SOURCES = \
|
seclabeltest_SOURCES = \
|
||||||
seclabeltest.c
|
seclabeltest.c
|
||||||
seclabeltest_LDADD = ../src/libvirt_driver_security.la $(LDADDS)
|
seclabeltest_LDADD = $(LDADDS)
|
||||||
|
|
||||||
virbuftest_SOURCES = \
|
virbuftest_SOURCES = \
|
||||||
virbuftest.c testutils.h testutils.c
|
virbuftest.c testutils.h testutils.c
|
||||||
|
Loading…
Reference in New Issue
Block a user