From c12e10d785bfe70359a3ec4ae4666957c570c538 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Fri, 27 Jan 2023 12:57:35 +0100 Subject: meson: Add simple_tests list A lot of tests can be defined by just their filename. Moving into their own list keeps things simpler, especially with the next commit. It also makes it easier to keep the lists sorted. --- src/libsystemd/meson.build | 61 ++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 37 deletions(-) (limited to 'src/libsystemd/meson.build') diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index e2eb88f9fd..8646da50a1 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -142,27 +142,36 @@ libsystemd_pc = custom_target( ############################################################ -tests += [ - [files('sd-journal/test-journal-file.c')], - - [files('sd-journal/test-journal-send.c')], - - [files('sd-journal/test-journal-match.c')], +simple_tests += files( + 'sd-journal/test-audit-type.c', + 'sd-journal/test-catalog.c', + 'sd-journal/test-journal-file.c', + 'sd-journal/test-journal-init.c', + 'sd-journal/test-journal-match.c', + 'sd-journal/test-journal-send.c', + 'sd-journal/test-mmap-cache.c', +) +tests += [ [files('sd-journal/test-journal-enum.c'), [], [], [], '', 'timeout=360'], - - [files('sd-journal/test-journal-init.c')], - - [files('sd-journal/test-mmap-cache.c')], - - [files('sd-journal/test-catalog.c')], - - [files('sd-journal/test-audit-type.c')], ] ############################################################ +simple_tests += files( + 'sd-bus/test-bus-creds.c', + 'sd-bus/test-bus-introspect.c', + 'sd-bus/test-bus-match.c', + 'sd-bus/test-bus-vtable.c', + 'sd-device/test-device-util.c', + 'sd-device/test-sd-device-monitor.c', + 'sd-device/test-sd-device.c', + 'sd-event/test-event.c', + 'sd-login/test-login.c', + 'sd-netlink/test-netlink.c', +) + tests += [ [files('sd-bus/test-bus-address.c'), [], @@ -211,41 +220,19 @@ tests += [ [], [threads]], - [files('sd-bus/test-bus-vtable.c')], - - [files('sd-bus/test-bus-creds.c')], - - [files('sd-bus/test-bus-match.c')], - [files('sd-bus/test-bus-benchmark.c'), [], [threads], [], '', 'manual'], - [files('sd-bus/test-bus-introspect.c')], - - [files('sd-event/test-event.c')], - - [files('sd-netlink/test-netlink.c')], - [files('sd-resolve/test-resolve.c'), [], [threads], [], '', 'timeout=120'], - - [files('sd-login/test-login.c')], - - [files('sd-device/test-sd-device.c')], - - [files('sd-device/test-device-util.c')], - - [files('sd-device/test-sd-device-monitor.c')], ] if cxx_cmd != '' - tests += [ - [files('sd-bus/test-bus-vtable-cc.cc')], - ] + simple_tests += files('sd-bus/test-bus-vtable-cc.cc') endif ############################################################ -- cgit v1.2.1