Prep v235: Apply upstream fixes (9/10) [src/test]

1 files changed, 85 insertions, 82 deletions

diff --git a/src/test/meson.build b/src/test/meson.build
index 425c53f83..ccf0f7077 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -46,8 +46,9 @@ tests += [
 #         [['src/test/test-device-nodes.c'],
 #          [],
 #          []],
-
-#         [['src/test/test-engine.c'],
+# 
+#         [['src/test/test-engine.c',
+#           'src/test/test-helper.c'],
 #          [libcore,
 #           libudev,
 #           libelogind_internal],
@@ -57,7 +58,7 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-
+# 
 #         [['src/test/test-job-type.c'],
 #          [libcore,
 #           libshared],
@@ -67,7 +68,7 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-
+# 
 #         [['src/test/test-ns.c'],
 #          [libcore,
 #           libshared],
@@ -78,7 +79,7 @@ tests += [
 #           libmount,
 #           libblkid],
 #          '', 'manual'],
-
+# 
 #         [['src/test/test-loopback.c'],
 #          [libcore,
 #           libshared],
@@ -88,7 +89,7 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-
+# 
 #         [['src/test/test-hostname.c'],
 #          [libcore,
 #           libshared],
@@ -99,18 +100,19 @@ tests += [
 #           libmount,
 #           libblkid],
 #          '', 'unsafe'],
-
+# 
 #         [['src/test/test-dns-domain.c'],
 #          [libcore,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/test/test-boot-timestamps.c'],
 #          [],
 #          [],
 #          'ENABLE_EFI'],
-
-#         [['src/test/test-unit-name.c'],
+# 
+#         [['src/test/test-unit-name.c',
+#           'src/test/test-helper.c'],
 #          [libcore,
 #           libshared],
 #          [threads,
@@ -119,8 +121,9 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-
-#         [['src/test/test-unit-file.c'],
+# 
+#         [['src/test/test-unit-file.c',
+#           'src/test/test-helper.c'],
 #          [libcore,
 #           libshared],
 #          [threads,
@@ -279,32 +282,32 @@ tests += [
 #         [['src/test/test-terminal-util.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-path-lookup.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-uid-range.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-cap-list.c',
 #           generated_gperf_headers],
 #          [],
 #          [libcap]],
-
+# 
 #         [['src/test/test-socket-util.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-barrier.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-tmpfiles.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-namespace.c'],
 #          [libcore,
 #           libshared],
@@ -320,26 +323,26 @@ tests += [
 #         [['src/test/test-install-root.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-acl-util.c'],
 #          [],
 #          [],
 #          'HAVE_ACL'],
-
+# 
 #         [['src/test/test-seccomp.c'],
 #          [],
 #          [libseccomp],
 #          'HAVE_SECCOMP'],
-
+# 
 #         [['src/test/test-rlimit-util.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-ask-password-api.c'],
 #          [],
 #          [],
 #          '', 'manual'],
-
+# 
 #         [['src/test/test-dissect-image.c'],
 #          [],
 #          [libblkid],
@@ -373,7 +376,7 @@ tests += [
 #         [['src/test/test-bitmap.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-xml.c'],
 #          [],
 #          []],
@@ -415,15 +418,15 @@ tests += [
 #         [['src/test/test-fileio.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-time.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-clock.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-architecture.c'],
 #          [],
 #          []],
@@ -443,13 +446,13 @@ tests += [
 #          [],
 #          [],
 #          '', 'manual'],
-
-
+# 
+# 
 #         [['src/test/test-firewall-util.c'],
 #          [libshared],
 #          [],
 #          'HAVE_LIBIPTC'],
-
+# 
 #         [['src/test/test-netlink-manual.c'],
 #          [],
 #          [libkmod],
@@ -464,15 +467,15 @@ tests += [
 #         [['src/test/test-date.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-sleep.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-replace-var.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-calendarspec.c'],
 #          [],
 #          []],
@@ -505,19 +508,19 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-
+# 
 #         [['src/test/test-cgroup-util.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-env-util.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-strbuf.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-strv.c'],
 #          [],
 #          []],
@@ -538,8 +541,9 @@ tests += [
 #           libselinux,
 #           libmount,
 #           libblkid]],
-
-#         [['src/test/test-execute.c'],
+# 
+#         [['src/test/test-execute.c',
+#           'src/test/test-helper.c'],
 #          [libcore,
 #           libshared],
 #          [threads,
@@ -558,18 +562,19 @@ tests += [
 #         [['src/test/test-strxcpyx.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-install.c'],
 #          [libcore,
 #           libshared],
 #          [],
 #          '', 'manual'],
-
+# 
 #         [['src/test/test-watchdog.c'],
 #          [],
 #          []],
-
-#         [['src/test/test-sched-prio.c'],
+# 
+#         [['src/test/test-sched-prio.c',
+#           'src/test/test-helper.c'],
 #          [libcore,
 #           libshared],
 #          [threads,
@@ -593,20 +598,20 @@ tests += [
 #           generated_gperf_headers],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-arphrd-list.c',
 #           generated_gperf_headers],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-journal-importer.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/test/test-libudev.c'],
 #          [libshared],
 #          []],
-
+# 
 #         [['src/test/test-udev.c'],
 #          [libudev_core,
 #           libudev_internal,
@@ -648,14 +653,14 @@ tests += [
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-journal-send.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-journal-syslog.c'],
 #          [libjournal_core,
 #           libshared],
@@ -663,63 +668,63 @@ tests += [
 #           libxz,
 #           liblz4,
 #           libselinux]],
-
+# 
 #         [['src/journal/test-journal-match.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-journal-enum.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-journal-stream.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-journal-flush.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-journal-init.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-journal-verify.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-journal-interleaving.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-mmap-cache.c'],
 #          [libjournal_core,
 #           libshared],
 #          [threads,
 #           libxz,
 #           liblz4]],
-
+# 
 #         [['src/journal/test-catalog.c'],
 #          [libjournal_core,
 #           libshared],
@@ -727,20 +732,20 @@ tests += [
 #           libxz,
 #           liblz4],
 #          '', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)],
-
+# 
 #         [['src/journal/test-compress.c'],
 #          [libjournal_core,
 #           libshared],
 #          [liblz4,
 #           libxz]],
-
+# 
 #         [['src/journal/test-compress-benchmark.c'],
 #          [libjournal_core,
 #           libshared],
 #          [liblz4,
 #           libxz],
 #          '', 'timeout=90'],
-
+# 
 #         [['src/journal/test-audit-type.c'],
 #          [libjournal_core,
 #           libshared],
@@ -770,7 +775,7 @@ tests += [
 #         [['src/libelogind/sd-bus/test-bus-chat.c'],
 #          [],
 #          [threads]],
-
+# 
 #         [['src/libelogind/sd-bus/test-bus-cleanup.c'],
 #          [],
 #          [threads,
@@ -808,7 +813,7 @@ tests += [
 #          [libglib,
 #           libgobject,
 #           libgio]],
-
+# 
 #         [['src/libelogind/sd-bus/test-bus-creds.c'],
 #          [],
 #          []],
@@ -822,15 +827,15 @@ tests += [
 #         [['src/libelogind/sd-bus/test-bus-kernel.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/libelogind/sd-bus/test-bus-kernel-bloom.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/libelogind/sd-bus/test-bus-benchmark.c'],
 #          [],
 #          [threads]],
-
+# 
 #         [['src/libelogind/sd-bus/test-bus-zero-copy.c'],
 #          [],
 #          []],
@@ -848,11 +853,11 @@ tests += [
 #         [['src/libelogind/sd-netlink/test-netlink.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/libelogind/sd-netlink/test-local-addresses.c'],
 #          [],
 #          []],
-
+# 
 #         [['src/libelogind/sd-resolve/test-resolve.c'],
 #          [],
 #          [threads]],
@@ -883,13 +888,13 @@ tests += [
 #          [libshared,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/libelogind-network/test-sd-dhcp-lease.c',
 #           'src/libelogind-network/dhcp-lease-internal.h'],
 #          [libshared,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/libelogind-network/test-dhcp-client.c',
 #           'src/libelogind-network/dhcp-protocol.h',
 #           'src/libelogind-network/dhcp-internal.h',
@@ -897,33 +902,33 @@ tests += [
 #          [libshared,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/libelogind-network/test-dhcp-server.c'],
 #          [libshared,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/libelogind-network/test-ipv4ll.c',
 #           'src/libelogind-network/arp-util.h',
 #           'src/systemd/sd-ipv4ll.h'],
 #          [libshared,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/libelogind-network/test-ipv4ll-manual.c',
 #           'src/systemd/sd-ipv4ll.h'],
 #          [libshared,
 #           libelogind_network],
 #          [],
 #          '', 'manual'],
-
+# 
 #         [['src/libelogind-network/test-acd.c',
 #           'src/systemd/sd-ipv4acd.h'],
 #          [libshared,
 #           libelogind_network],
 #          [],
 #          '', 'manual'],
-
+# 
 #         [['src/libelogind-network/test-ndisc-rs.c',
 #           'src/libelogind-network/dhcp-identifier.h',
 #           'src/libelogind-network/dhcp-identifier.c',
@@ -933,14 +938,14 @@ tests += [
 #          [libshared,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/libelogind-network/test-ndisc-ra.c',
 #           'src/libelogind-network/icmp6-util.h',
 #           'src/systemd/sd-ndisc.h'],
 #          [libshared,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/libelogind-network/test-dhcp6-client.c',
 #           'src/libelogind-network/dhcp-identifier.h',
 #           'src/libelogind-network/dhcp-identifier.c',
@@ -949,7 +954,7 @@ tests += [
 #          [libshared,
 #           libelogind_network],
 #          []],
-
+# 
 #         [['src/libelogind-network/test-lldp.c'],
 #          [libshared,
 #           libelogind_network],
@@ -972,7 +977,5 @@ tests += [
         [['src/login/test-login-tables.c'],
          [liblogind_core,
           libshared],
-         [threads,
-          libaudit,
-          libudev]],
+         [threads]],
 ]