On Thu, 2016-02-11 at 12:34 +0100, Andrea Bolognani wrote:
On Thu, 2016-02-11 at 11:17 +0000, Daniel P. Berrange wrote:
On Thu, Feb 11, 2016 at 12:15:39PM +0100, Andrea Bolognani wrote:
This patches make sure mock libraries do not link against either too many or too few libraries. Cheers. Andrea Bolognani (2): tests: Use plain close() in mock code tests: Link mock libraries against gnulib and gnulib only tests/Makefile.am | 21 +++++++++++++++------ tests/virportallocatortest.c | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) ACK Pushed, thanks.
Aaaaand the mingw build is now broken again: .../gnulib/lib/.libs/libgnu.a(bind.o): In function `rpl_bind': .../gnulib/lib/bind.c:33: multiple definition of `rpl_bind' .../tests/virportallocatormock.c:79: first defined here .../gnulib/lib/.libs/libgnu.a(socket.o): In function `rpl_socket': .../gnulib/lib/socket.c:33: multiple definition of `rpl_socket' .../tests/virportallocatormock.c:65: first defined here collect2: error: ld returned 1 exit status Makefile:4130: recipe for target 'virportallocatormock.la' failed Note that this is the most recent failure[1] so it refers to the new filename, but it looks like it started failing[2] as soon as this snippet was introduced: @@ -1025,7 +1031,7 @@ libvirportallocatormock_la_SOURCES = \ virportallocatortest.c libvirportallocatormock_la_CFLAGS = $(AM_CFLAGS) -DMOCK_HELPER=1 libvirportallocatormock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -libvirportallocatormock_la_LIBADD = ../src/libvirt.la +libvirportallocatormock_la_LIBADD = $(MOCKLIBS_LIBS) vircgrouptest_SOURCES = \ vircgrouptest.c testutils.h testutils.c IOW as soon as we started linking gnulib into virportallocatormock. Any ideas, Dan? Cheers. [1] https://ci.centos.org/view/libvirt-project/job/libvirt-mingw/1040/console [2] https://ci.centos.org/view/libvirt-project/job/libvirt-mingw/1038/console -- Andrea Bolognani Software Engineer - Virtualization Team