On 10.02.2016 17:12, Andrea Bolognani wrote:

Mock libraries are used with LD_PRELOAD from test binaries that are already linked against those libraries, so they will be able to resolve the symbols anyway. --- tests/Makefile.am | 6 ------ 1 file changed, 6 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am index c5986f0..fb862cd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -946,7 +946,6 @@ virnetserverclientmock_la_SOURCES = \ virnetserverclientmock.c virnetserverclientmock_la_CFLAGS = $(AM_CFLAGS) virnetserverclientmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -virnetserverclientmock_la_LIBADD = $(GNULIB_LIBS)

if WITH_GNUTLS virnettlscontexttest_SOURCES = \ @@ -1025,7 +1024,6 @@ libvirportallocatormock_la_SOURCES = \ virportallocatortest.c libvirportallocatormock_la_CFLAGS = $(AM_CFLAGS) -DMOCK_HELPER=1 libvirportallocatormock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -libvirportallocatormock_la_LIBADD = ../src/libvirt.la

vircgrouptest_SOURCES = \ vircgrouptest.c testutils.h testutils.c @@ -1051,8 +1049,6 @@ virpcitest_LDADD = $(LDADDS) virpcimock_la_SOURCES = \ virpcimock.c virpcimock_la_CFLAGS = $(AM_CFLAGS) -virpcimock_la_LIBADD = $(GNULIB_LIBS) \ - ../src/libvirt.la

I remember adding this for some reason. Unfortunately I can't recall why right now. Whatever. Your reasoning looks correct and that's what matters.

virpcimock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)

nodeinfomock_la_SOURCES = \ @@ -1068,8 +1064,6 @@ virnetdevtest_LDADD = $(LDADDS) virnetdevmock_la_SOURCES = \ virnetdevmock.c virnetdevmock_la_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS) -virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \ - ../src/libvirt.la virnetdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)

virrotatingfiletest_SOURCES = \

ACK Michal