mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: enable several tests even if the relevant features are disabled

Browse Source
This commit is contained in:
Yu Watanabe 2021-01-04 20:00:10 +09:00
parent a28c0617de
commit b09f01463a
6 changed files with 88 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/coredump/meson.build
View File

@ -23,5 +23,5 @@ tests += [
[['src/coredump/test-coredump-vacuum.c',
'src/coredump/coredump-vacuum.c',
'src/coredump/coredump-vacuum.h'],
[], [], [], 'ENABLE_COREDUMP', 'manual'],
[], [], [], '', 'manual'],
]

3
src/machine/meson.build
View File

@ -39,6 +39,5 @@ tests += [
[['src/machine/test-machine-tables.c'],
[libmachine_core,
libshared],
[threads],
[], 'ENABLE_MACHINED'],
[threads]],
]

152
src/network/meson.build
View File

@ -181,44 +181,41 @@ network_generator_sources = files('''
generator/network-generator.h
'''.split())
sources += custom_target(
'networkd-gperf.c',
input : 'networkd-gperf.gperf',
output : 'networkd-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
sources += custom_target(
'networkd-network-gperf.c',
input : 'networkd-network-gperf.gperf',
output : 'networkd-network-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
sources += custom_target(
'netdev-gperf.c',
input : 'netdev/netdev-gperf.gperf',
output : 'netdev-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
if get_option('link-networkd-shared')
networkd_link_with = [libshared]
else
networkd_link_with = [libsystemd_static,
libshared_static,
libbasic_gcrypt]
endif
network_include_dir = [includes, include_directories(['.', 'netdev', 'tc'])]
libnetworkd_core = static_library(
'networkd-core',
sources,
include_directories : network_include_dir,
link_with : [networkd_link_with])
if conf.get('ENABLE_NETWORKD') == 1
if get_option('link-networkd-shared')
networkd_link_with = [libshared]
else
networkd_link_with = [libsystemd_static,
libshared_static,
libbasic_gcrypt]
endif
networkd_gperf_c = custom_target(
'networkd-gperf.c',
input : 'networkd-gperf.gperf',
output : 'networkd-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
networkd_network_gperf_c = custom_target(
'networkd-network-gperf.c',
input : 'networkd-network-gperf.gperf',
output : 'networkd-network-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
netdev_gperf_c = custom_target(
'netdev-gperf.c',
input : 'netdev/netdev-gperf.gperf',
output : 'netdev-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
libnetworkd_core = static_library(
'networkd-core',
sources,
networkd_gperf_c,
networkd_network_gperf_c,
netdev_gperf_c,
include_directories : network_include_dir,
link_with : [networkd_link_with])
install_data('org.freedesktop.network1.conf',
install_dir : dbuspolicydir)
install_data('org.freedesktop.network1.service',
@ -238,49 +235,44 @@ if conf.get('ENABLE_NETWORKD') == 1
install_data('networkd.conf',
install_dir : pkgsysconfdir)
endif
fuzzers += [
[['src/network/fuzz-netdev-parser.c',
'src/fuzz/fuzz.h'],
[libnetworkd_core,
libsystemd_network,
networkd_link_with],
[threads],
network_include_dir],
[['src/network/fuzz-network-parser.c',
'src/fuzz/fuzz.h'],
[libnetworkd_core,
libsystemd_network,
networkd_link_with],
[threads],
network_include_dir],
]
tests += [
[['src/network/test-networkd-conf.c'],
[libnetworkd_core,
libsystemd_network],
[],
network_include_dir],
[['src/network/test-network.c'],
[libnetworkd_core,
libsystemd_network,
networkd_link_with],
[threads],
network_include_dir],
[['src/network/test-network-tables.c',
test_tables_h],
[libnetworkd_core,
libsystemd_network,
networkd_link_with],
[threads],
network_include_dir],
[['src/network/generator/test-network-generator.c',
'src/network/generator/network-generator.c',
'src/network/generator/network-generator.h']],
]
endif
fuzzers += [
[['src/network/fuzz-netdev-parser.c'],
[libnetworkd_core,
libsystemd_network,
networkd_link_with],
[threads],
network_include_dir],
[['src/network/fuzz-network-parser.c'],
[libnetworkd_core,
libsystemd_network,
networkd_link_with],
[threads],
network_include_dir],
]
tests += [
[['src/network/test-networkd-conf.c'],
[libnetworkd_core,
libsystemd_network],
[],
network_include_dir],
[['src/network/test-network.c'],
[libnetworkd_core,
libsystemd_network],
[threads],
network_include_dir],
[['src/network/test-network-tables.c'],
[libnetworkd_core,
libsystemd_network],
[threads],
network_include_dir],
[['src/network/generator/test-network-generator.c',
'src/network/generator/network-generator.c',
'src/network/generator/network-generator.h']],
]

12
src/oom/meson.build
View File

@ -15,12 +15,6 @@ oomctl_sources = files('''
'''.split())
if conf.get('ENABLE_OOMD') == 1
tests += [
[['src/oom/test-oomd-util.c',
'src/oom/oomd-util.c',
'src/oom/oomd-util.h']],
]
install_data('org.freedesktop.oom1.conf',
install_dir : dbuspolicydir)
@ -32,3 +26,9 @@ if conf.get('ENABLE_OOMD') == 1
install_dir : pkgsysconfdir)
endif
endif
tests += [
[['src/oom/test-oomd-util.c',
'src/oom/oomd-util.c',
'src/oom/oomd-util.h']],
]

20
src/resolve/meson.build
View File

@ -167,22 +167,19 @@ if conf.get('ENABLE_RESOLVE') == 1
endif
tests += [
[['src/resolve/test-resolve-tables.c',
'src/shared/test-tables.h'],
[['src/resolve/test-resolve-tables.c'],
[libsystemd_resolve_core,
libshared],
[libgcrypt,
libgpg_error,
libm],
[], 'ENABLE_RESOLVE'],
libm]],
[['src/resolve/test-dns-packet.c'],
[libsystemd_resolve_core,
libshared],
[libgcrypt,
libgpg_error,
libm],
[], 'ENABLE_RESOLVE'],
libm]],
[['src/resolve/test-resolved-etc-hosts.c',
'src/resolve/resolved-etc-hosts.c',
@ -191,26 +188,23 @@ tests += [
libshared],
[libgcrypt,
libgpg_error,
libm],
[], 'ENABLE_RESOLVE'],
libm]],
[['src/resolve/test-resolved-packet.c'],
[libsystemd_resolve_core,
libshared],
[libgcrypt,
libgpg_error,
libm],
[], 'ENABLE_RESOLVE'],
libm]],
[['src/resolve/test-dnssec.c'],
[libsystemd_resolve_core,
libshared],
[libgcrypt,
libgpg_error,
libm],
[], 'ENABLE_RESOLVE'],
libm]],
[['src/resolve/test-dnssec-complex.c',
'src/resolve/dns-type.c'],
[], [], [], 'ENABLE_RESOLVE', 'manual'],
[], [], [], '', 'manual'],
]

3
src/timesync/meson.build
View File

@ -50,6 +50,5 @@ tests += [
'src/timesync/timesyncd-server.h',
timesyncd_gperf_c],
[],
[libm],
[], 'ENABLE_TIMESYNCD'],
[libm]],
]