Skip to content

Commit 39dd06d

Browse files
yuwatakeszybz
authored andcommitted
meson: build tests for nspawn even -Dnspawn= is disabled
Follow-up for d95818f. Fixes systemd#36880.
1 parent a30684b commit 39dd06d

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/nspawn/meson.build

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
22

3-
if conf.get('ENABLE_NSPAWN') != 1
4-
subdir_done()
5-
endif
6-
73
libnspawn_core_sources = files(
84
'nspawn-bind-user.c',
95
'nspawn-cgroup.c',
@@ -52,6 +48,7 @@ executables += [
5248
executable_template + {
5349
'name' : 'systemd-nspawn',
5450
'public' : true,
51+
'conditions' : ['ENABLE_NSPAWN'],
5552
'sources' : files('nspawn.c'),
5653
'link_with' : nspawn_libs,
5754
'dependencies' : [

test/fuzz/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ sanitize_address_undefined = custom_target(
6060
'fuzzers',
6161
' '.join(fuzz_c_args + '-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION'),
6262
' '.join(fuzz_cpp_args + '-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION'),
63-
'-Dfuzz-tests=true -Db_lundef=false -Db_sanitize=address,undefined -Dnspawn=enabled --optimization=@0@ @1@ --auto-features=@2@'.format(
63+
'-Dfuzz-tests=true -Db_lundef=false -Db_sanitize=address,undefined --optimization=@0@ @1@ --auto-features=@2@'.format(
6464
get_option('optimization'),
6565
get_option('werror') ? '--werror' : '',
6666
sanitize_auto_features

0 commit comments

Comments
 (0)