diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-01-05 00:08:42 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-01-19 07:06:32 +0900 |
commit | e025c9dfe36b54ce9df893c64689c5477a440fac (patch) | |
tree | 2a00d688c1429df5219f2d636314b66c778188a9 | |
parent | b5c34d6bf18b2b0433d28c8124eb75d64db6867a (diff) | |
download | systemd-e025c9dfe36b54ce9df893c64689c5477a440fac.tar.gz |
meson: move test or fuzzer definitions to relevant meson.build in subdirectories
-rw-r--r-- | src/analyze/meson.build | 10 | ||||
-rw-r--r-- | src/core/meson.build | 9 | ||||
-rw-r--r-- | src/fuzz/meson.build | 86 | ||||
-rw-r--r-- | src/journal-remote/meson.build | 8 | ||||
-rw-r--r-- | src/journal/meson.build | 57 | ||||
-rw-r--r-- | src/libsystemd-network/meson.build | 68 | ||||
-rw-r--r-- | src/libsystemd/meson.build | 134 | ||||
-rw-r--r-- | src/libudev/meson.build | 8 | ||||
-rw-r--r-- | src/login/meson.build | 14 | ||||
-rw-r--r-- | src/nspawn/meson.build | 14 | ||||
-rw-r--r-- | src/resolve/meson.build | 11 | ||||
-rw-r--r-- | src/test/meson.build | 222 | ||||
-rw-r--r-- | src/udev/meson.build | 8 |
13 files changed, 342 insertions, 307 deletions
diff --git a/src/analyze/meson.build b/src/analyze/meson.build index 9e4d95b036..f796629cc2 100644 --- a/src/analyze/meson.build +++ b/src/analyze/meson.build @@ -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], +] diff --git a/src/core/meson.build b/src/core/meson.build index a33b2d0ac9..edfc73e627 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -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]], +] diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build index 56a8b48c7a..96528a191d 100644 --- a/src/fuzz/meson.build +++ b/src/fuzz/meson.build @@ -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']], ] diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index 748dc23b83..c42d85bc4b 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -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]], +] diff --git a/src/journal/meson.build b/src/journal/meson.build index a36de18077..171e276736 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -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]], +] diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build index b36dc83d79..6bc4a3f54b 100644 --- a/src/libsystemd-network/meson.build +++ b/src/libsystemd-network/meson.build @@ -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]], +] diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index 42322bff2f..3843c2aae0 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -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 diff --git a/src/libudev/meson.build b/src/libudev/meson.build index 61153baffc..b3ffb8b10a 100644 --- a/src/libudev/meson.build +++ b/src/libudev/meson.build @@ -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]], +] diff --git a/src/login/meson.build b/src/login/meson.build index 22f9ce18d5..ca64492383 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -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]], +] diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build index 6206a2c08a..172ded43c1 100644 --- a/src/nspawn/meson.build +++ b/src/nspawn/meson.build @@ -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]], +] diff --git a/src/resolve/meson.build b/src/resolve/meson.build index 11c003a207..f34e7ac680 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -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]], +] diff --git a/src/test/meson.build b/src/test/meson.build index 6e64f6122a..81c1335045 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -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]], ] diff --git a/src/udev/meson.build b/src/udev/meson.build index 83f28eb3fc..68b4a67e94 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -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']], ] |