meson: Use files() for tests

Not having to provide the full path in the source tree is much
nicer and the produced lists can also be used anywhere in the source
tree.
This commit is contained in:
Jan Janssen
2022-01-11 14:15:54 +01:00
parent a1a03fa54b
commit e1eeebbb11
23 changed files with 308 additions and 307 deletions
+2 -1
View File
@@ -3588,7 +3588,8 @@ foreach tuple : tests
parallel = tuple.length() > 7 ? tuple[7] : true parallel = tuple.length() > 7 ? tuple[7] : true
timeout = 30 timeout = 30
name = sources[0].split('/')[-1].split('.')[0] # FIXME: Use fs.stem() with meson >= 0.54.0
name = '@0@'.format(sources[0]).split('/')[-1].split('.')[0]
if type.startswith('timeout=') if type.startswith('timeout=')
timeout = type.split('=')[1].to_int() timeout = type.split('=')[1].to_int()
type = '' type = ''
+3 -3
View File
@@ -13,9 +13,9 @@ systemd_analyze_sources = files('''
'''.split()) '''.split())
tests += [ tests += [
[['src/analyze/test-verify.c', [files('test-verify.c',
'src/analyze/analyze-verify.c', 'analyze-verify.c',
'src/analyze/analyze-verify.h'], 'analyze-verify.h'),
[libcore, [libcore,
libshared], libshared],
[], [],
+1 -1
View File
@@ -352,7 +352,7 @@ endif
if efi_arch[1] in ['ia32', 'x86_64', 'arm', 'aarch64'] if efi_arch[1] in ['ia32', 'x86_64', 'arm', 'aarch64']
systemd_boot_sources += files('bcd.c') systemd_boot_sources += files('bcd.c')
tests += [ tests += [
[['src/boot/efi/test-bcd.c'], [files('test-bcd.c'),
[], [],
[libzstd], [libzstd],
[], [],
+3 -3
View File
@@ -6,7 +6,7 @@ busctl_sources = files(
'busctl.c') 'busctl.c')
tests += [ tests += [
[['src/busctl/test-busctl-introspect.c', [files('test-busctl-introspect.c',
'src/busctl/busctl-introspect.c', 'busctl-introspect.c',
'src/busctl/busctl-introspect.h']], 'busctl-introspect.h')],
] ]
+3 -3
View File
@@ -14,8 +14,8 @@ if conf.get('ENABLE_COREDUMP') == 1 and install_sysconfdir_samples
endif endif
tests += [ tests += [
[['src/coredump/test-coredump-vacuum.c', [files('test-coredump-vacuum.c',
'src/coredump/coredump-vacuum.c', 'coredump-vacuum.c',
'src/coredump/coredump-vacuum.h'], 'coredump-vacuum.h'),
[], [], [], '', 'manual'], [], [], [], '', 'manual'],
] ]
+3 -3
View File
@@ -61,9 +61,9 @@ if conf.get('ENABLE_IMPORTD') == 1
endif endif
tests += [ tests += [
[['src/import/test-qcow2.c', [files('test-qcow2.c',
'src/import/qcow2-util.c', 'qcow2-util.c',
'src/import/qcow2-util.h'], 'qcow2-util.h'),
[], [],
[libz], [libz],
[], 'HAVE_ZLIB', 'manual'], [], 'HAVE_ZLIB', 'manual'],
+7 -7
View File
@@ -81,7 +81,7 @@ endif
############################################################ ############################################################
tests += [ tests += [
[['src/journal/test-journal-syslog.c'], [files('test-journal-syslog.c'),
[libjournal_core, [libjournal_core,
libshared], libshared],
[threads, [threads,
@@ -89,30 +89,30 @@ tests += [
liblz4, liblz4,
libselinux]], libselinux]],
[['src/journal/test-journal-config.c'], [files('test-journal-config.c'),
[libjournal_core, [libjournal_core,
libshared], libshared],
[libxz, [libxz,
liblz4, liblz4,
libselinux]], libselinux]],
[['src/journal/test-journal.c'], [files('test-journal.c'),
[libjournal_core, [libjournal_core,
libshared]], libshared]],
[['src/journal/test-journal-stream.c'], [files('test-journal-stream.c'),
[libjournal_core, [libjournal_core,
libshared]], libshared]],
[['src/journal/test-journal-flush.c'], [files('test-journal-flush.c'),
[libjournal_core, [libjournal_core,
libshared]], libshared]],
[['src/journal/test-journal-verify.c'], [files('test-journal-verify.c'),
[libjournal_core, [libjournal_core,
libshared]], libshared]],
[['src/journal/test-journal-interleaving.c'], [files('test-journal-interleaving.c'),
[libjournal_core, [libjournal_core,
libshared]], libshared]],
] ]
+11 -11
View File
@@ -57,49 +57,49 @@ libsystemd_network_includes = [includes, include_directories('.')]
############################################################ ############################################################
tests += [ tests += [
[['src/libsystemd-network/test-dhcp-option.c'], [files('test-dhcp-option.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
[['src/libsystemd-network/test-sd-dhcp-lease.c'], [files('test-sd-dhcp-lease.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
[['src/libsystemd-network/test-dhcp-client.c'], [files('test-dhcp-client.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
[['src/libsystemd-network/test-dhcp-server.c'], [files('test-dhcp-server.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
[['src/libsystemd-network/test-ipv4ll.c'], [files('test-ipv4ll.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
[['src/libsystemd-network/test-ipv4ll-manual.c'], [files('test-ipv4ll-manual.c'),
[libshared, [libshared,
libsystemd_network], libsystemd_network],
[], [], '', 'manual'], [], [], '', 'manual'],
[['src/libsystemd-network/test-acd.c'], [files('test-acd.c'),
[libshared, [libshared,
libsystemd_network], libsystemd_network],
[], [], '', 'manual'], [], [], '', 'manual'],
[['src/libsystemd-network/test-ndisc-rs.c'], [files('test-ndisc-rs.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
[['src/libsystemd-network/test-ndisc-ra.c'], [files('test-ndisc-ra.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
[['src/libsystemd-network/test-dhcp6-client.c'], [files('test-dhcp6-client.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
[['src/libsystemd-network/test-lldp-rx.c'], [files('test-lldp-rx.c'),
[libshared, [libshared,
libsystemd_network]], libsystemd_network]],
] ]
+35 -35
View File
@@ -190,43 +190,43 @@ custom_target(
############################################################ ############################################################
tests += [ tests += [
[['src/libsystemd/sd-journal/test-journal-send.c']], [files('sd-journal/test-journal-send.c')],
[['src/libsystemd/sd-journal/test-journal-match.c']], [files('sd-journal/test-journal-match.c')],
[['src/libsystemd/sd-journal/test-journal-enum.c'], [files('sd-journal/test-journal-enum.c'),
[], [], [], '', 'timeout=360'], [], [], [], '', 'timeout=360'],
[['src/libsystemd/sd-journal/test-journal-init.c']], [files('sd-journal/test-journal-init.c')],
[['src/libsystemd/sd-journal/test-mmap-cache.c']], [files('sd-journal/test-mmap-cache.c')],
[['src/libsystemd/sd-journal/test-catalog.c']], [files('sd-journal/test-catalog.c')],
[['src/libsystemd/sd-journal/test-compress.c'], [files('sd-journal/test-compress.c'),
[], [],
[liblz4, [liblz4,
libzstd, libzstd,
libxz]], libxz]],
[['src/libsystemd/sd-journal/test-compress-benchmark.c'], [files('sd-journal/test-compress-benchmark.c'),
[], [],
[liblz4, [liblz4,
libzstd, libzstd,
libxz], libxz],
[], '', 'timeout=90'], [], '', 'timeout=90'],
[['src/libsystemd/sd-journal/test-audit-type.c']], [files('sd-journal/test-audit-type.c')],
] ]
############################################################ ############################################################
tests += [ tests += [
[['src/libsystemd/sd-bus/test-bus-address.c'], [files('sd-bus/test-bus-address.c'),
[], [],
[threads]], [threads]],
[['src/libsystemd/sd-bus/test-bus-marshal.c'], [files('sd-bus/test-bus-marshal.c'),
[], [],
[threads, [threads,
libglib, libglib,
@@ -234,82 +234,82 @@ tests += [
libgio, libgio,
libdbus]], libdbus]],
[['src/libsystemd/sd-bus/test-bus-signature.c'], [files('sd-bus/test-bus-signature.c'),
[], [],
[threads]], [threads]],
[['src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c'], [files('sd-bus/test-bus-queue-ref-cycle.c'),
[], [],
[threads]], [threads]],
[['src/libsystemd/sd-bus/test-bus-watch-bind.c'], [files('sd-bus/test-bus-watch-bind.c'),
[], [],
[threads], [threads],
[], '', 'timeout=120'], [], '', 'timeout=120'],
[['src/libsystemd/sd-bus/test-bus-chat.c'], [files('sd-bus/test-bus-chat.c'),
[], [],
[threads]], [threads]],
[['src/libsystemd/sd-bus/test-bus-cleanup.c'], [files('sd-bus/test-bus-cleanup.c'),
[], [],
[threads, [threads,
libseccomp]], libseccomp]],
[['src/libsystemd/sd-bus/test-bus-track.c'], [files('sd-bus/test-bus-track.c'),
[], [],
[libseccomp]], [libseccomp]],
[['src/libsystemd/sd-bus/test-bus-server.c'], [files('sd-bus/test-bus-server.c'),
[], [],
[threads]], [threads]],
[['src/libsystemd/sd-bus/test-bus-objects.c'], [files('sd-bus/test-bus-objects.c'),
[], [],
[threads]], [threads]],
[['src/libsystemd/sd-bus/test-bus-vtable.c', [files('sd-bus/test-bus-vtable.c',
'src/libsystemd/sd-bus/test-vtable-data.h']], 'sd-bus/test-vtable-data.h')],
[['src/libsystemd/sd-bus/test-bus-gvariant.c'], [files('sd-bus/test-bus-gvariant.c'),
[], [],
[libglib, [libglib,
libgobject, libgobject,
libgio]], libgio]],
[['src/libsystemd/sd-bus/test-bus-creds.c']], [files('sd-bus/test-bus-creds.c')],
[['src/libsystemd/sd-bus/test-bus-match.c']], [files('sd-bus/test-bus-match.c')],
[['src/libsystemd/sd-bus/test-bus-benchmark.c'], [files('sd-bus/test-bus-benchmark.c'),
[], [],
[threads], [threads],
[], '', 'manual'], [], '', 'manual'],
[['src/libsystemd/sd-bus/test-bus-introspect.c', [files('sd-bus/test-bus-introspect.c',
'src/libsystemd/sd-bus/test-vtable-data.h']], 'sd-bus/test-vtable-data.h')],
[['src/libsystemd/sd-event/test-event.c']], [files('sd-event/test-event.c')],
[['src/libsystemd/sd-netlink/test-netlink.c']], [files('sd-netlink/test-netlink.c')],
[['src/libsystemd/sd-resolve/test-resolve.c'], [files('sd-resolve/test-resolve.c'),
[], [],
[threads], [threads],
[], '', 'timeout=120'], [], '', 'timeout=120'],
[['src/libsystemd/sd-login/test-login.c']], [files('sd-login/test-login.c')],
[['src/libsystemd/sd-device/test-sd-device.c']], [files('sd-device/test-sd-device.c')],
[['src/libsystemd/sd-device/test-device-util.c']], [files('sd-device/test-device-util.c')],
[['src/libsystemd/sd-device/test-sd-device-monitor.c']], [files('sd-device/test-sd-device-monitor.c')],
] ]
if cxx_cmd != '' if cxx_cmd != ''
tests += [ tests += [
[['src/libsystemd/sd-bus/test-bus-vtable-cc.cc']], [files('sd-bus/test-bus-vtable-cc.cc')],
] ]
endif endif
+1 -1
View File
@@ -45,7 +45,7 @@ custom_target(
############################################################ ############################################################
tests += [ tests += [
[['src/libudev/test-libudev.c'], [files('test-libudev.c'),
[libshared, [libshared,
libudev_basic]], libudev_basic]],
] ]
+3 -3
View File
@@ -30,7 +30,7 @@ if conf.get('ENABLE_LOCALED') == 1
endif endif
tests += [ tests += [
[['src/locale/test-keymap-util.c', [files('test-keymap-util.c',
'src/locale/keymap-util.c', 'keymap-util.c',
'src/locale/keymap-util.h']], 'keymap-util.h')],
] ]
+3 -3
View File
@@ -101,12 +101,12 @@ endif
############################################################ ############################################################
tests += [ tests += [
[['src/login/test-login-shared.c']], [files('test-login-shared.c')],
[['src/login/test-inhibit.c'], [files('test-inhibit.c'),
[], [], [], '', 'manual'], [], [], [], '', 'manual'],
[['src/login/test-login-tables.c'], [files('test-login-tables.c'),
[liblogind_core, [liblogind_core,
libshared], libshared],
[threads]], [threads]],
+1 -1
View File
@@ -37,7 +37,7 @@ if conf.get('ENABLE_MACHINED') == 1
endif endif
tests += [ tests += [
[['src/machine/test-machine-tables.c'], [files('test-machine-tables.c'),
[libmachine_core, [libmachine_core,
libshared], libshared],
[threads]], [threads]],
+8 -8
View File
@@ -279,37 +279,37 @@ fuzzers += [
] ]
tests += [ tests += [
[['src/network/test-networkd-address.c'], [files('test-networkd-address.c'),
[libnetworkd_core, [libnetworkd_core,
libsystemd_network], libsystemd_network],
[], [],
network_includes], network_includes],
[['src/network/test-networkd-conf.c'], [files('test-networkd-conf.c'),
[libnetworkd_core, [libnetworkd_core,
libsystemd_network], libsystemd_network],
[], [],
network_includes], network_includes],
[['src/network/test-networkd-util.c'], [files('test-networkd-util.c'),
[libnetworkd_core, [libnetworkd_core,
libsystemd_network], libsystemd_network],
[], [],
network_includes], network_includes],
[['src/network/test-network.c'], [files('test-network.c'),
[libnetworkd_core, [libnetworkd_core,
libsystemd_network], libsystemd_network],
[threads], [threads],
network_includes], network_includes],
[['src/network/test-network-tables.c'], [files('test-network-tables.c'),
[libnetworkd_core, [libnetworkd_core,
libsystemd_network], libsystemd_network],
[threads], [threads],
network_includes], network_includes],
[['src/network/generator/test-network-generator.c', [files('generator/test-network-generator.c',
'src/network/generator/network-generator.c', 'generator/network-generator.c',
'src/network/generator/network-generator.h']], 'generator/network-generator.h')],
] ]
+2 -2
View File
@@ -53,12 +53,12 @@ systemd_nspawn_sources = files('nspawn.c')
############################################################ ############################################################
tests += [ tests += [
[['src/nspawn/test-nspawn-tables.c'], [files('test-nspawn-tables.c'),
[libnspawn_core, [libnspawn_core,
libshared], libshared],
[libseccomp]], [libseccomp]],
[['src/nspawn/test-patch-uid.c'], [files('test-patch-uid.c'),
[libnspawn_core, [libnspawn_core,
libshared], libshared],
[libacl], [libacl],
+3 -3
View File
@@ -28,7 +28,7 @@ if conf.get('ENABLE_OOMD') == 1
endif endif
tests += [ tests += [
[['src/oom/test-oomd-util.c', [files('test-oomd-util.c',
'src/oom/oomd-util.c', 'oomd-util.c',
'src/oom/oomd-util.h']], 'oomd-util.h')],
] ]
+8 -8
View File
@@ -174,40 +174,40 @@ custom_target(
############################################################ ############################################################
tests += [ tests += [
[['src/resolve/test-resolve-tables.c'], [files('test-resolve-tables.c'),
[libsystemd_resolve_core, [libsystemd_resolve_core,
libshared], libshared],
[lib_openssl_or_gcrypt, [lib_openssl_or_gcrypt,
libm]], libm]],
[['src/resolve/test-dns-packet.c'], [files('test-dns-packet.c'),
[libsystemd_resolve_core, [libsystemd_resolve_core,
libshared], libshared],
[lib_openssl_or_gcrypt, [lib_openssl_or_gcrypt,
libm]], libm]],
[['src/resolve/test-resolved-etc-hosts.c', [files('test-resolved-etc-hosts.c',
'src/resolve/resolved-etc-hosts.c', 'resolved-etc-hosts.c',
'src/resolve/resolved-etc-hosts.h'], 'resolved-etc-hosts.h'),
[libsystemd_resolve_core, [libsystemd_resolve_core,
libshared], libshared],
[lib_openssl_or_gcrypt, [lib_openssl_or_gcrypt,
libm]], libm]],
[['src/resolve/test-resolved-packet.c'], [files('test-resolved-packet.c'),
[libsystemd_resolve_core, [libsystemd_resolve_core,
libshared], libshared],
[lib_openssl_or_gcrypt, [lib_openssl_or_gcrypt,
libm]], libm]],
[['src/resolve/test-dnssec.c'], [files('test-dnssec.c'),
[libsystemd_resolve_core, [libsystemd_resolve_core,
libshared], libshared],
[lib_openssl_or_gcrypt, [lib_openssl_or_gcrypt,
libm], libm],
[], 'HAVE_OPENSSL_OR_GCRYPT'], [], 'HAVE_OPENSSL_OR_GCRYPT'],
[['src/resolve/test-dnssec-complex.c'], [files('test-dnssec-complex.c'),
[libsystemd_resolve_core, [libsystemd_resolve_core,
libshared], libshared],
[lib_openssl_or_gcrypt, [lib_openssl_or_gcrypt,
+3 -3
View File
@@ -7,9 +7,9 @@ systemd_shutdown_sources = files('''
'''.split()) '''.split())
tests += [ tests += [
[['src/shutdown/test-umount.c', [files('test-umount.c',
'src/shutdown/umount.c', 'umount.c',
'src/shutdown/umount.h'], 'umount.h'),
[], [],
[libmount]], [libmount]],
] ]
+193 -193
View File
@@ -41,11 +41,11 @@ test_dlopen_c = files('test-dlopen.c')
############################################################ ############################################################
tests += [ tests += [
[['src/test/test-device-nodes.c']], [files('test-device-nodes.c')],
[['src/test/test-ether-addr-util.c']], [files('test-ether-addr-util.c')],
[['src/test/test-engine.c'], [files('test-engine.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -56,21 +56,21 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-emergency-action.c'], [files('test-emergency-action.c'),
[libcore, [libcore,
libshared], libshared],
[], [],
core_includes], core_includes],
[['src/test/test-chown-rec.c'], [files('test-chown-rec.c'),
[libcore, [libcore,
libshared], libshared],
[], [],
core_includes], core_includes],
[['src/test/test-dlopen-so.c']], [files('test-dlopen-so.c')],
[['src/test/test-job-type.c'], [files('test-job-type.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -81,7 +81,7 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-ns.c'], [files('test-ns.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -92,7 +92,7 @@ tests += [
libblkid], libblkid],
core_includes, '', 'manual'], core_includes, '', 'manual'],
[['src/test/test-loopback.c'], [files('test-loopback.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -103,14 +103,14 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-dns-domain.c']], [files('test-dns-domain.c')],
[['src/test/test-boot-timestamps.c'], [files('test-boot-timestamps.c'),
[], [], [], 'ENABLE_EFI'], [], [], [], 'ENABLE_EFI'],
[['src/test/test-unit-file.c']], [files('test-unit-file.c')],
[['src/test/test-unit-name.c'], [files('test-unit-name.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -121,7 +121,7 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-load-fragment.c'], [files('test-load-fragment.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -132,9 +132,9 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-serialize.c']], [files('test-serialize.c')],
[['src/test/test-unit-serialize.c'], [files('test-unit-serialize.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -145,196 +145,196 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-utf8.c']], [files('test-utf8.c')],
[['src/test/test-kbd-util.c']], [files('test-kbd-util.c')],
[['src/test/test-blockdev-util.c']], [files('test-blockdev-util.c')],
[['src/test/test-dev-setup.c']], [files('test-dev-setup.c')],
[['src/test/test-capability.c'], [files('test-capability.c'),
[], [],
[libcap]], [libcap]],
[['src/test/test-async.c'], [files('test-async.c'),
[], [], [], '', 'timeout=120'], [], [], [], '', 'timeout=120'],
[['src/test/test-locale-util.c']], [files('test-locale-util.c')],
[['src/test/test-copy.c']], [files('test-copy.c')],
[['src/test/test-recurse-dir.c']], [files('test-recurse-dir.c')],
[['src/test/test-data-fd-util.c']], [files('test-data-fd-util.c')],
[['src/test/test-static-destruct.c']], [files('test-static-destruct.c')],
[['src/test/test-sigbus.c']], [files('test-sigbus.c')],
[['src/test/test-condition.c']], [files('test-condition.c')],
[['src/test/test-fdset.c']], [files('test-fdset.c')],
[['src/test/test-fstab-util.c']], [files('test-fstab-util.c')],
[['src/test/test-random-util.c'], [files('test-random-util.c'),
[], [],
[libm], [libm],
[], '', 'timeout=120'], [], '', 'timeout=120'],
[['src/test/test-format-table.c']], [files('test-format-table.c')],
[['src/test/test-format-util.c']], [files('test-format-util.c')],
[['src/test/test-ratelimit.c']], [files('test-ratelimit.c')],
[['src/test/test-util.c']], [files('test-util.c')],
[['src/test/test-macro.c']], [files('test-macro.c')],
[['src/test/test-json.c']], [files('test-json.c')],
[['src/test/test-modhex.c']], [files('test-modhex.c')],
[['src/test/test-libmount.c'], [files('test-libmount.c'),
[], [],
[threads, [threads,
libmount]], libmount]],
[['src/test/test-mount-util.c']], [files('test-mount-util.c')],
[['src/test/test-mountpoint-util.c']], [files('test-mountpoint-util.c')],
[['src/test/test-exec-util.c']], [files('test-exec-util.c')],
[['src/test/test-hexdecoct.c']], [files('test-hexdecoct.c')],
[['src/test/test-alloc-util.c']], [files('test-alloc-util.c')],
[['src/test/test-xattr-util.c']], [files('test-xattr-util.c')],
[['src/test/test-io-util.c']], [files('test-io-util.c')],
[['src/test/test-glob-util.c']], [files('test-glob-util.c')],
[['src/test/test-fs-util.c']], [files('test-fs-util.c')],
[['src/test/test-install-file.c']], [files('test-install-file.c')],
[['src/test/test-umask-util.c']], [files('test-umask-util.c')],
[['src/test/test-proc-cmdline.c']], [files('test-proc-cmdline.c')],
[['src/test/test-fd-util.c'], [files('test-fd-util.c'),
[], [],
[libseccomp]], [libseccomp]],
[['src/test/test-web-util.c']], [files('test-web-util.c')],
[['src/test/test-cpu-set-util.c']], [files('test-cpu-set-util.c')],
[['src/test/test-stat-util.c']], [files('test-stat-util.c')],
[['src/test/test-os-util.c']], [files('test-os-util.c')],
[['src/test/test-libcrypt-util.c'], [files('test-libcrypt-util.c'),
[], [libcrypt], [], '', 'timeout=120'], [], [libcrypt], [], '', 'timeout=120'],
[['src/test/test-escape.c']], [files('test-escape.c')],
[['src/test/test-exit-status.c']], [files('test-exit-status.c')],
[['src/test/test-specifier.c']], [files('test-specifier.c')],
[['src/test/test-string-util.c']], [files('test-string-util.c')],
[['src/test/test-extract-word.c']], [files('test-extract-word.c')],
[['src/test/test-parse-argument.c']], [files('test-parse-argument.c')],
[['src/test/test-parse-socket-bind-item.c']], [files('test-parse-socket-bind-item.c')],
[['src/test/test-parse-util.c']], [files('test-parse-util.c')],
[['src/test/test-sysctl-util.c']], [files('test-sysctl-util.c')],
[['src/test/test-import-util.c']], [files('test-import-util.c')],
[['src/test/test-uid-alloc-range.c']], [files('test-uid-alloc-range.c')],
[['src/test/test-user-util.c']], [files('test-user-util.c')],
[['src/test/test-hostname-setup.c']], [files('test-hostname-setup.c')],
[['src/test/test-hostname-util.c']], [files('test-hostname-util.c')],
[['src/test/test-process-util.c']], [files('test-process-util.c')],
[['src/test/test-terminal-util.c']], [files('test-terminal-util.c')],
[['src/test/test-path-lookup.c']], [files('test-path-lookup.c')],
[['src/test/test-pretty-print.c']], [files('test-pretty-print.c')],
[['src/test/test-uid-range.c']], [files('test-uid-range.c')],
[['src/test/test-cap-list.c', [files('test-cap-list.c') +
generated_gperf_headers], generated_gperf_headers,
[], [],
[libcap]], [libcap]],
[['src/test/test-socket-util.c']], [files('test-socket-util.c')],
[['src/test/test-socket-netlink.c']], [files('test-socket-netlink.c')],
[['src/test/test-in-addr-util.c']], [files('test-in-addr-util.c')],
[['src/test/test-in-addr-prefix-util.c']], [files('test-in-addr-prefix-util.c')],
[['src/test/test-barrier.c']], [files('test-barrier.c')],
[['src/test/test-tmpfiles.c']], [files('test-tmpfiles.c')],
[['src/test/test-namespace.c'], [files('test-namespace.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-verbs.c']], [files('test-verbs.c')],
[['src/test/test-install-root.c']], [files('test-install-root.c')],
[['src/test/test-acl-util.c'], [files('test-acl-util.c'),
[], [], [], 'HAVE_ACL'], [], [], [], 'HAVE_ACL'],
[['src/test/test-seccomp.c'], [files('test-seccomp.c'),
[], [],
[libseccomp], [libseccomp],
[], 'HAVE_SECCOMP'], [], 'HAVE_SECCOMP'],
[['src/test/test-rlimit-util.c']], [files('test-rlimit-util.c')],
[['src/test/test-ask-password-api.c'], [files('test-ask-password-api.c'),
[], [], [], '', 'manual'], [], [], [], '', 'manual'],
[['src/test/test-signal-util.c']], [files('test-signal-util.c')],
[['src/test/test-loop-block.c'], [files('test-loop-block.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
libblkid], libblkid],
core_includes, '', '', [], false], core_includes, '', '', [], false],
[['src/test/test-selinux.c']], [files('test-selinux.c')],
[['src/test/test-sizeof.c'], [files('test-sizeof.c'),
[libbasic]], [libbasic]],
[['src/test/test-bpf-devices.c'], [files('test-bpf-devices.c'),
[libcore, [libcore,
libshared], libshared],
[libmount, [libmount,
@@ -345,7 +345,7 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-bpf-firewall.c'], [files('test-bpf-firewall.c'),
[libcore, [libcore,
libshared], libshared],
[libmount, [libmount,
@@ -356,13 +356,13 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-bpf-foreign-programs.c'], [files('test-bpf-foreign-programs.c'),
[libcore, [libcore,
libshared], libshared],
[], [],
core_includes], core_includes],
[['src/test/test-bpf-lsm.c'], [files('test-bpf-lsm.c'),
[libcore, [libcore,
libshared], libshared],
[libmount, [libmount,
@@ -373,7 +373,7 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-watch-pid.c'], [files('test-watch-pid.c'),
[libcore, [libcore,
libshared], libshared],
[libmount, [libmount,
@@ -384,32 +384,32 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-hashmap.c', [files('test-hashmap.c',
'src/test/test-hashmap-plain.c', 'test-hashmap-plain.c') +
test_hashmap_ordered_c], [test_hashmap_ordered_c],
[], [], [], '', 'timeout=180'], [], [], [], '', 'timeout=180'],
[['src/test/test-set.c']], [files('test-set.c')],
[['src/test/test-ordered-set.c']], [files('test-ordered-set.c')],
[['src/test/test-set-disable-mempool.c'], [files('test-set-disable-mempool.c'),
[], [],
[threads]], [threads]],
[['src/test/test-hash-funcs.c']], [files('test-hash-funcs.c')],
[['src/test/test-bitmap.c']], [files('test-bitmap.c')],
[['src/test/test-xml.c']], [files('test-xml.c')],
[['src/test/test-list.c']], [files('test-list.c')],
[['src/test/test-procfs-util.c']], [files('test-procfs-util.c')],
[['src/test/test-unaligned.c']], [files('test-unaligned.c')],
[['src/test/test-tables.c'], [files('test-tables.c'),
[libcore, [libcore,
libjournal_core, libjournal_core,
libudevd_core, libudevd_core,
@@ -423,70 +423,70 @@ tests += [
libselinux], libselinux],
[core_includes, journal_includes, udev_includes]], [core_includes, journal_includes, udev_includes]],
[['src/test/test-prioq.c']], [files('test-prioq.c')],
[['src/test/test-fileio.c']], [files('test-fileio.c')],
[['src/test/test-time-util.c']], [files('test-time-util.c')],
[['src/test/test-clock.c']], [files('test-clock.c')],
[['src/test/test-tmpfile-util.c']], [files('test-tmpfile-util.c')],
[['src/test/test-architecture.c']], [files('test-architecture.c')],
[['src/test/test-gpt.c']], [files('test-gpt.c')],
[['src/test/test-log.c']], [files('test-log.c')],
[['src/test/test-ipcrm.c'], [files('test-ipcrm.c'),
[], [], [], '', 'unsafe'], [], [], [], '', 'unsafe'],
[['src/test/test-btrfs.c'], [files('test-btrfs.c'),
[], [], [], '', 'manual'], [], [], [], '', 'manual'],
[['src/test/test-firewall-util.c']], [files('test-firewall-util.c')],
[['src/test/test-net-naming-scheme.c']], [files('test-net-naming-scheme.c')],
[['src/test/test-netlink-manual.c'], [files('test-netlink-manual.c'),
[], [],
[libkmod], [libkmod],
[], 'HAVE_KMOD', 'manual'], [], 'HAVE_KMOD', 'manual'],
[['src/test/test-ellipsize.c']], [files('test-ellipsize.c')],
[['src/test/test-date.c']], [files('test-date.c')],
[['src/test/test-sleep.c']], [files('test-sleep.c')],
[['src/test/test-tpm2.c']], [files('test-tpm2.c')],
[['src/test/test-replace-var.c']], [files('test-replace-var.c')],
[['src/test/test-calendarspec.c']], [files('test-calendarspec.c')],
[['src/test/test-strip-tab-ansi.c']], [files('test-strip-tab-ansi.c')],
[['src/test/test-coredump-util.c']], [files('test-coredump-util.c')],
[['src/test/test-daemon.c']], [files('test-daemon.c')],
[['src/test/test-cgroup.c']], [files('test-cgroup.c')],
[['src/test/test-cgroup-cpu.c'], [files('test-cgroup-cpu.c'),
[libcore, [libcore,
libshared], libshared],
[], [],
core_includes], core_includes],
[['src/test/test-cgroup-unit-default.c'], [files('test-cgroup-unit-default.c'),
[libcore, [libcore,
libshared], libshared],
[], [],
core_includes], core_includes],
[['src/test/test-cgroup-mask.c'], [files('test-cgroup-mask.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -497,30 +497,30 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-varlink.c'], [files('test-varlink.c'),
[], [],
[threads]], [threads]],
[['src/test/test-cgroup-util.c']], [files('test-cgroup-util.c')],
[['src/test/test-cgroup-setup.c']], [files('test-cgroup-setup.c')],
[['src/test/test-env-file.c']], [files('test-env-file.c')],
[['src/test/test-env-util.c']], [files('test-env-util.c')],
[['src/test/test-strbuf.c']], [files('test-strbuf.c')],
[['src/test/test-strv.c']], [files('test-strv.c')],
[['src/test/test-path-util.c']], [files('test-path-util.c')],
[['src/test/test-rm-rf.c']], [files('test-rm-rf.c')],
[['src/test/test-chase-symlinks.c'], [files('test-chase-symlinks.c'),
[], [], [], '', 'manual'], [], [], [], '', 'manual'],
[['src/test/test-path.c'], [files('test-path.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -531,7 +531,7 @@ tests += [
libblkid], libblkid],
core_includes, '', 'timeout=120'], core_includes, '', 'timeout=120'],
[['src/test/test-execute.c'], [files('test-execute.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -542,20 +542,20 @@ tests += [
libblkid], libblkid],
core_includes, '', 'timeout=360'], core_includes, '', 'timeout=360'],
[['src/test/test-siphash24.c']], [files('test-siphash24.c')],
[['src/test/test-strxcpyx.c']], [files('test-strxcpyx.c')],
[['src/test/test-install.c'], [files('test-install.c'),
[libcore, [libcore,
libshared], libshared],
[], [],
core_includes, '', 'manual'], core_includes, '', 'manual'],
[['src/test/test-watchdog.c'], [files('test-watchdog.c'),
[], [], [], '', 'unsafe'], [], [], [], '', 'unsafe'],
[['src/test/test-sched-prio.c'], [files('test-sched-prio.c'),
[libcore, [libcore,
libshared], libshared],
[threads, [threads,
@@ -566,25 +566,25 @@ tests += [
libblkid], libblkid],
core_includes], core_includes],
[['src/test/test-conf-files.c']], [files('test-conf-files.c')],
[['src/test/test-conf-parser.c']], [files('test-conf-parser.c')],
[['src/test/test-af-list.c', [files('test-af-list.c') +
generated_gperf_headers]], generated_gperf_headers],
[['src/test/test-arphrd-util.c', [files('test-arphrd-util.c') +
generated_gperf_headers]], generated_gperf_headers],
[['src/test/test-errno-list.c', [files('test-errno-list.c') +
generated_gperf_headers]], generated_gperf_headers],
[['src/test/test-ip-protocol-list.c', [files('test-ip-protocol-list.c') +
shared_generated_gperf_headers]], shared_generated_gperf_headers],
[['src/test/test-journal-importer.c']], [files('test-journal-importer.c')],
[['src/test/test-udev.c'], [files('test-udev.c'),
[libudevd_core, [libudevd_core,
libshared], libshared],
[threads, [threads,
@@ -595,49 +595,49 @@ tests += [
libselinux], libselinux],
udev_includes, '', 'manual'], udev_includes, '', 'manual'],
[['src/test/test-udev-util.c']], [files('test-udev-util.c')],
[['src/test/test-id128.c']], [files('test-id128.c')],
[['src/test/test-cryptolib.c'], [files('test-cryptolib.c'),
[libshared], [libshared],
[lib_openssl_or_gcrypt], [lib_openssl_or_gcrypt],
[], 'HAVE_OPENSSL_OR_GCRYPT'], [], 'HAVE_OPENSSL_OR_GCRYPT'],
[['src/test/test-nss-hosts.c', [files('test-nss-hosts.c',
'src/test/nss-test-util.c', 'nss-test-util.c',
'src/test/nss-test-util.h'], 'nss-test-util.h'),
[], [],
[libdl], [libdl],
[], 'ENABLE_NSS'], [], 'ENABLE_NSS'],
[['src/test/test-nss-users.c', [files('test-nss-users.c',
'src/test/nss-test-util.c', 'nss-test-util.c',
'src/test/nss-test-util.h'], 'nss-test-util.h'),
[], [],
[libdl], [libdl],
[], 'ENABLE_NSS'], [], 'ENABLE_NSS'],
[['src/test/test-bus-util.c']], [files('test-bus-util.c')],
[['src/test/test-percent-util.c']], [files('test-percent-util.c')],
[['src/test/test-sd-hwdb.c']], [files('test-sd-hwdb.c')],
[['src/test/test-sd-path.c']], [files('test-sd-path.c')],
[['src/test/test-local-addresses.c']], [files('test-local-addresses.c')],
[['src/test/test-psi-util.c']], [files('test-psi-util.c')],
[['src/test/test-qrcode-util.c'], [files('test-qrcode-util.c'),
[], [],
[libdl]], [libdl]],
[['src/test/test-nscd-flush.c'], [files('test-nscd-flush.c'),
[], [], [], 'ENABLE_NSCD', 'manual'], [], [], [], 'ENABLE_NSCD', 'manual'],
[['src/test/test-hmac.c']], [files('test-hmac.c')],
] ]
############################################################ ############################################################
@@ -645,23 +645,23 @@ tests += [
# define some tests here, because the link_with deps were not defined earlier # define some tests here, because the link_with deps were not defined earlier
tests += [ tests += [
[['src/libsystemd/sd-bus/test-bus-error.c'], [files('../libsystemd/sd-bus/test-bus-error.c'),
[libshared_static, [libshared_static,
libsystemd_static]], libsystemd_static]],
[['src/libsystemd/sd-device/test-sd-device-thread.c'], [files('../libsystemd/sd-device/test-sd-device-thread.c'),
[libsystemd], [libsystemd],
[threads]], [threads]],
[['src/libudev/test-udev-device-thread.c'], [files('../libudev/test-udev-device-thread.c'),
[libudev], [libudev],
[threads]], [threads]],
] ]
tests += [ tests += [
[['src/test/test-socket-bind.c'], [files('test-socket-bind.c'),
[libcore, [libcore,
libshared], libshared],
[libdl], [libdl],
core_includes, core_includes,
'BPF_FRAMEWORK'], 'BPF_FRAMEWORK'],
+1 -1
View File
@@ -55,7 +55,7 @@ endif
############################################################ ############################################################
tests += [ tests += [
[['src/timesync/test-timesync.c'], [files('test-timesync.c'),
[libtimesyncd_core, [libtimesyncd_core,
libshared], libshared],
[libm]], [libm]],
+3 -3
View File
@@ -6,7 +6,7 @@ systemd_tmpfiles_sources = files(
'offline-passwd.h') 'offline-passwd.h')
tests += [ tests += [
[['src/tmpfiles/test-offline-passwd.c', [files('test-offline-passwd.c',
'src/tmpfiles/offline-passwd.c', 'offline-passwd.c',
'src/tmpfiles/offline-passwd.h']], 'offline-passwd.h')],
] ]
+8 -8
View File
@@ -195,28 +195,28 @@ fuzzers += [
] ]
tests += [ tests += [
[['src/udev/test-udev-event.c'], [files('test-udev-event.c'),
[libudevd_core, [libudevd_core,
libshared], libshared],
[threads, [threads,
libacl]], libacl]],
[['src/udev/test-udev-node.c'], [files('test-udev-node.c'),
[libudevd_core, [libudevd_core,
libshared], libshared],
[threads, [threads,
libacl]], libacl]],
[['src/udev/test-udev-builtin.c'], [files('test-udev-builtin.c'),
[libudevd_core, [libudevd_core,
libshared], libshared],
[threads, [threads,
libacl]], libacl]],
[['src/udev/test-udev-netlink.c', [files('test-udev-netlink.c',
'src/udev/udev-netlink.c', 'udev-netlink.c',
'src/udev/udev-netlink.h']], 'udev-netlink.h')],
[['src/udev/fido_id/test-fido-id-desc.c', [files('fido_id/test-fido-id-desc.c',
'src/udev/fido_id/fido_id_desc.c']], 'fido_id/fido_id_desc.c')],
] ]
+3 -3
View File
@@ -6,9 +6,9 @@ systemd_xdg_autostart_generator_sources = files(
'xdg-autostart-service.h') 'xdg-autostart-service.h')
tests += [ tests += [
[['src/xdg-autostart-generator/test-xdg-autostart.c', [files('test-xdg-autostart.c',
'src/xdg-autostart-generator/xdg-autostart-service.c', 'xdg-autostart-service.c',
'src/xdg-autostart-generator/xdg-autostart-service.h']], 'xdg-autostart-service.h')],
] ]
fuzzers += [ fuzzers += [