From 1d69c4f938c36017680312765e63b6ea2cb0ede2 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Tue, 2 Jun 2020 19:02:11 +0200 Subject: [PATCH] meson: tests: add storage_fs specific tests Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 97250ca627..53c674301b 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 @@ -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 ba97888961..079f33b018 100644 --- 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(