Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
tests/Makefile.am | 11 -----------
tests/meson.build | 6 ++++++
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 83b8e979df4..4fb27e0b85d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -40,10 +40,6 @@ if WITH_STORAGE_SHEEPDOG
test_programs += storagebackendsheepdogtest
endif WITH_STORAGE_SHEEPDOG
-if WITH_STORAGE_FS
-test_programs += virstoragetest
-endif WITH_STORAGE_FS
-
if WITH_NSS
test_helpers += nsslinktest nssguestlinktest
endif WITH_NSS
@@ -150,13 +146,6 @@ storagebackendsheepdogtest_LDADD = \
$(LDADDS)
endif ! WITH_STORAGE_SHEEPDOG
-virstoragetest_SOURCES = \
- virstoragetest.c testutils.h testutils.c
-virstoragetest_LDADD = $(LDADDS) \
- ../src/libvirt.la \
- ../src/libvirt_driver_storage_impl.la \
- $(NULL)
-
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 344df91a381..b47580057ed 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -497,6 +497,12 @@ if conf.has('WITH_STORAGE')
]
endif
+if conf.has('WITH_STORAGE_FS')
+ tests += [
+ { 'name': 'virstoragetest', 'link_with': [ storage_driver_impl_lib ] },
+ ]
+endif
+
foreach data : tests
test_sources = '@0@.c'.format(data['name'])
test_bin = executable(
--
2.26.2
