Merge a51875ad35 into edc49209f1

meson: build tests for nspawn even -Dnspawn= is disabled
Follow-up for d95818f522. Fixes #36880.
2025-04-18 06:28:01 +09:00 · 2025-04-16 23:46:35 +09:00
2 changed files with 2 additions and 5 deletions
--- 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' : [
--- 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
Author	SHA1	Message	Date
Yu Watanabe	aa8077b519	Merge `a51875ad35` into `edc49209f1`	2025-04-18 06:28:01 +09:00
Yu Watanabe	a51875ad35	meson: build tests for nspawn even -Dnspawn= is disabled Follow-up for `d95818f522`. Fixes #36880.	2025-04-16 23:46:35 +09:00