From 7cdd9783460b6cec5321ff2c1dd8f7148a82a19d Mon Sep 17 00:00:00 2001
From: Michael Biebl <mbiebl@gmail.com>
Date: Fri, 23 Jun 2017 03:23:30 +0200
Subject: [PATCH] meson: install manual and unsafe tests (#6178)

Always install all tests if install-tests is set to true, as they might
be useful for CI. This includes manual and unsafe tests. Install those
in subdirectories of /usr/lib/systemd/tests.

Fixes #6163.
---
 meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index cab08dc67d4..301c8a913dd 100644
--- a/meson.build
+++ b/meson.build
@@ -2219,8 +2219,6 @@ foreach tuple : tests
         endif
 
         if condition == '' or conf.get(condition, false)
-                install = install_tests and type == ''
-
                 exe = executable(
                         name,
                         sources,
@@ -2229,8 +2227,8 @@ foreach tuple : tests
                         dependencies : dependencies,
                         c_args : defs,
                         install_rpath : rootlibexecdir,
-                        install : install,
-                        install_dir : testsdir)
+                        install : install_tests,
+                        install_dir : join_paths(testsdir, type))
 
                 if type == 'manual'
                         message('@0@ is a manual test'.format(name))