system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 02:05:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

meson: make the second and third elements of tests or fuzzers optional

Browse source 
Then, we can shorten many test definitions.
This commit is contained in:
Yu Watanabe 2021-01-01 06:29:03 +09:00
parent 9aeec01e77
commit 5acb3cabd1
15 changed files with 225 additions and 560 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
meson.build
View file

@ -3411,13 +3411,13 @@ custom_target(
foreach tuple : tests
sources = tuple[0]
link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
dependencies = tuple[2]
condition = tuple.length() >= 4 ? tuple[3] : ''
type = tuple.length() >= 5 ? tuple[4] : ''
defs = tuple.length() >= 6 ? tuple[5] : []
incs = tuple.length() >= 7 ? tuple[6] : includes
parallel = tuple.length() >= 8 ? tuple[7] : true
link_with = tuple.length() > 1 and tuple[1].length() > 0 ? tuple[1] : [libshared]
dependencies = tuple.length() > 2 ? tuple[2] : []
incs = tuple.length() > 3 and tuple[3].length() > 0 ? tuple[3] : includes
condition = tuple.length() > 4 ? tuple[4] : ''
type = tuple.length() > 5 ? tuple[5] : ''
defs = tuple.length() > 6 ? tuple[6] : []
parallel = tuple.length() > 7 ? tuple[7] : true
timeout = 30
name = sources[0].split('/')[-1].split('.')[0]
@ -3512,10 +3512,10 @@ fuzzer_exes = []
foreach tuple : fuzzers
sources = tuple[0]
link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
dependencies = tuple[2]
defs = tuple.length() >= 4 ? tuple[3] : []
incs = tuple.length() >= 5 ? tuple[4] : includes
link_with = tuple.length() > 1 and tuple[1].length() > 0 ? tuple[1] : [libshared]
dependencies = tuple.length() > 2 ? tuple[2] : []
incs = tuple.length() > 3 and tuple[3].length() > 0 ? tuple[3] : includes
defs = tuple.length() > 4 ? tuple[4] : []
link_args = []
if want_ossfuzz

4
src/coredump/meson.build
View file

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

66
src/fuzz/meson.build
View file

@ -1,14 +1,11 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
fuzzers += [
[['src/fuzz/fuzz-bus-message.c'],
[libshared],
[]],
[['src/fuzz/fuzz-bus-message.c']],
[['src/fuzz/fuzz-catalog.c'],
[libjournal_core,
libshared],
[]],
libshared]],
[['src/fuzz/fuzz-dns-packet.c',
dns_type_headers],
@ -24,18 +21,15 @@ fuzzers += [
'src/libsystemd-network/dhcp6-internal.h',
'src/systemd/sd-dhcp6-client.h'],
[libshared,
libsystemd_network],
[]],
libsystemd_network]],
[['src/fuzz/fuzz-dhcp-server.c'],
[libsystemd_network,
libshared],
[]],
libshared]],
[['src/fuzz/fuzz-lldp.c'],
[libshared,
libsystemd_network],
[]],
libsystemd_network]],
[['src/fuzz/fuzz-ndisc-rs.c',
'src/libsystemd-network/dhcp-identifier.h',
@ -44,16 +38,11 @@ fuzzers += [
'src/systemd/sd-dhcp6-client.h',
'src/systemd/sd-ndisc.h'],
[libshared,
libsystemd_network],
[]],
libsystemd_network]],
[['src/fuzz/fuzz-json.c'],
[libshared],
[]],
[['src/fuzz/fuzz-json.c']],
[['src/fuzz/fuzz-varlink.c'],
[libshared],
[]],
[['src/fuzz/fuzz-varlink.c']],
[['src/fuzz/fuzz-unit-file.c'],
[libcore,
@ -98,12 +87,9 @@ fuzzers += [
[['src/fuzz/fuzz-journal-remote.c'],
[libsystemd_journal_remote,
libshared],
[]],
libshared]],
[['src/fuzz/fuzz-udev-database.c'],
[libshared],
[]],
[['src/fuzz/fuzz-udev-database.c']],
[['src/fuzz/fuzz-udev-rules.c'],
[libudevd_core,
@ -111,21 +97,13 @@ fuzzers += [
[threads,
libacl]],
[['src/fuzz/fuzz-compress.c'],
[libshared],
[]],
[['src/fuzz/fuzz-compress.c']],
[['src/fuzz/fuzz-bus-label.c'],
[libshared],
[]],
[['src/fuzz/fuzz-bus-label.c']],
[['src/fuzz/fuzz-env-file.c'],
[libshared],
[]],
[['src/fuzz/fuzz-env-file.c']],
[['src/fuzz/fuzz-hostname-setup.c'],
[libshared],
[]],
[['src/fuzz/fuzz-hostname-setup.c']],
[['src/fuzz/fuzz-nspawn-settings.c'],
[libshared,
@ -137,21 +115,13 @@ fuzzers += [
libnspawn_core],
[libseccomp]],
[['src/fuzz/fuzz-calendarspec.c'],
[libshared],
[]],
[['src/fuzz/fuzz-calendarspec.c']],
[['src/fuzz/fuzz-time-util.c'],
[libshared],
[]],
[['src/fuzz/fuzz-time-util.c']],
[['src/xdg-autostart-generator/fuzz-xdg-desktop.c',
'src/xdg-autostart-generator/xdg-autostart-service.h',
'src/xdg-autostart-generator/xdg-autostart-service.c'],
[],
[]],
'src/xdg-autostart-generator/xdg-autostart-service.c']],
[['src/fuzz/fuzz-udev-rule-parse-value.c'],
[libshared],
[]],
[['src/fuzz/fuzz-udev-rule-parse-value.c']],
]

4
src/import/meson.build
View file

@ -73,7 +73,7 @@ tests += [
[['src/import/test-qcow2.c',
'src/import/qcow2-util.c',
'src/import/qcow2-util.h'],
[libshared],
[],
[libz],
'HAVE_ZLIB', 'manual'],
[], 'HAVE_ZLIB', 'manual'],
]

4
src/locale/meson.build
View file

@ -32,7 +32,5 @@ endif
tests += [
[['src/locale/test-keymap-util.c',
'src/locale/keymap-util.c',
'src/locale/keymap-util.h'],
[libshared],
[]],
'src/locale/keymap-util.h']],
]

2
src/machine/meson.build
View file

@ -40,5 +40,5 @@ tests += [
[libmachine_core,
libshared],
[threads],
'ENABLE_MACHINED'],
[], 'ENABLE_MACHINED'],
]

14
src/network/meson.build
View file

@ -246,7 +246,6 @@ if conf.get('ENABLE_NETWORKD') == 1
libsystemd_network,
networkd_link_with],
[threads],
[],
network_include_dir],
[['src/network/fuzz-network-parser.c',
@ -255,7 +254,6 @@ if conf.get('ENABLE_NETWORKD') == 1
libsystemd_network,
networkd_link_with],
[threads],
[],
network_include_dir],
]
@ -263,14 +261,15 @@ if conf.get('ENABLE_NETWORKD') == 1
[['src/network/test-networkd-conf.c'],
[libnetworkd_core,
libsystemd_network],
[], '', '', [], network_include_dir],
[],
network_include_dir],
[['src/network/test-network.c'],
[libnetworkd_core,
libsystemd_network,
networkd_link_with],
[threads],
'', '', [], network_include_dir],
network_include_dir],
[['src/network/test-network-tables.c',
test_tables_h],
@ -278,13 +277,10 @@ if conf.get('ENABLE_NETWORKD') == 1
libsystemd_network,
networkd_link_with],
[threads],
'', '', [],
[network_include_dir]],
network_include_dir],
[['src/network/generator/test-network-generator.c',
'src/network/generator/network-generator.c',
'src/network/generator/network-generator.h'],
[networkd_link_with],
[], '', '', [], network_include_dir],
'src/network/generator/network-generator.h']],
]
endif

2
src/nspawn/meson.build
View file

@ -56,5 +56,5 @@ tests += [
[libnspawn_core,
libshared],
[libacl],
'', 'manual'],
[], '', 'manual'],
]

4
src/oom/meson.build
View file

@ -18,9 +18,7 @@ if conf.get('ENABLE_OOMD') == 1
tests += [
[['src/oom/test-oomd-util.c',
'src/oom/oomd-util.c',
'src/oom/oomd-util.h'],
[],
[]]
'src/oom/oomd-util.h']],
]
install_data('org.freedesktop.oom1.conf',

14
src/resolve/meson.build
View file

@ -187,7 +187,7 @@ tests += [
[libgcrypt,
libgpg_error,
libm],
'ENABLE_RESOLVE'],
[], 'ENABLE_RESOLVE'],
[['src/resolve/test-dns-packet.c',
dns_type_headers],
@ -196,7 +196,7 @@ tests += [
[libgcrypt,
libgpg_error,
libm],
'ENABLE_RESOLVE'],
[], 'ENABLE_RESOLVE'],
[['src/resolve/test-resolved-etc-hosts.c',
'src/resolve/resolved-etc-hosts.c',
@ -206,7 +206,7 @@ tests += [
[libgcrypt,
libgpg_error,
libm],
'ENABLE_RESOLVE'],
[], 'ENABLE_RESOLVE'],
[['src/resolve/test-resolved-packet.c',
dns_type_headers],
@ -215,7 +215,7 @@ tests += [
[libgcrypt,
libgpg_error,
libm],
'ENABLE_RESOLVE'],
[], 'ENABLE_RESOLVE'],
[['src/resolve/test-dnssec.c',
dns_type_headers],
@ -224,12 +224,10 @@ tests += [
[libgcrypt,
libgpg_error,
libm],
'ENABLE_RESOLVE'],
[], 'ENABLE_RESOLVE'],
[['src/resolve/test-dnssec-complex.c',
'src/resolve/dns-type.c',
dns_type_headers],
[],
[],
'ENABLE_RESOLVE', 'manual'],
[], [], [], 'ENABLE_RESOLVE', 'manual'],
]

2
src/shutdown/meson.build
View file

@ -8,6 +8,6 @@ tests += [
[['src/shutdown/test-umount.c',
'src/shutdown/umount.c',
'src/shutdown/umount.h'],
[libshared],
[],
[libmount]],
]

627
src/test/meson.build
View file

File diff suppressed because it is too large Load diff

4
src/timesync/meson.build
View file

@ -49,7 +49,7 @@ tests += [
'src/timesync/timesyncd-server.c',
'src/timesync/timesyncd-server.h',
timesyncd_gperf_c],
[libshared],
[],
[libm],
'ENABLE_TIMESYNCD'],
[], 'ENABLE_TIMESYNCD'],
]

4
src/tmpfiles/meson.build
View file

@ -8,7 +8,5 @@ systemd_tmpfiles_sources = files(
tests += [
[['src/tmpfiles/test-offline-passwd.c',
'src/tmpfiles/offline-passwd.c',
'src/tmpfiles/offline-passwd.h'],
[],
[]],
'src/tmpfiles/offline-passwd.h']],
]

12
src/udev/meson.build
View file

@ -226,14 +226,10 @@ fuzzers += [
libacl]],
[['src/udev/fido_id/fuzz-fido-id-desc.c',
'src/udev/fido_id/fido_id_desc.c'],
[],
[]],
]
'src/udev/fido_id/fido_id_desc.c']],
]
tests += [
[['src/udev/fido_id/test-fido-id-desc.c',
'src/udev/fido_id/fido_id_desc.c'],
[],
[]],
]
'src/udev/fido_id/fido_id_desc.c']],
]