From a15711569ec22272b1426f15d35a702a7e591961 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Sun, 1 May 2022 10:03:21 +0200 Subject: [PATCH] meson: Get test binaries to match autotools MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- src/tests/meson.build | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/tests/meson.build b/src/tests/meson.build index aa419dd65..3154bb9c8 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -252,7 +252,7 @@ test_programs += executable( build_by_default: want_tests != false) test_programs += executable( - 'lxc-test-get-item', + 'lxc-test-get_item', files('get_item.c') + tests_common_sources, include_directories: tests_liblxc_includes, dependencies: liblxc_dep, @@ -284,7 +284,7 @@ test_programs += executable( build_by_default: want_tests != false) test_programs += executable( - 'lxc-test-lxc-test-utils', + 'lxc-test-utils', files('lxc-test-utils.c') + tests_common_sources, include_directories: tests_liblxc_includes, dependencies: liblxc_dep, @@ -292,7 +292,7 @@ test_programs += executable( build_by_default: want_tests != false) test_programs += executable( - 'lxc-test-lxc-raw-clone', + 'lxc-test-raw-clone', files('lxc_raw_clone.c') + tests_common_sources, include_directories: tests_liblxc_includes, dependencies: liblxc_dep, @@ -429,90 +429,126 @@ test_programs += executable( test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-apparmor-generated', output: 'lxc-test-apparmor-generated') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-apparmor-mount', output: 'lxc-test-apparmor-mount') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-automount', output: 'lxc-test-automount') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-autostart', output: 'lxc-test-autostart') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-checkpoint-restore', output: 'lxc-test-checkpoint-restore') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-cloneconfig', output: 'lxc-test-cloneconfig') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-createconfig', output: 'lxc-test-createconfig') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, 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, + install_dir: bindir, input: 'lxc-test-lxc-attach', output: 'lxc-test-lxc-attach') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-no-new-privs', output: 'lxc-test-no-new-privs') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-procsys', output: 'lxc-test-procsys') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-rootfs', output: 'lxc-test-rootfs') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-snapdeps', output: 'lxc-test-snapdeps') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-symlink', output: 'lxc-test-symlink') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-unpriv', output: 'lxc-test-unpriv') test_programs += configure_file( configuration: conf, + install: want_tests, + install_dir: bindir, input: 'lxc-test-usernic.in', output: 'lxc-test-usernic') test_programs += configure_file( configuration: dummy_config_data, + install: want_tests, + install_dir: bindir, input: 'lxc-test-usernsexec', output: 'lxc-test-usernsexec') -- 2.39.2