Merge pull request #4135 from stgraber/meson

More meson fixes
This commit is contained in:
Christian Brauner 2022-06-07 23:51:34 +02:00 committed by GitHub
commit 099bd13ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 177 additions and 153 deletions

View File

@ -1,15 +1,16 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
hooks_include_directories = include_directories(
'../',
'../src/include')
hooks_unmount_namespace_sources = files('unmount-namespace.c')
if srcconf.get('IS_BIONIC') == 1 or srcconf.get('HAVE_HASMNTOPT') == 0 or srcconf.get('HAVE_SETMNTENT') == 0 or srcconf.get('HAVE_ENDMNTENT') == 0
hooks_unmount_namespace_sources += files(
'../src/include/lxcmntent.c',
'../src/include/lxcmntent.h')
endif
hook_programs += executable(
'unmount-namespace',
hooks_unmount_namespace_sources,
include_directories: hooks_include_directories,
include_directories: liblxc_includes,
install: true,
install_dir: join_paths(lxclibexec, 'hooks'))

View File

@ -28,6 +28,7 @@ version_data = configuration_data()
version_data.set('LXC_VERSION_MAJOR', '4')
version_data.set('LXC_VERSION_MINOR', '0')
version_data.set('LXC_VERSION_MICRO', '0')
version_data.set('LXC_VERSION_BETA', '')
version_data.set('LXC_ABI', liblxc_version)
version_data.set('LXC_DEVEL', '1')
version_data.set('LXC_VERSION', meson.project_version())
@ -126,9 +127,16 @@ else
distrosysconfdir = ''
endif
# Cross-compile on Android.
if host_machine.system() == 'android'
srcconf.set10('IS_BIONIC', true)
endif
# Custom configuration.
cgrouppattern = get_option('cgroup-pattern')
coverity = get_option('coverity-build')
init_script = get_option('init-script')
sanitize = get_option('b_sanitize')
want_examples = get_option('examples')
want_io_uring = get_option('io-uring-event-loop')
want_pam_cgroup = get_option('pam-cgroup')
@ -137,6 +145,9 @@ want_tests = get_option('tests')
want_tools = get_option('tools')
srcconf.set_quoted('DEFAULT_CGROUP_PATTERN', cgrouppattern)
if coverity
srcconf.set('ENABLE_COVERITY_BUILD', 1)
endif
dummy_config_data = configuration_data()
dummy_config_data.set_quoted('DUMMY_VARIABLE', '1')
@ -205,6 +216,8 @@ if want_io_uring
endif
srcconf.set10('HAVE_LIBURING', true)
else
srcconf.set10('HAVE_LIBURING', false)
endif
## Time EPOCH.
@ -214,10 +227,14 @@ git = find_program('git', required: false)
time_epoch = run_command(sh, '-c', 'echo "$SOURCE_DATE_EPOCH"', check: true).stdout().strip()
if time_epoch == '' and git.found() and run_command('test', '-e', '.git', check: false).returncode() == 0
# If we're in a git repository, use the creation time of the latest git tag.
latest_tag = run_command(git, 'describe', '--abbrev=0', '--tags', check: true).stdout().strip()
time_epoch = run_command(git, 'log', '--no-show-signature', '-1', '--format=%at', latest_tag, check: true).stdout()
else
# Fallback to current epoch.
latest_tag = run_command(git, 'describe', '--abbrev=0', '--tags', check: false).stdout().strip()
if latest_tag != ''
time_epoch = run_command(git, 'log', '--no-show-signature', '-1', '--format=%at', latest_tag, check: true).stdout()
endif
endif
# Fallback to current epoch.
if time_epoch == ''
time_epoch = run_command(date, '+%s', check: true).stdout()
endif
generate_date = run_command(date, '--utc', '--date=@' + time_epoch, '+%Y-%m-%d', check: true).stdout().strip()
@ -250,7 +267,7 @@ endif
threads = dependency('threads')
## Seccomp.
libseccomp = dependency('libseccomp')
libseccomp = dependency('libseccomp', required: false)
srcconf.set10('HAVE_SECCOMP', libseccomp.found())
pkgconfig_libs += libseccomp
if libseccomp.found()
@ -593,15 +610,13 @@ template_scripts = []
test_programs = []
# Includes.
basic_includes = include_directories(
liblxc_includes = include_directories(
'.',
'src',
'src/include')
liblxc_includes = [basic_includes, include_directories(
'src/include',
'src/lxc',
'src/lxc/cgroups',
'src/lxc/lsm',
'src/lxc/storage')]
'src/lxc/storage')
# Early sub-directories.
subdir('src/include')
@ -622,13 +637,18 @@ if want_io_uring
liblxc_dependencies += [liburing]
endif
liblxc_link_whole = []
if sanitize == 'none'
liblxc_link_whole = [liblxc_static]
endif
liblxc = shared_library(
'lxc',
version: liblxc_version,
include_directories: liblxc_includes,
link_args: ['-DPIC'],
c_args: ['-DPIC'],
link_whole: [liblxc_static],
link_whole: liblxc_link_whole,
dependencies: liblxc_dependencies,
install: true)
@ -677,8 +697,14 @@ install_emptydir(join_paths(localstatedir, 'cache', 'lxc'))
install_emptydir(join_paths(localstatedir, 'lib', 'lxc'))
# RPM spec file.
specconf = configuration_data()
specconf.set('LXC_VERSION_BASE', meson.project_version())
specconf.set('LXC_VERSION_BETA', version_data.get('LXC_VERSION_BETA'))
specconf.set('PACKAGE', meson.project_name())
specconf.set('LXC_DISTRO_SYSCONF', conf.get('LXC_DISTRO_SYSCONF'))
configure_file(
configuration: conf,
configuration: specconf,
input: 'lxc.spec.in',
output: 'lxc.spec',
install: false)

View File

@ -4,6 +4,9 @@
option('cgroup-pattern', type: 'string', value: '',
description: 'CGroup pattern')
option('coverity-build', type: 'boolean', value: 'true',
description: 'build for coverity')
option('examples', type: 'boolean', value: 'true',
description: 'build and install examples')

View File

@ -27,7 +27,7 @@ if srcconf.get('HAVE_GETGRGID_R') == 0
'getgrgid_r.h')
endif
if srcconf.get('HAVE_HASMNTOPT') == 0 or srcconf.get('HAVE_SETMNTENT') == 0 or srcconf.get('HAVE_ENDMNTENT') == 0
if srcconf.get('IS_BIONIC') == 1 or srcconf.get('HAVE_HASMNTOPT') == 0 or srcconf.get('HAVE_SETMNTENT') == 0 or srcconf.get('HAVE_ENDMNTENT') == 0
include_sources += files(
'lxcmntent.c',
'lxcmntent.h')
@ -56,3 +56,9 @@ if srcconf.get('HAVE_OPENPTY') == 0
'openpty.c',
'openpty.h')
endif
if srcconf.get('HAVE_PRLIMIT') == 0 and srcconf.get('HAVE_PRLIMIT64') == 1
include_sources += files(
'prlimit.c',
'prlimit.h')
endif

View File

@ -1,14 +1,5 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
cmd_liblxc_includes = include_directories(
'.',
'../',
'../cgroups',
'../lsm',
'../storage',
'../../include',
'../../../')
cmd_common_sources = files(
'../af_unix.c',
'../af_unix.h',
@ -43,7 +34,6 @@ cmd_common_sources = files(
'../lsm/lsm.c',
'../lsm/lsm.h',
'../lsm/nop.c',
'../lsm/selinux.c',
'../lxcseccomp.h',
'../lxclock.c',
'../lxclock.h',
@ -67,7 +57,6 @@ cmd_common_sources = files(
'../process_utils.h',
'../ringbuf.c',
'../ringbuf.h',
'../seccomp.c',
'../start.c',
'../start.h',
'../state.c',
@ -107,6 +96,14 @@ cmd_common_sources = files(
'../log.h',
'../log.c') + include_sources
if libseccomp.found()
cmd_common_sources += files('../seccomp.c')
endif
if libselinux.found()
cmd_common_sources += files('../lsm/selinux.c')
endif
cmd_lxc_init_sources = files(
'lxc_init.c',
'../af_unix.c',
@ -165,21 +162,23 @@ cmd_lxc_update_config = configure_file(
output: 'lxc-update-config')
install_data(join_paths(project_build_root, 'src/lxc/cmd/lxc-update-config'), install_dir: bindir)
cmd_programs += executable(
'init.lxc.static',
cmd_lxc_init_sources,
include_directories: cmd_liblxc_includes,
link_with: [liblxc_static],
link_args: ['-static'],
c_args: ['-DNO_LXC_CONF'],
dependencies: [libcap_static],
install_dir: sbindir,
install: true)
if sanitize == 'none'
cmd_programs += executable(
'init.lxc.static',
cmd_lxc_init_sources,
include_directories: liblxc_includes,
link_with: [liblxc_static],
link_args: ['-static'],
c_args: ['-DNO_LXC_CONF'],
dependencies: [libcap_static],
install_dir: sbindir,
install: true)
endif
cmd_programs += executable(
'init.lxc',
cmd_lxc_init_sources,
include_directories: cmd_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install_dir: sbindir,
install: true)
@ -187,7 +186,7 @@ cmd_programs += executable(
cmd_programs += executable(
'lxc-monitord',
cmd_lxc_monitord_sources,
include_directories: cmd_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true,
install_dir: lxclibexec)
@ -195,14 +194,15 @@ cmd_programs += executable(
cmd_programs += executable(
'lxc-user-nic',
cmd_lxc_user_nic_sources,
include_directories: cmd_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true,
install_mode: 'rwsr-xr-x', # 4755
install_dir: lxclibexec)
cmd_programs += executable(
'lxc-usernsexec',
cmd_lxc_usernsexec_sources,
include_directories: cmd_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)

View File

@ -36,7 +36,6 @@ liblxc_sources = files(
'lsm/lsm.c',
'lsm/lsm.h',
'lsm/nop.c',
'lsm/selinux.c',
'storage/btrfs.c',
'storage/btrfs.h',
'storage/dir.c',
@ -123,7 +122,6 @@ liblxc_sources = files(
'ringbuf.h',
'rtnl.c',
'rtnl.h',
'seccomp.c',
'start.c',
'start.h',
'state.c',
@ -141,13 +139,23 @@ liblxc_sources = files(
'uuid.c',
'uuid.h')
liblxc_static = static_library(
'lxc_static',
liblxc_sources + include_sources + netns_ifaddrs_sources,
install: false,
include_directories: liblxc_includes,
dependencies: [threads],
c_args: '-fvisibility=default')
if libseccomp.found()
liblxc_sources += files('seccomp.c')
endif
if libselinux.found()
liblxc_sources += files('lsm/selinux.c')
endif
if sanitize == 'none'
liblxc_static = static_library(
'lxc_static',
liblxc_sources + include_sources + netns_ifaddrs_sources,
install: true,
include_directories: liblxc_includes,
dependencies: [threads],
c_args: '-fvisibility=default')
endif
lxc_functions = configure_file(
configuration: conf,

View File

@ -1,12 +1,5 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
pam_cgfs_includes = include_directories(
'.',
'../',
'../cgroups',
'../../include',
'../../../')
pam_cgfs_sources = files(
'pam_cgfs.c',
'../file_utils.c',
@ -19,7 +12,7 @@ pam_cgfs_sources = files(
if want_pam_cgroup
pam_cgfs = shared_module(
'pam_cgfs',
include_directories: pam_cgfs_includes,
include_directories: liblxc_includes,
sources: pam_cgfs_sources,
dependencies: [pkgconfig_libs],
name_prefix: '',

View File

@ -16,7 +16,7 @@
#include "string_utils.h"
#include "syscall_wrappers.h"
#if IS_BIONIC
#if IS_BIONIC && !HAVE_FEXECVE
#include "fexecve.h"
#endif

View File

@ -1,14 +1,5 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
tools_liblxc_includes = include_directories(
'.',
'../',
'../cgroups',
'../lsm',
'../storage',
'../../include',
'../../../')
tools_common_sources = files(
'arguments.c',
'arguments.h',
@ -45,7 +36,6 @@ tools_common_sources = files(
'../lsm/lsm.c',
'../lsm/lsm.h',
'../lsm/nop.c',
'../lsm/selinux.c',
'../lxcseccomp.h',
'../lxclock.c',
'../lxclock.h',
@ -69,7 +59,6 @@ tools_common_sources = files(
'../process_utils.h',
'../ringbuf.c',
'../ringbuf.h',
'../seccomp.c',
'../start.c',
'../start.h',
'../state.c',
@ -109,6 +98,14 @@ tools_common_sources = files(
'../log.h',
'../log.c') + include_sources + netns_ifaddrs_sources
if libseccomp.found()
tools_common_sources += files('../seccomp.c')
endif
if libselinux.found()
tools_common_sources += files('../lsm/selinux.c')
endif
tools_lxc_attach_sources = files(
'lxc_attach.c') + tools_common_sources
@ -179,154 +176,154 @@ if want_tools
public_programs += executable(
'lxc-attach',
tools_lxc_attach_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-autostart',
tools_lxc_autostart_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-cgroup',
tools_lxc_cgroup_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-checkpoint',
tools_lxc_checkpoint_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-config',
tools_lxc_config_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-console',
tools_lxc_console_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-copy',
tools_lxc_copy_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-create',
tools_lxc_create_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-destroy',
tools_lxc_destroy_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-device',
tools_lxc_device_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-execute',
tools_lxc_execute_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-freeze',
tools_lxc_freeze_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-info',
tools_lxc_info_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-ls',
tools_lxc_ls_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-monitor',
tools_lxc_monitor_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-snapshot',
tools_lxc_snapshot_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-start',
tools_lxc_start_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-stop',
tools_lxc_stop_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-top',
tools_lxc_top_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-unfreeze',
tools_lxc_unfreeze_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-unshare',
tools_lxc_unshare_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
public_programs += executable(
'lxc-wait',
tools_lxc_wait_sources,
include_directories: tools_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: true)
endif

View File

@ -1,14 +1,5 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
tests_liblxc_includes = include_directories(
'.',
'../lxc/',
'../lxc/cgroups',
'../lxc/lsm',
'../lxc/storage',
'../include',
'../../')
tests_common_sources = files(
'../lxc/af_unix.c',
'../lxc/af_unix.h',
@ -43,7 +34,6 @@ tests_common_sources = files(
'../lxc/lsm/lsm.c',
'../lxc/lsm/lsm.h',
'../lxc/lsm/nop.c',
'../lxc/lsm/selinux.c',
'../lxc/lxcseccomp.h',
'../lxc/lxclock.c',
'../lxc/lxclock.h',
@ -67,7 +57,6 @@ tests_common_sources = files(
'../lxc/process_utils.h',
'../lxc/ringbuf.c',
'../lxc/ringbuf.h',
'../lxc/seccomp.c',
'../lxc/start.c',
'../lxc/start.h',
'../lxc/state.c',
@ -107,10 +96,18 @@ tests_common_sources = files(
'../lxc/log.h',
'../lxc/log.c') + include_sources + netns_ifaddrs_sources
if libseccomp.found()
tests_common_sources += files('../lxc/seccomp.c')
endif
if libselinux.found()
tests_common_sources += files('../lxc/lsm/selinux.c')
endif
test_programs += executable(
'lxc-test-arch-parse',
files('arch_parse.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -118,7 +115,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-apparmor',
files('aa.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -126,7 +123,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-api-reboot',
files('api_reboot.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -134,7 +131,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-attach',
files('attach.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -142,7 +139,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-basic',
files('basic.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -150,7 +147,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-capabilities',
files('capabilities.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -158,7 +155,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-cgpath',
files('cgpath.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -166,7 +163,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-clonetest',
files('clonetest.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -174,7 +171,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-concurrent',
files('concurrent.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -182,7 +179,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-config-jump-table',
files('config_jump_table.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -190,7 +187,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-console',
files('console.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -198,7 +195,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-console-log',
files('console_log.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -206,7 +203,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-containertests',
files('containertests.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -214,7 +211,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-createtest',
files('createtest.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -222,7 +219,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-criu-check-feature',
files('criu_check_feature.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -230,7 +227,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-cve-2019-5736',
files('cve-2019-5736.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -238,7 +235,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-destroytest',
files('destroytest.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -246,7 +243,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-device-add-remove',
files('device_add_remove.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -254,7 +251,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-get_item',
files('get_item.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -262,7 +259,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-getkeys',
files('getkeys.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -270,7 +267,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-list',
files('list.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -278,7 +275,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-locktests',
files('locktests.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -286,7 +283,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-utils',
files('lxc-test-utils.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -294,7 +291,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-raw-clone',
files('lxc_raw_clone.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -302,7 +299,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-lxcpath',
files('lxcpath.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -310,7 +307,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-may-control',
files('may_control.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -318,7 +315,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-mount-injection',
files('mount_injection.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -326,7 +323,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-parse-config-file',
files('parse_config_file.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -334,7 +331,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-proc-pid',
files('proc_pid.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -342,7 +339,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-reboot',
files('reboot.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -350,7 +347,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-rootfs-options',
files('rootfs_options.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -358,7 +355,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-saveconfig',
files('saveconfig.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -366,7 +363,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-share-ns',
files('share_ns.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -374,7 +371,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-shortlived',
files('shortlived.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -382,7 +379,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-shutdowntest',
files('shutdowntest.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -390,7 +387,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-snapshot',
files('snapshot.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -398,7 +395,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-startone',
files('startone.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -406,7 +403,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-state-server',
files('state_server.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -414,7 +411,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-sys-mixed',
files('sys_mixed.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -422,7 +419,7 @@ test_programs += executable(
test_programs += executable(
'lxc-test-sysctls',
files('sysctls.c') + tests_common_sources,
include_directories: tests_liblxc_includes,
include_directories: liblxc_includes,
dependencies: liblxc_dep,
install: want_tests,
build_by_default: want_tests != false)
@ -483,13 +480,6 @@ test_programs += configure_file(
input: 'lxc-test-exit-code',
output: 'lxc-test-exit-code')
test_programs += configure_file(
configuration: dummy_config_data,
install: want_tests,
install_dir: bindir,
input: 'lxc-test-fuzzers',
output: 'lxc-test-fuzzers')
test_programs += configure_file(
configuration: dummy_config_data,
install: want_tests,