From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 16 Apr 2025 14:43:33 +0000 (+0900)
Subject: meson: build tests for nspawn even -Dnspawn= is disabled
X-Git-Tag: v258-rc1~784
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39dd06dbc4feaf8a792ea6d2f5f51a2ae141968b;p=thirdparty%2Fsystemd.git

meson: build tests for nspawn even -Dnspawn= is disabled

Follow-up for d95818f5221d9b9b19648cffa0cb2407f023b27e.
Fixes #36880.
---

diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index d0c919e1e33..84e80d6e2db 100644
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-if conf.get('ENABLE_NSPAWN') != 1
-        subdir_done()
-endif
-
 libnspawn_core_sources = files(
         'nspawn-bind-user.c',
         'nspawn-cgroup.c',
@@ -52,6 +48,7 @@ executables += [
         executable_template + {
                 'name' : 'systemd-nspawn',
                 'public' : true,
+                'conditions' : ['ENABLE_NSPAWN'],
                 'sources' : files('nspawn.c'),
                 'link_with' : nspawn_libs,
                 'dependencies' : [
diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build
index 3f97e3fa6fb..db1dcb291c9 100644
--- a/test/fuzz/meson.build
+++ b/test/fuzz/meson.build
@@ -60,7 +60,7 @@ sanitize_address_undefined = custom_target(
                    'fuzzers',
                    ' '.join(fuzz_c_args + '-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION'),
                    ' '.join(fuzz_cpp_args + '-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION'),
-                   '-Dfuzz-tests=true -Db_lundef=false -Db_sanitize=address,undefined -Dnspawn=enabled --optimization=@0@ @1@ --auto-features=@2@'.format(
+                   '-Dfuzz-tests=true -Db_lundef=false -Db_sanitize=address,undefined --optimization=@0@ @1@ --auto-features=@2@'.format(
                            get_option('optimization'),
                            get_option('werror') ? '--werror' : '',
                            sanitize_auto_features