[libvirt PATCH 304/351] meson: tests: add storage_sheepdog specific tests
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
tests/Makefile.am | 14 --------------
tests/meson.build | 6 ++++++
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4fb27e0b85d..b696d3434fe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,10 +36,6 @@ if WITH_YAJL
test_programs += virjsontest
endif WITH_YAJL
-if WITH_STORAGE_SHEEPDOG
-test_programs += storagebackendsheepdogtest
-endif WITH_STORAGE_SHEEPDOG
-
if WITH_NSS
test_helpers += nsslinktest nssguestlinktest
endif WITH_NSS
@@ -136,16 +132,6 @@ vmwarevertest_SOURCES = \
vmwarevertest_LDADD = $(LDADDS)
endif ! WITH_VMWARE
-if WITH_STORAGE_SHEEPDOG
-storagebackendsheepdogtest_SOURCES = \
- storagebackendsheepdogtest.c \
- testutils.c testutils.h
-storagebackendsheepdogtest_LDADD = \
- ../src/libvirt_storage_backend_sheepdog_priv.la \
- ../src/libvirt_driver_storage_impl.la \
- $(LDADDS)
-endif ! WITH_STORAGE_SHEEPDOG
-
if WITH_NSS
## Intentionaly not linking with anything else.
## See the test source for more detailed explanation.
diff --git a/tests/meson.build b/tests/meson.build
index b47580057ed..e9a6cd72cc7 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -503,6 +503,12 @@ if conf.has('WITH_STORAGE_FS')
]
endif
+if conf.has('WITH_STORAGE_SHEEPDOG')
+ tests += [
+ { 'name': 'storagebackendsheepdogtest', 'link_with': [
storage_driver_impl_lib, storage_backend_sheepdog_priv_lib ] },
+ ]
+endif
+
foreach data : tests
test_sources = '@0@.c'.format(data['name'])
test_bin = executable(
--
2.26.2