From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 18 Jun 2020 00:02:58 +0000 (+0200)
Subject: meson: tests: build fake ssh binary
X-Git-Tag: v6.7.0-rc1~321
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d8887fc8038b0ca90c61c0f114a1e7297ba7b38;p=thirdparty%2Flibvirt.git

meson: tests: build fake ssh binary

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 d33b51d7f3..1756bb45fb 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 fa116a0e24..d825526dc7 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,
+  ],
+)