From: Mike Gilbert <floppymaster@gmail.com>
Date: Sun, 8 Oct 2017 20:14:45 +0000 (-0400)
Subject: test: skip hwdb and sysv-generator if the features are disabled (#7026)
X-Git-Tag: v236~347
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e99c1ee825fc2ba451a3f0ddf5e922bd8bd43ad;p=thirdparty%2Fsystemd.git

test: skip hwdb and sysv-generator if the features are disabled (#7026)
---

diff --git a/test/meson.build b/test/meson.build
index 995a9717788..c2df7ec226b 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -163,9 +163,11 @@ endif
 
 ############################################################
 
-sysv_generator_test_py = find_program('sysv-generator-test.py')
-test('sysv-generator-test',
-     sysv_generator_test_py)
+if conf.get('HAVE_SYSV_COMPAT') == 1
+        sysv_generator_test_py = find_program('sysv-generator-test.py')
+        test('sysv-generator-test',
+             sysv_generator_test_py)
+endif
 
 ############################################################
 
@@ -181,6 +183,8 @@ udev_test_pl = find_program('udev-test.pl')
 test('udev-test',
      udev_test_pl)
 
-hwdb_test_sh = find_program('hwdb-test.sh')
-test('hwdb-test',
-     hwdb_test_sh)
+if conf.get('ENABLE_HWDB') == 1
+        hwdb_test_sh = find_program('hwdb-test.sh')
+        test('hwdb-test',
+             hwdb_test_sh)
+endif