tests: stop static linking to libvirt code in tests

If we static link to libvirt_util.la then we can't override functions in
this file by simply implementing them in the test code. Any tests should
dynamic link to the main libvirt.la and ensure symbols are exported.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 8fe0bf936573a1ac7db554a98f2029c7b72296fe..0864de030bccc920721b507d53300a6f7be4fcc4 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -915,6 +915,8 @@ virDomainSnapshotDefFormat;
 virDomainSnapshotDefIsExternal;
 virDomainSnapshotDefNew;
 virDomainSnapshotDefParseString;
+virDomainSnapshotDiskDefFree;
+virDomainSnapshotDiskDefParseXML;
 virDomainSnapshotFormatConvertXMLFlags;
 virDomainSnapshotIsExternal;
 virDomainSnapshotLocationTypeFromString;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac4c0e1a3a812b29ff30ac84348b7dd1055bc561..cbe8e8622411ea95e23773acb7cc31a1148ce017 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -655,8 +655,7 @@ qemublocktest_SOURCES = \
        $(NULL)
 qemublocktest_LDADD = \
        libqemumonitortestutils.la \
-       ../src/libvirt_conf.la \
-       ../src/libvirt_util.la \
+       ../src/libvirt.la \
        $(qemu_LDADDS) \
        $(NULL)
 
@@ -930,8 +929,7 @@ storagevolxml2argvtest_SOURCES = \
 storagevolxml2argvtest_LDADD = \
        $(LIBXML_LIBS) \
        ../src/libvirt_driver_storage_impl.la \
-       ../src/libvirt_conf.la \
-       ../src/libvirt_util.la \
+       ../src/libvirt.la \
        $(LDADDS)
 
 storagepoolxml2argvtest_SOURCES = \
@@ -940,8 +938,7 @@ storagepoolxml2argvtest_SOURCES = \
 storagepoolxml2argvtest_LDADD = \
        $(LIBXML_LIBS) \
        ../src/libvirt_driver_storage_impl.la \
-       ../src/libvirt_conf.la \
-       ../src/libvirt_util.la \
+       ../src/libvirt.la \
        $(LDADDS)
 
 storagepoolxml2xmltest_SOURCES = \
@@ -1141,8 +1138,6 @@ virstoragetest_SOURCES = \
        virstoragetest.c testutils.h testutils.c
 virstoragetest_LDADD = $(LDADDS) \
        ../src/libvirt.la \
-       ../src/libvirt_conf.la \
-       ../src/libvirt_util.la \
        ../src/libvirt_driver_storage_impl.la \
        ../gnulib/lib/libgnu.la \
        $(NULL)