[libvirt PATCH 282/351] meson: tests: build fake ssh binary

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:58:38 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 tests/Makefile.am |  5 -----
 tests/meson.build | 12 ++++++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index eaaae0c0568..5591c999f11 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -35,7 +35,6 @@ LDADDS = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-test_helpers = ssh
 test_programs = virshtest sockettest \
 	virhostcputest virbuftest \
 	commandtest seclabeltest \
@@ -113,10 +112,6 @@ endif WITH_QEMU
 endif WITH_ATTR
 endif WITH_SECDRIVER_SELINUX
 
-# This is a fake SSH we use from virnetsockettest
-ssh_SOURCES = ssh.c
-ssh_LDADD = $(COVERAGE_LDFLAGS)
-
 if WITH_LIBXL
 test_programs += xlconfigtest \
 	xmconfigtest libxlxml2domconfigtest
diff --git a/tests/meson.build b/tests/meson.build
index fa116a0e249..d825526dc78 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -187,3 +187,15 @@ executable(
     libvirt_no_indirect,
   ],
 )
+
+# This is a fake SSH we use from virnetsockettest
+executable(
+  'ssh',
+  [ 'ssh.c' ],
+  dependencies: [
+    tests_dep,
+  ],
+  link_args: [
+    coverage_flags,
+  ],
+)
-- 
2.26.2




More information about the libvir-list mailing list