提交 1fbd80c4 编写于 作者: D Daniel P. Berrangé

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: NMichal Privoznik <mprivozn@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 4560013b
...@@ -915,6 +915,8 @@ virDomainSnapshotDefFormat; ...@@ -915,6 +915,8 @@ virDomainSnapshotDefFormat;
virDomainSnapshotDefIsExternal; virDomainSnapshotDefIsExternal;
virDomainSnapshotDefNew; virDomainSnapshotDefNew;
virDomainSnapshotDefParseString; virDomainSnapshotDefParseString;
virDomainSnapshotDiskDefFree;
virDomainSnapshotDiskDefParseXML;
virDomainSnapshotFormatConvertXMLFlags; virDomainSnapshotFormatConvertXMLFlags;
virDomainSnapshotIsExternal; virDomainSnapshotIsExternal;
virDomainSnapshotLocationTypeFromString; virDomainSnapshotLocationTypeFromString;
......
...@@ -655,8 +655,7 @@ qemublocktest_SOURCES = \ ...@@ -655,8 +655,7 @@ qemublocktest_SOURCES = \
$(NULL) $(NULL)
qemublocktest_LDADD = \ qemublocktest_LDADD = \
libqemumonitortestutils.la \ libqemumonitortestutils.la \
../src/libvirt_conf.la \ ../src/libvirt.la \
../src/libvirt_util.la \
$(qemu_LDADDS) \ $(qemu_LDADDS) \
$(NULL) $(NULL)
...@@ -930,8 +929,7 @@ storagevolxml2argvtest_SOURCES = \ ...@@ -930,8 +929,7 @@ storagevolxml2argvtest_SOURCES = \
storagevolxml2argvtest_LDADD = \ storagevolxml2argvtest_LDADD = \
$(LIBXML_LIBS) \ $(LIBXML_LIBS) \
../src/libvirt_driver_storage_impl.la \ ../src/libvirt_driver_storage_impl.la \
../src/libvirt_conf.la \ ../src/libvirt.la \
../src/libvirt_util.la \
$(LDADDS) $(LDADDS)
storagepoolxml2argvtest_SOURCES = \ storagepoolxml2argvtest_SOURCES = \
...@@ -940,8 +938,7 @@ storagepoolxml2argvtest_SOURCES = \ ...@@ -940,8 +938,7 @@ storagepoolxml2argvtest_SOURCES = \
storagepoolxml2argvtest_LDADD = \ storagepoolxml2argvtest_LDADD = \
$(LIBXML_LIBS) \ $(LIBXML_LIBS) \
../src/libvirt_driver_storage_impl.la \ ../src/libvirt_driver_storage_impl.la \
../src/libvirt_conf.la \ ../src/libvirt.la \
../src/libvirt_util.la \
$(LDADDS) $(LDADDS)
storagepoolxml2xmltest_SOURCES = \ storagepoolxml2xmltest_SOURCES = \
...@@ -1141,8 +1138,6 @@ virstoragetest_SOURCES = \ ...@@ -1141,8 +1138,6 @@ virstoragetest_SOURCES = \
virstoragetest.c testutils.h testutils.c virstoragetest.c testutils.h testutils.c
virstoragetest_LDADD = $(LDADDS) \ virstoragetest_LDADD = $(LDADDS) \
../src/libvirt.la \ ../src/libvirt.la \
../src/libvirt_conf.la \
../src/libvirt_util.la \
../src/libvirt_driver_storage_impl.la \ ../src/libvirt_driver_storage_impl.la \
../gnulib/lib/libgnu.la \ ../gnulib/lib/libgnu.la \
$(NULL) $(NULL)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册