External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Avoid double linking some libraries

Browse Source 
The problem is, since 614581f32b domaincapstest is linked with
$(LDADDS) by default. Then, since 94e3f23e8a the test may be
conditionally linked with $(qemu_LDADDS) which already contains
$(LDADDS). And some linkers doesn't cope with this nicely:

  CCLD     domaincapstest
../src/libvirt_probes.o:(.probes+0x0): multiple definition of `libvirt_event_poll_add_handle_semaphore'
../src/libvirt_probes.o:(.probes+0x0): first defined here
../src/libvirt_probes.o:(.probes+0x2): multiple definition of `libvirt_event_poll_update_handle_semaphore'
../src/libvirt_probes.o:(.probes+0x2): first defined here
../src/libvirt_probes.o:(.probes+0x4): multiple definition of `libvirt_event_poll_remove_handle_semaphore'
../src/libvirt_probes.o:(.probes+0x4): first defined here
../src/libvirt_probes.o:(.probes+0x6): multiple definition of `libvirt_event_poll_dispatch_handle_semaphore'
../src/libvirt_probes.o:(.probes+0x6): first defined here

And so on.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2014-07-03 14:09:55 +02:00
parent 94e3f23e8a
commit fb8bc6becd
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/Makefile.am
View File

@ -509,12 +509,11 @@ endif WITH_STORAGE
if WITH_DTRACE_PROBES if WITH_DTRACE_PROBES
qemu_LDADDS += ../src/libvirt_qemu_probes.lo qemu_LDADDS += ../src/libvirt_qemu_probes.lo
endif WITH_DTRACE_PROBES endif WITH_DTRACE_PROBES
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) $(LIBXML_LIBS) qemuxml2argvtest_LDADD = $(qemu_LDADDS) $(LDADDS) $(LIBXML_LIBS)
qemuxml2argvmock_la_SOURCES = \ qemuxml2argvmock_la_SOURCES = \
qemuxml2argvmock.c qemuxml2argvmock.c
@ -525,62 +524,64 @@ qemuxml2argvmock_la_LDFLAGS = -module -avoid-version \
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) qemuxml2xmltest_LDADD = $(qemu_LDADDS) $(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) qemuxmlnstest_LDADD = $(qemu_LDADDS) $(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) qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h
qemuhelptest_LDADD = $(qemu_LDADDS) qemuhelptest_LDADD = $(qemu_LDADDS) $(LDADDS)
qemumonitortest_SOURCES = qemumonitortest.c testutils.c testutils.h qemumonitortest_SOURCES = qemumonitortest.c testutils.c testutils.h
qemumonitortest_LDADD = $(qemu_LDADDS) qemumonitortest_LDADD = $(qemu_LDADDS) $(LDADDS)
qemumonitorjsontest_SOURCES = \ qemumonitorjsontest_SOURCES = \
qemumonitorjsontest.c \ qemumonitorjsontest.c \
testutils.c testutils.h \ testutils.c testutils.h \
testutilsqemu.c testutilsqemu.h \ testutilsqemu.c testutilsqemu.h \
$(NULL) $(NULL)
qemumonitorjsontest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) qemumonitorjsontest_LDADD = libqemumonitortestutils.la \
$(qemu_LDADDS) $(LDADDS)
qemucapabilitiestest_SOURCES = \ qemucapabilitiestest_SOURCES = \
qemucapabilitiestest.c \ qemucapabilitiestest.c \
testutils.c testutils.h \ testutils.c testutils.h \
testutilsqemu.c testutilsqemu.h \ testutilsqemu.c testutilsqemu.h \
$(NULL) $(NULL)
qemucapabilitiestest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) qemucapabilitiestest_LDADD = libqemumonitortestutils.la \
$(qemu_LDADDS) $(LDADDS)
qemucaps2xmltest_SOURCES = \ qemucaps2xmltest_SOURCES = \
qemucaps2xmltest.c \ qemucaps2xmltest.c \
testutils.c testutils.h \ testutils.c testutils.h \
$(NULL) $(NULL)
qemucaps2xmltest_LDADD = $(qemu_LDADDS) qemucaps2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
qemuagenttest_SOURCES = \ qemuagenttest_SOURCES = \
qemuagenttest.c \ qemuagenttest.c \
testutils.c testutils.h \ testutils.c testutils.h \
testutilsqemu.c testutilsqemu.h \ testutilsqemu.c testutilsqemu.h \
$(NULL) $(NULL)
qemuagenttest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) qemuagenttest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) $(LDADDS)
qemuhotplugtest_SOURCES = \ qemuhotplugtest_SOURCES = \
qemuhotplugtest.c \ qemuhotplugtest.c \
testutils.c testutils.h \ testutils.c testutils.h \
testutilsqemu.c testutilsqemu.h \ testutilsqemu.c testutilsqemu.h \
$(NULL) $(NULL)
qemuhotplugtest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) qemuhotplugtest_LDADD = libqemumonitortestutils.la $(qemu_LDADDS) $(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) domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS)
else ! WITH_QEMU else ! WITH_QEMU
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 \
@ -837,7 +838,7 @@ domaincapstest_LDADD = $(LDADDS)
if WITH_QEMU if WITH_QEMU
domaincapstest_SOURCES += testutilsqemu.c testutilsqemu.h domaincapstest_SOURCES += testutilsqemu.c testutilsqemu.h
domaincapstest_LDADD += $(qemu_LDADDS) domaincapstest_LDADD += $(qemu_LDADDS) $(GNULIB_LIBS)
endif WITH_QEMU endif WITH_QEMU
if WITH_LIBVIRTD if WITH_LIBVIRTD
@ -1055,7 +1056,7 @@ if WITH_QEMU
securityselinuxlabeltest_SOURCES = \ securityselinuxlabeltest_SOURCES = \
securityselinuxlabeltest.c testutils.h testutils.c \ securityselinuxlabeltest.c testutils.h testutils.c \
testutilsqemu.h testutilsqemu.c testutilsqemu.h testutilsqemu.c
securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(SELINUX_LIBS) securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(LDADDS) $(SELINUX_LIBS)
securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \ securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \
../src/libvirt.la ../src/libvirt.la
endif WITH_QEMU endif WITH_QEMU