shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

meson: move test or fuzzer definitions to relevant meson.build in subdirectories

Browse Source
This commit is contained in:
Yu Watanabe 2021-01-05 00:08:42 +09:00
parent b5c34d6bf1
commit e025c9dfe3
13 changed files with 342 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/analyze/meson.build
View File

@ -9,3 +9,13 @@ systemd_analyze_sources = files('''
analyze-security.c
analyze-security.h
'''.split())
tests += [
[['src/analyze/test-verify.c',
'src/analyze/analyze-verify.c',
'src/analyze/analyze-verify.h'],
[libcore,
libshared],
[],
core_includes],
]

9
src/core/meson.build
View File

@ -203,3 +203,12 @@ if install_sysconfdir
meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user')))
meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd')))
endif
############################################################
fuzzers += [
[['src/core/fuzz-unit-file.c'],
[libcore,
libshared],
[libmount]],
]

86
src/fuzz/meson.build
View File

@ -5,86 +5,12 @@ fuzzers += [
[['src/fuzz/fuzz-catalog.c']],
[['src/resolve/fuzz-dns-packet.c'],
[libsystemd_resolve_core,
libshared],
[libgcrypt,
libgpg_error,
libm]],
[['src/libsystemd-network/fuzz-dhcp6-client.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/fuzz-dhcp-server.c'],
[libsystemd_network,
libshared]],
[['src/libsystemd-network/fuzz-lldp.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/fuzz-ndisc-rs.c'],
[libshared,
libsystemd_network]],
[['src/fuzz/fuzz-json.c']],
[['src/fuzz/fuzz-varlink.c']],
[['src/core/fuzz-unit-file.c'],
[libcore,
libshared],
[libmount]],
[['src/journal/fuzz-journald-audit.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-kmsg.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-native.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-native-fd.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-stream.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-syslog.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal-remote/fuzz-journal-remote.c'],
[libsystemd_journal_remote,
libshared]],
[['src/fuzz/fuzz-udev-database.c']],
[['src/udev/fuzz-udev-rules.c'],
[libudevd_core,
libshared],
[threads,
libacl]],
[['src/fuzz/fuzz-compress.c']],
[['src/fuzz/fuzz-bus-label.c']],
@ -93,19 +19,7 @@ fuzzers += [
[['src/fuzz/fuzz-hostname-setup.c']],
[['src/nspawn/fuzz-nspawn-settings.c'],
[libshared,
libnspawn_core],
[libseccomp]],
[['src/nspawn/fuzz-nspawn-oci.c'],
[libshared,
libnspawn_core],
[libseccomp]],
[['src/fuzz/fuzz-calendarspec.c']],
[['src/fuzz/fuzz-time-util.c']],
[['src/udev/fuzz-udev-rule-parse-value.c']],
]

8
src/journal-remote/meson.build
View File

@ -74,3 +74,11 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
chmod 755 $DESTDIR/var/log/journal/remote || :''')
endif
endif
############################################################
fuzzers += [
[['src/journal-remote/fuzz-journal-remote.c'],
[libsystemd_journal_remote,
libshared]],
]

57
src/journal/meson.build
View File

@ -74,3 +74,60 @@ if get_option('create-log-dirs')
'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
endif
endif
############################################################
tests += [
[['src/journal/test-journal-syslog.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4,
libselinux]],
[['src/journal/test-journal-config.c'],
[libjournal_core,
libshared],
[libxz,
liblz4,
libselinux]],
]
fuzzers += [
[['src/journal/fuzz-journald-audit.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-kmsg.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-native.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-native-fd.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-stream.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
[['src/journal/fuzz-journald-syslog.c',
'src/journal/fuzz-journald.c'],
[libjournal_core,
libshared],
[libselinux]],
]

68
src/libsystemd-network/meson.build
View File

@ -49,3 +49,71 @@ libsystemd_network = static_library(
include_directories : includes)
libsystemd_network_includes = [includes, include_directories('.')]
############################################################
tests += [
[['src/libsystemd-network/test-dhcp-option.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-sd-dhcp-lease.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-dhcp-client.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-dhcp-server.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-ipv4ll.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-ipv4ll-manual.c'],
[libshared,
libsystemd_network],
[], [], '', 'manual'],
[['src/libsystemd-network/test-acd.c'],
[libshared,
libsystemd_network],
[], [], '', 'manual'],
[['src/libsystemd-network/test-ndisc-rs.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-ndisc-ra.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-dhcp6-client.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-lldp.c'],
[libshared,
libsystemd_network]],
]
fuzzers += [
[['src/libsystemd-network/fuzz-dhcp6-client.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/fuzz-dhcp-server.c'],
[libsystemd_network,
libshared]],
[['src/libsystemd-network/fuzz-lldp.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/fuzz-ndisc-rs.c'],
[libshared,
libsystemd_network]],
]

134
src/libsystemd/meson.build
View File

@ -177,3 +177,137 @@ configure_file(
output : 'libsystemd.pc',
configuration : substs,
install_dir : pkgconfiglibdir == 'no' ? '' : pkgconfiglibdir)
############################################################
tests += [
[['src/libsystemd/sd-journal/test-journal.c']],
[['src/libsystemd/sd-journal/test-journal-send.c']],
[['src/libsystemd/sd-journal/test-journal-match.c']],
[['src/libsystemd/sd-journal/test-journal-enum.c'],
[], [], [], '', 'timeout=360'],
[['src/libsystemd/sd-journal/test-journal-stream.c']],
[['src/libsystemd/sd-journal/test-journal-flush.c']],
[['src/libsystemd/sd-journal/test-journal-init.c']],
[['src/libsystemd/sd-journal/test-journal-verify.c']],
[['src/libsystemd/sd-journal/test-journal-interleaving.c']],
[['src/libsystemd/sd-journal/test-mmap-cache.c']],
[['src/libsystemd/sd-journal/test-catalog.c']],
[['src/libsystemd/sd-journal/test-compress.c'],
[],
[liblz4,
libzstd,
libxz]],
[['src/libsystemd/sd-journal/test-compress-benchmark.c'],
[],
[liblz4,
libzstd,
libxz],
[], '', 'timeout=90'],
[['src/libsystemd/sd-journal/test-audit-type.c']],
]
############################################################
tests += [
[['src/libsystemd/sd-bus/test-bus-address.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-marshal.c'],
[],
[threads,
libglib,
libgobject,
libgio,
libdbus]],
[['src/libsystemd/sd-bus/test-bus-signature.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-watch-bind.c'],
[],
[threads],
[], '', 'timeout=120'],
[['src/libsystemd/sd-bus/test-bus-chat.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-cleanup.c'],
[],
[threads,
libseccomp]],
[['src/libsystemd/sd-bus/test-bus-track.c'],
[],
[libseccomp]],
[['src/libsystemd/sd-bus/test-bus-server.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-objects.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-vtable.c',
'src/libsystemd/sd-bus/test-vtable-data.h']],
[['src/libsystemd/sd-bus/test-bus-gvariant.c'],
[],
[libglib,
libgobject,
libgio]],
[['src/libsystemd/sd-bus/test-bus-creds.c']],
[['src/libsystemd/sd-bus/test-bus-match.c']],
[['src/libsystemd/sd-bus/test-bus-benchmark.c'],
[],
[threads],
[], '', 'manual'],
[['src/libsystemd/sd-bus/test-bus-introspect.c',
'src/libsystemd/sd-bus/test-vtable-data.h']],
[['src/libsystemd/sd-event/test-event.c']],
[['src/libsystemd/sd-netlink/test-netlink.c']],
[['src/libsystemd/sd-resolve/test-resolve.c'],
[],
[threads],
[], '', 'timeout=120'],
[['src/libsystemd/sd-login/test-login.c']],
[['src/libsystemd/sd-device/test-sd-device.c']],
[['src/libsystemd/sd-device/test-sd-device-monitor.c']],
]
if cxx_cmd != ''
tests += [
[['src/libsystemd/sd-bus/test-bus-vtable-cc.cc']],
]
endif

8
src/libudev/meson.build
View File

@ -44,3 +44,11 @@ configure_file(
output : 'libudev.pc',
configuration : substs,
install_dir : pkgconfiglibdir == 'no' ? '' : pkgconfiglibdir)
############################################################
tests += [
[['src/libudev/test-libudev.c'],
[libshared,
libudev_static]],
]

14
src/login/meson.build
View File

@ -116,3 +116,17 @@ if conf.get('ENABLE_LOGIND') == 1
install : pamconfdir != 'no',
install_dir : pamconfdir)
endif
############################################################
tests += [
[['src/login/test-login-shared.c']],
[['src/login/test-inhibit.c'],
[], [], [], '', 'manual'],
[['src/login/test-login-tables.c'],
[liblogind_core,
libshared],
[threads]],
]

14
src/nspawn/meson.build
View File

@ -46,6 +46,8 @@ libnspawn_core = static_library(
systemd_nspawn_sources = files('nspawn.c')
############################################################
tests += [
[['src/nspawn/test-nspawn-tables.c'],
[libnspawn_core,
@ -58,3 +60,15 @@ tests += [
[libacl],
[], '', 'manual'],
]
fuzzers += [
[['src/nspawn/fuzz-nspawn-settings.c'],
[libshared,
libnspawn_core],
[libseccomp]],
[['src/nspawn/fuzz-nspawn-oci.c'],
[libshared,
libnspawn_core],
[libseccomp]],
]

11
src/resolve/meson.build
View File

@ -168,6 +168,8 @@ if conf.get('ENABLE_RESOLVE') == 1
install_dir : rootlibexecdir)
endif
############################################################
tests += [
[['src/resolve/test-resolve-tables.c'],
[libsystemd_resolve_core,
@ -210,3 +212,12 @@ tests += [
'src/resolve/dns-type.c'],
[], [], resolve_includes, '', 'manual'],
]
fuzzers += [
[['src/resolve/fuzz-dns-packet.c'],
[libsystemd_resolve_core,
libshared],
[libgcrypt,
libgpg_error,
libm]],
]

222
src/test/meson.build
View File

@ -518,10 +518,6 @@ tests += [
[['src/test/test-journal-importer.c']],
[['src/libudev/test-libudev.c'],
[libshared,
libudev_static]],
[['src/test/test-udev.c'],
[libudevd_core,
libshared],
@ -570,147 +566,9 @@ tests += [
# define some tests here, because the link_with deps were not defined earlier
tests += [
[['src/libsystemd/sd-journal/test-journal.c']],
[['src/libsystemd/sd-journal/test-journal-send.c']],
[['src/journal/test-journal-syslog.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4,
libselinux]],
[['src/libsystemd/sd-journal/test-journal-match.c']],
[['src/libsystemd/sd-journal/test-journal-enum.c'],
[], [], [], '', 'timeout=360'],
[['src/libsystemd/sd-journal/test-journal-stream.c']],
[['src/libsystemd/sd-journal/test-journal-flush.c']],
[['src/libsystemd/sd-journal/test-journal-init.c']],
[['src/journal/test-journal-config.c'],
[libjournal_core,
libshared],
[libxz,
liblz4,
libselinux]],
[['src/libsystemd/sd-journal/test-journal-verify.c']],
[['src/libsystemd/sd-journal/test-journal-interleaving.c']],
[['src/libsystemd/sd-journal/test-mmap-cache.c']],
[['src/libsystemd/sd-journal/test-catalog.c']],
[['src/libsystemd/sd-journal/test-compress.c'],
[],
[liblz4,
libzstd,
libxz]],
[['src/libsystemd/sd-journal/test-compress-benchmark.c'],
[],
[liblz4,
libzstd,
libxz],
[], '', 'timeout=90'],
[['src/libsystemd/sd-journal/test-audit-type.c']],
]
############################################################
tests += [
[['src/libsystemd/sd-bus/test-bus-address.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-marshal.c'],
[],
[threads,
libglib,
libgobject,
libgio,
libdbus]],
[['src/libsystemd/sd-bus/test-bus-signature.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-watch-bind.c'],
[],
[threads],
[], '', 'timeout=120'],
[['src/libsystemd/sd-bus/test-bus-chat.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-cleanup.c'],
[],
[threads,
libseccomp]],
[['src/libsystemd/sd-bus/test-bus-error.c'],
[libshared_static,
libsystemd_static],
[]],
[['src/libsystemd/sd-bus/test-bus-track.c'],
[],
[libseccomp]],
[['src/libsystemd/sd-bus/test-bus-server.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-objects.c'],
[],
[threads]],
[['src/libsystemd/sd-bus/test-bus-vtable.c',
'src/libsystemd/sd-bus/test-vtable-data.h']],
[['src/libsystemd/sd-bus/test-bus-gvariant.c'],
[],
[libglib,
libgobject,
libgio]],
[['src/libsystemd/sd-bus/test-bus-creds.c']],
[['src/libsystemd/sd-bus/test-bus-match.c']],
[['src/libsystemd/sd-bus/test-bus-benchmark.c'],
[],
[threads],
[], '', 'manual'],
[['src/libsystemd/sd-bus/test-bus-introspect.c',
'src/libsystemd/sd-bus/test-vtable-data.h']],
[['src/libsystemd/sd-event/test-event.c']],
[['src/libsystemd/sd-netlink/test-netlink.c']],
[['src/libsystemd/sd-resolve/test-resolve.c'],
[],
[threads],
[], '', 'timeout=120'],
[['src/libsystemd/sd-login/test-login.c']],
[['src/libsystemd/sd-device/test-sd-device.c']],
libsystemd_static]],
[['src/libsystemd/sd-device/test-sd-device-thread.c'],
[libsystemd],
@ -719,82 +577,4 @@ tests += [
[['src/libudev/test-udev-device-thread.c'],
[libudev],
[threads]],
[['src/libsystemd/sd-device/test-sd-device-monitor.c']],
]
if cxx_cmd != ''
tests += [
[['src/libsystemd/sd-bus/test-bus-vtable-cc.cc']],
]
endif
############################################################
tests += [
[['src/libsystemd-network/test-dhcp-option.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-sd-dhcp-lease.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-dhcp-client.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-dhcp-server.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-ipv4ll.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-ipv4ll-manual.c'],
[libshared,
libsystemd_network],
[], [], '', 'manual'],
[['src/libsystemd-network/test-acd.c'],
[libshared,
libsystemd_network],
[], [], '', 'manual'],
[['src/libsystemd-network/test-ndisc-rs.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-ndisc-ra.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-dhcp6-client.c'],
[libshared,
libsystemd_network]],
[['src/libsystemd-network/test-lldp.c'],
[libshared,
libsystemd_network]],
]
############################################################
tests += [
[['src/login/test-login-shared.c']],
[['src/analyze/test-verify.c', 'src/analyze/analyze-verify.c', 'src/analyze/analyze-verify.h'],
[libcore,
libshared],
[],
core_includes],
[['src/login/test-inhibit.c'],
[], [], [], '', 'manual'],
[['src/login/test-login-tables.c'],
[liblogind_core,
libshared],
[threads]],
]

8
src/udev/meson.build
View File

@ -180,6 +180,14 @@ fuzzers += [
libacl],
udev_includes],
[['src/udev/fuzz-udev-rules.c'],
[libudevd_core,
libshared],
[threads,
libacl]],
[['src/udev/fuzz-udev-rule-parse-value.c']],
[['src/udev/fido_id/fuzz-fido-id-desc.c',
'src/udev/fido_id/fido_id_desc.c']],
]