From aebfa97d5420e64b3bbf3092df763f6a52c59d1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 13 Jun 2023 10:01:52 +0200 Subject: [PATCH] meson: add conditionalization for test progs This just mirrors what the autotools setup is doing. (cherry picked from commit d6418774aba595c44fa6c68dd2da55cb6f7642dd) --- meson.build | 81 +++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/meson.build b/meson.build index 6097088d81..42ca4f4b62 100644 --- a/meson.build +++ b/meson.build @@ -2979,25 +2979,25 @@ exe = executable( include_directories : dir_include) exes += exe -# XXX: HAVE_OPENAT && HAVE_DIRFD -exe = executable( - 'test_procfs', - 'lib/procfs.c', - c_args : ['-DTEST_PROGRAM_PROCFS'], - include_directories : dir_include, - link_with : lib_common) -exes += exe +if conf.get('HAVE_OPENAT') != false and conf.get('HAVE_DIRFD') != false + exe = executable( + 'test_procfs', + 'lib/procfs.c', + c_args : ['-DTEST_PROGRAM_PROCFS'], + include_directories : dir_include, + link_with : lib_common) + exes += exe -# XXX: HAVE_OPENAT && HAVE_DIRFD -exe = executable( - 'test_path', - 'lib/path.c', - 'lib/fileutils.c', - have_cpu_set_t ? 'lib/cpuset.c' : [], - c_args : ['-DTEST_PROGRAM_PATH'], - include_directories : dir_include, - link_with : lib_common) -exes += exe + exe = executable( + 'test_path', + 'lib/path.c', + 'lib/fileutils.c', + have_cpu_set_t ? 'lib/cpuset.c' : [], + c_args : ['-DTEST_PROGRAM_PATH'], + include_directories : dir_include, + link_with : lib_common) + exes += exe +endif if conf.get('HAVE_PTY') != false exe = executable( @@ -3013,13 +3013,14 @@ if conf.get('HAVE_PTY') != false exes += exe endif -# XXX: LINUX -exe = executable( - 'test_cpuset', - 'lib/cpuset.c', - c_args : ['-DTEST_PROGRAM_CPUSET'], - include_directories : dir_include) -exes += exe +if LINUX + exe = executable( + 'test_cpuset', + 'lib/cpuset.c', + c_args : ['-DTEST_PROGRAM_CPUSET'], + include_directories : dir_include) + exes += exe +endif exe = executable( 'test_sysfs', @@ -3256,12 +3257,13 @@ exe = executable( include_directories : includes) exes += exe -# XXX: LINUX -exe = executable( - 'test_mkfds', - 'tests/helpers/test_mkfds.c', - include_directories : includes) -exes += exe +if LINUX + exe = executable( + 'test_mkfds', + 'tests/helpers/test_mkfds.c', + include_directories : includes) + exes += exe +endif exe = executable( 'test_enosys', @@ -3271,14 +3273,15 @@ exes += exe ############################################################ -# XXX: HAVE_OPENAT -exe = executable( - 'sample-scols-tree', - 'libsmartcols/samples/tree.c', - include_directories : includes, - link_with : [lib_smartcols, lib_common]) -if not is_disabler(exe) - exes += exe +if conf.get('HAVE_OPENAT') != false + exe = executable( + 'sample-scols-tree', + 'libsmartcols/samples/tree.c', + include_directories : includes, + link_with : [lib_smartcols, lib_common]) + if not is_disabler(exe) + exes += exe + endif endif exe = executable( -- 2.47.3