From 404991789b16586a9c3d4869b95e2e05edc9a2e5 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 27 Jul 2020 11:39:17 +0200 Subject: [PATCH] meson: tests: add storage_sheepdog specific tests Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 53c674301b..e2965b0697 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 @@ -132,16 +128,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 079f33b018..b41ddcab10 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -513,6 +513,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(