meson: tests: add storage_fs specific tests

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 97250ca6278e9ad378cc002a38581dbdf83ea997..53c674301b657e23e6a76b216051d5326e5a5e1a 100644 (file)
--- 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
@@ -146,13 +142,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 ba978889614b715194bdabceaa6d7704ea84dfc3..079f33b01862339919eb9e3e9ec86a6329871bca 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -507,6 +507,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(