meson: tests: build shared libraries

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-07-27 11:16:34 +02:00
parent affd500895
commit 096c1bbf2a
2 changed files with 14 additions and 20 deletions

View File

@ -16,13 +16,6 @@
## License along with this library. If not, see
## <http://www.gnu.org/licenses/>.
DRIVERLIB_LDFLAGS = \
-avoid-version \
-rpath /evil/libtool/hack/to/force/shared/lib/creation \
$(MINGW_EXTRA_LDFLAGS) \
$(FLAT_NAMESPACE_FLAGS) \
$(NULL)
PROBES_O =
if WITH_DTRACE_PROBES
PROBES_O += ../src/libvirt_probes.lo
@ -115,7 +108,6 @@ endif WITH_SECDRIVER_SELINUX
if WITH_LIBXL
test_programs += xlconfigtest \
xmconfigtest libxlxml2domconfigtest
test_libraries += libxltestdriver.la
endif WITH_LIBXL
if WITH_QEMU
@ -132,9 +124,6 @@ test_programs += qemuxml2argvtest qemuxml2xmltest \
qemuvhostusertest \
$(NULL)
test_helpers += qemucapsprobe
test_libraries += \
libqemutestdriver.la \
$(NULL)
endif WITH_QEMU
if WITH_LXC
@ -290,7 +279,6 @@ file-access-clean:
endif WITH_LINUX
noinst_PROGRAMS = $(test_programs) $(test_helpers)
noinst_LTLIBRARIES = $(test_libraries)
TESTS = $(test_programs) \
$(test_scripts)
@ -312,10 +300,6 @@ libxl_LDADDS = \
$(LDADDS) \
$(NULL)
libxltestdriver_la_SOURCES =
libxltestdriver_la_LDFLAGS = $(DRIVERLIB_LDFLAGS)
libxltestdriver_la_LIBADD = $(libxl_LDADDS)
xlconfigtest_SOURCES = \
xlconfigtest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
@ -343,10 +327,6 @@ qemu_LDADDS += ../src/libvirt_qemu_probes.lo
endif WITH_DTRACE_PROBES
qemu_LDADDS += $(LDADDS)
libqemutestdriver_la_SOURCES =
libqemutestdriver_la_LDFLAGS = $(DRIVERLIB_LDFLAGS)
libqemutestdriver_la_LIBADD = $(qemu_LDADDS)
qemuxml2argvtest_SOURCES = \
qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \
testutils.c testutils.h \

View File

@ -149,8 +149,14 @@ if conf.has('WITH_LIBXL')
dependencies: [ tests_dep ],
)
test_xen_driver_lib = shared_library(
'test_xen_driver',
link_whole: [ libxl_driver_imp ],
link_with: [ libvirt_lib ],
)
else
test_utils_xen_lib = []
test_xen_driver_lib = []
endif
if conf.has('WITH_LXC')
@ -175,7 +181,15 @@ if conf.has('WITH_QEMU')
[ 'qemumonitortestutils.c', 'testutilsqemuschema.c' ],
dependencies: [ tests_dep ],
)
test_qemu_driver_lib = shared_library(
'test_qemu_driver',
[ qemu_dtrace_gen_objects ],
link_whole: [ qemu_driver_impl ],
link_with: [ libvirt_lib ],
)
else
test_qemu_driver_lib = []
test_utils_qemu_lib = []
test_utils_qemu_monitor_lib = []
endif