Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
tests/Makefile.am | 48 -----------------------------------------------
tests/meson.build | 10 ++++++++++
2 files changed, 10 insertions(+), 48 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7b2cba16eff..83b8e979df4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -40,14 +40,6 @@ if WITH_STORAGE_SHEEPDOG
test_programs += storagebackendsheepdogtest
endif WITH_STORAGE_SHEEPDOG
-if WITH_STORAGE
-test_programs += storagevolxml2argvtest
-test_programs += storagepoolxml2argvtest
-test_programs += virstorageutiltest
-test_programs += storagepoolxml2xmltest
-test_programs += storagepoolcapstest
-endif WITH_STORAGE
-
if WITH_STORAGE_FS
test_programs += virstoragetest
endif WITH_STORAGE_FS
@@ -158,46 +150,6 @@ storagebackendsheepdogtest_LDADD = \
$(LDADDS)
endif ! WITH_STORAGE_SHEEPDOG
-if WITH_STORAGE
-virstorageutiltest_SOURCES = \
- virstorageutiltest.c \
- testutils.c \
- testutils.h \
- $(NULL)
-virstorageutiltest_LDADD = \
- ../src/libvirt_driver_storage_impl.la \
- $(LDADDS) \
- $(NULL)
-
-storagevolxml2argvtest_SOURCES = \
- storagevolxml2argvtest.c \
- testutils.c testutils.h
-storagevolxml2argvtest_LDADD = \
- $(LIBXML_LIBS) \
- ../src/libvirt_driver_storage_impl.la \
- ../src/libvirt.la \
- $(LDADDS)
-
-storagepoolxml2argvtest_SOURCES = \
- storagepoolxml2argvtest.c \
- testutils.c testutils.h
-storagepoolxml2argvtest_LDADD = \
- $(LIBXML_LIBS) \
- ../src/libvirt_driver_storage_impl.la \
- ../src/libvirt.la \
- $(LDADDS)
-
-storagepoolxml2xmltest_SOURCES = \
- storagepoolxml2xmltest.c \
- testutils.c testutils.h
-storagepoolxml2xmltest_LDADD = $(LDADDS) \
- ../src/libvirt_driver_storage_impl.la
-
-storagepoolcapstest_SOURCES = \
- storagepoolcapstest.c testutils.h testutils.c
-storagepoolcapstest_LDADD = $(LDADDS)
-endif ! WITH_STORAGE
-
virstoragetest_SOURCES = \
virstoragetest.c testutils.h testutils.c
virstoragetest_LDADD = $(LDADDS) \
diff --git a/tests/meson.build b/tests/meson.build
index 67b9cd11d1c..344df91a381 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -487,6 +487,16 @@ if conf.has('WITH_SECDRIVER_SELINUX')
endif
endif
+if conf.has('WITH_STORAGE')
+ tests += [
+ { 'name': 'storagepoolcapstest' },
+ { 'name': 'storagepoolxml2argvtest', 'link_with': [ storage_driver_impl_lib ] },
+ { 'name': 'storagepoolxml2xmltest', 'link_with': [ storage_driver_impl_lib ] },
+ { 'name': 'storagevolxml2argvtest', 'link_with': [ storage_driver_impl_lib ] },
+ { 'name': 'virstorageutiltest', 'link_with': [ storage_driver_impl_lib ] },
+ ]
+endif
+
foreach data : tests
test_sources = '@0@.c'.format(data['name'])
test_bin = executable(
--
2.26.2
