From: Daan De Meyer Date: Wed, 21 May 2025 07:45:06 +0000 (+0200) Subject: test: Clean up includes X-Git-Tag: v258-rc1~557^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa34123c355af2819858e2bb1a7daacb38a534cc;p=thirdparty%2Fsystemd.git test: Clean up includes To make sure everything still compiles, we add a preliminary include of forward.h to tests.h to make sure it is included in every test source file. We'll clean up the tests.h includes in a later commit. We also add a include to errno-list.h to keep test-errno-list.c compiling. It'll be removed again when we clean up includes in src/basic. Split out of #37344. --- diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h index afe54d0e8c4..e4a59788296 100644 --- a/src/basic/errno-list.h +++ b/src/basic/errno-list.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include #include #include diff --git a/src/shared/tests.h b/src/shared/tests.h index eae1d76ee03..c9ebafdd83b 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -10,6 +10,7 @@ #include "argv-util.h" #include "errno-util.h" #include "extract-word.h" +#include "forward.h" #include "log.h" #include "macro.h" #include "process-util.h" diff --git a/src/test/nss-test-util.c b/src/test/nss-test-util.c index 11cc7e4f0b5..7b17c213674 100644 --- a/src/test/nss-test-util.c +++ b/src/test/nss-test-util.c @@ -4,7 +4,6 @@ #include #include -#include "alloc-util.h" #include "log.h" #include "nss-test-util.h" #include "string-util.h" diff --git a/src/test/nss-test-util.h b/src/test/nss-test-util.h index f081e6467ed..efd65845c57 100644 --- a/src/test/nss-test-util.h +++ b/src/test/nss-test-util.h @@ -2,7 +2,8 @@ #pragma once #include -#include + +#include "forward.h" const char* nss_status_to_string(enum nss_status status, char *buf, size_t buf_len); void* nss_open_handle(const char *dir, const char *module, int flags); diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c index bd68f58baeb..5967c4b4061 100644 --- a/src/test/test-acl-util.c +++ b/src/test/test-acl-util.c @@ -9,9 +9,9 @@ #include "errno-util.h" #include "fd-util.h" #include "format-util.h" -#include "fs-util.h" #include "path-util.h" #include "string-util.h" +#include "strv.h" #include "tests.h" #include "tmpfile-util.h" #include "user-util.h" diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c index 1623c483a88..2dbb3097d9e 100644 --- a/src/test/test-af-list.c +++ b/src/test/test-af-list.c @@ -1,9 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - -#include "macro.h" -#include "string-util.h" #include "tests.h" _unused_ diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c index 24cb5f73eb7..46d67284e9b 100644 --- a/src/test/test-alloc-util.c +++ b/src/test/test-alloc-util.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "alloc-util.h" -#include "macro.h" #include "memory-util.h" #include "random-util.h" #include "tests.h" diff --git a/src/test/test-arphrd-util.c b/src/test/test-arphrd-util.c index 72ff9565586..59f375426b4 100644 --- a/src/test/test-arphrd-util.c +++ b/src/test/test-arphrd-util.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "arphrd-util.h" -#include "string-util.h" #include "tests.h" TEST(arphrd) { diff --git a/src/test/test-async.c b/src/test/test-async.c index 7b0f7dc6bef..2edc1088b88 100644 --- a/src/test/test-async.c +++ b/src/test/test-async.c @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include #include "async.h" #include "fs-util.h" #include "path-util.h" +#include "pidref.h" #include "process-util.h" #include "signal-util.h" #include "tests.h" diff --git a/src/test/test-audit-util.c b/src/test/test-audit-util.c index 75df1426a60..af2813d6170 100644 --- a/src/test/test-audit-util.c +++ b/src/test/test-audit-util.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "audit-util.h" +#include "format-util.h" +#include "pidref.h" #include "tests.h" TEST(audit_loginuid_from_pid) { diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c index f965a6c06d6..ccafe5b0666 100644 --- a/src/test/test-barrier.c +++ b/src/test/test-barrier.c @@ -9,7 +9,7 @@ * increase it at the slightly cost of lengthen test-duration on other machines. */ -#include +#include #include #include #include diff --git a/src/test/test-bitfield.c b/src/test/test-bitfield.c index f26b423940e..89c3d663158 100644 --- a/src/test/test-bitfield.c +++ b/src/test/test-bitfield.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "bitfield.h" -#include "log.h" #include "tests.h" #define TEST_BITS(bits, v, ...) \ diff --git a/src/test/test-blockdev-util.c b/src/test/test-blockdev-util.c index 6ede05852d9..5e5eee0e60e 100644 --- a/src/test/test-blockdev-util.c +++ b/src/test/test-blockdev-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "sd-daemon.h" + #include "blockdev-util.h" #include "device-util.h" #include "errno-util.h" diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c index 677172964f1..3917bb0c1dc 100644 --- a/src/test/test-boot-timestamps.c +++ b/src/test/test-boot-timestamps.c @@ -1,14 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - #include "acpi-fpdt.h" #include "boot-timestamps.h" #include "efi-loader.h" #include "errno-util.h" #include "log.h" #include "tests.h" +#include "time-util.h" static int test_acpi_fpdt(void) { usec_t loader_start, loader_exit; diff --git a/src/test/test-bpf-devices.c b/src/test/test-bpf-devices.c index 1642673e756..2694b1eebc8 100644 --- a/src/test/test-bpf-devices.c +++ b/src/test/test-bpf-devices.c @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include "alloc-util.h" #include "bpf-devices.h" #include "bpf-program.h" #include "cgroup-setup.h" +#include "cgroup.h" #include "errno-list.h" #include "fd-util.h" #include "fs-util.h" #include "path-util.h" +#include "strv.h" #include "tests.h" static void test_policy_closed(const char *cgroup_path, BPFProgram **installed_prog) { diff --git a/src/test/test-bpf-firewall.c b/src/test/test-bpf-firewall.c index 8f3c7b41d83..82f03a1e899 100644 --- a/src/test/test-bpf-firewall.c +++ b/src/test/test-bpf-firewall.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include "bpf-firewall.h" @@ -10,8 +9,10 @@ #include "load-fragment.h" #include "manager.h" #include "memory-util.h" +#include "path-util.h" #include "rm-rf.h" #include "service.h" +#include "set.h" #include "tests.h" #include "unit-serialize.h" #include "virt.h" diff --git a/src/test/test-bpf-foreign-programs.c b/src/test/test-bpf-foreign-programs.c index 1b1f1762c9d..f2de3553dd8 100644 --- a/src/test/test-bpf-foreign-programs.c +++ b/src/test/test-bpf-foreign-programs.c @@ -1,18 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include #include -#include #include -#include "bpf-foreign.h" +#include "bpf-program.h" #include "load-fragment.h" #include "manager.h" #include "process-util.h" #include "rlimit-util.h" #include "rm-rf.h" #include "service.h" +#include "strv.h" #include "tests.h" #include "unit.h" #include "virt.h" diff --git a/src/test/test-bpf-restrict-fs.c b/src/test/test-bpf-restrict-fs.c index 522bb010e7c..29a1470dc60 100644 --- a/src/test/test-bpf-restrict-fs.c +++ b/src/test/test-bpf-restrict-fs.c @@ -10,7 +10,6 @@ #include "strv.h" #include "tests.h" #include "unit.h" -#include "virt.h" static int test_restrict_filesystems(Manager *m, const char *unit_name, const char *file_path, char **allowed_filesystems) { _cleanup_free_ char *exec_start = NULL; diff --git a/src/test/test-btrfs-physical-offset.c b/src/test/test-btrfs-physical-offset.c index 221c08e57e3..e039a63b933 100644 --- a/src/test/test-btrfs-physical-offset.c +++ b/src/test/test-btrfs-physical-offset.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include "btrfs-util.h" #include "fd-util.h" -#include "format-util.h" #include "log.h" #include "memory-util.h" #include "tests.h" diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index 326712a42dd..d81c129d65e 100644 --- a/src/test/test-btrfs.c +++ b/src/test/test-btrfs.c @@ -2,6 +2,7 @@ #include #include +#include #include "btrfs-util.h" #include "fd-util.h" @@ -11,6 +12,7 @@ #include "log.h" #include "string-util.h" #include "tests.h" +#include "time-util.h" int main(int argc, char *argv[]) { BtrfsQuotaInfo quota; diff --git a/src/test/test-bus-util.c b/src/test/test-bus-util.c index 491e790f6a7..6361d7f17a1 100644 --- a/src/test/test-bus-util.c +++ b/src/test/test-bus-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "sd-bus.h" + #include "bus-util.h" #include "log.h" #include "tests.h" diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index e8c50ead9f7..496fffc4d06 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -1,11 +1,15 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include +#include + #include "alloc-util.h" #include "calendarspec.h" #include "env-util.h" #include "errno-util.h" #include "string-util.h" #include "tests.h" +#include "time-util.h" static void _test_one(int line, const char *input, const char *output) { _cleanup_(calendar_spec_freep) CalendarSpec *c = NULL; diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c index 0fb2f31ed27..945c5ccec77 100644 --- a/src/test/test-cap-list.c +++ b/src/test/test-cap-list.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "alloc-util.h" #include "cap-list.h" diff --git a/src/test/test-capability.c b/src/test/test-capability.c index 9d863daf2b4..881aafbc7f4 100644 --- a/src/test/test-capability.c +++ b/src/test/test-capability.c @@ -3,10 +3,12 @@ #include #include #include +#include #include #include #include #include +#include "pidref.h" #define TEST_CAPABILITY_C @@ -15,10 +17,8 @@ #include "errno-util.h" #include "fd-util.h" #include "fileio.h" -#include "macro.h" #include "parse-util.h" #include "process-util.h" -#include "string-util.h" #include "tests.h" static uid_t test_uid = -1; diff --git a/src/test/test-cgroup-cpu.c b/src/test/test-cgroup-cpu.c index fcf84d379c1..cc9b732e09f 100644 --- a/src/test/test-cgroup-cpu.c +++ b/src/test/test-cgroup-cpu.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "cgroup.h" -#include "log.h" #include "tests.h" +#include "time-util.h" TEST(group_cpu_adjust_period) { /* Period 1ms, quota 40% -> Period 2.5ms */ diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index f73372d6314..42a055e50f6 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -1,13 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "cgroup.h" #include "cgroup-util.h" -#include "macro.h" #include "manager.h" #include "rm-rf.h" -#include "string-util.h" #include "tests.h" #include "unit.h" diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c index 818d75eeac2..2e53b0e1c8d 100644 --- a/src/test/test-cgroup-unit-default.c +++ b/src/test/test-cgroup-unit-default.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "cgroup.h" #include "manager.h" #include "rm-rf.h" diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index 5bd3427ab4a..4e7d52f5bcf 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -2,19 +2,15 @@ #include "alloc-util.h" #include "cgroup-util.h" -#include "dirent-util.h" #include "errno-util.h" #include "fd-util.h" #include "format-util.h" -#include "parse-util.h" -#include "proc-cmdline.h" +#include "path-util.h" +#include "pidref.h" #include "process-util.h" #include "special.h" -#include "stat-util.h" #include "string-util.h" -#include "strv.h" #include "tests.h" -#include "user-util.h" static void check_p_d_u(const char *path, int code, const char *result) { _cleanup_free_ char *unit = NULL; diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c index 8ca6eb1b9da..4d1bbd4b342 100644 --- a/src/test/test-cgroup.c +++ b/src/test/test-cgroup.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "cgroup-setup.h" #include "cgroup-util.h" #include "errno-util.h" diff --git a/src/test/test-chase.c b/src/test/test-chase.c index 469e0b5a39b..4f6e006d5e1 100644 --- a/src/test/test-chase.c +++ b/src/test/test-chase.c @@ -1,8 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "alloc-util.h" +#include "argv-util.h" #include "chase.h" #include "dirent-util.h" #include "fd-util.h" @@ -12,6 +14,7 @@ #include "path-util.h" #include "random-util.h" #include "rm-rf.h" +#include "stat-util.h" #include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-chid.c b/src/test/test-chid.c index 2faf886c977..564b09c183e 100644 --- a/src/test/test-chid.c +++ b/src/test/test-chid.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "chid-fundamental.h" -#include "string-util.h" #include "tests.h" const char16_t *const test_fields[_CHID_SMBIOS_FIELDS_MAX] = { diff --git a/src/test/test-chown-rec.c b/src/test/test-chown-rec.c index 7558de71385..4b3a6f5247b 100644 --- a/src/test/test-chown-rec.c +++ b/src/test/test-chown-rec.c @@ -1,11 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include -#include "alloc-util.h" #include "chown-recursive.h" -#include "log.h" #include "rm-rf.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-clock.c b/src/test/test-clock.c index 5115bd83c2c..f31b3613246 100644 --- a/src/test/test-clock.c +++ b/src/test/test-clock.c @@ -3,15 +3,12 @@ Copyright © 2016 Canonical Ltd. ***/ -#include #include #include "clock-util.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "log.h" -#include "macro.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-compress-benchmark.c b/src/test/test-compress-benchmark.c index c4e19f9256e..59e215122d2 100644 --- a/src/test/test-compress-benchmark.c +++ b/src/test/test-compress-benchmark.c @@ -2,15 +2,12 @@ #include "alloc-util.h" #include "compress.h" -#include "env-util.h" -#include "macro.h" -#include "memory-util.h" #include "nulstr-util.h" #include "parse-util.h" #include "process-util.h" #include "random-util.h" -#include "string-util.h" #include "tests.h" +#include "time-util.h" typedef int (compress_t)(const void *src, uint64_t src_size, void *dst, size_t dst_alloc_size, size_t *dst_size, int level); diff --git a/src/test/test-compress.c b/src/test/test-compress.c index 56a468ab88a..01e6e9863a9 100644 --- a/src/test/test-compress.c +++ b/src/test/test-compress.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include +#include #if HAVE_LZ4 #include @@ -10,9 +12,6 @@ #include "compress.h" #include "dlfcn-util.h" #include "fd-util.h" -#include "fs-util.h" -#include "macro.h" -#include "memory-util.h" #include "path-util.h" #include "random-util.h" #include "tests.h" diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 19377962b7a..11b3a424189 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -16,27 +16,23 @@ #include "condition.h" #include "confidential-virt.h" #include "cpu-set-util.h" -#include "efi-loader.h" +#include "efivars.h" #include "env-util.h" #include "errno-util.h" #include "fileio.h" #include "fs-util.h" #include "hostname-setup.h" -#include "hostname-util.h" #include "id128-util.h" #include "ima-util.h" #include "libaudit-util.h" #include "limits-util.h" #include "log.h" -#include "macro.h" #include "nulstr-util.h" #include "os-util.h" #include "path-util.h" -#include "process-util.h" #include "psi-util.h" #include "rm-rf.h" #include "selinux-util.h" -#include "set.h" #include "smack-util.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c index 4253490443f..cd3b2c2d1c6 100644 --- a/src/test/test-conf-files.c +++ b/src/test/test-conf-files.c @@ -3,16 +3,12 @@ Copyright © 2014 Michael Marineau ***/ -#include -#include +#include #include "alloc-util.h" #include "conf-files.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" -#include "macro.h" -#include "mkdir.h" #include "path-util.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index d00444e24f8..86b3a565ad9 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -3,16 +3,13 @@ #include "conf-parser.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "log.h" -#include "macro.h" #include "mkdir.h" #include "rm-rf.h" -#include "string-util.h" #include "strv.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" -#include "user-util.h" static void test_config_parse_path_one(const char *rvalue, const char *expected) { _cleanup_free_ char *path = NULL; diff --git a/src/test/test-copy.c b/src/test/test-copy.c index ac98bcf2a18..72047790412 100644 --- a/src/test/test-copy.c +++ b/src/test/test-copy.c @@ -5,24 +5,24 @@ #include #include "alloc-util.h" +#include "argv-util.h" #include "chase.h" #include "copy.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" +#include "hashmap.h" #include "hexdecoct.h" #include "io-util.h" #include "log.h" -#include "macro.h" #include "mkdir.h" #include "path-util.h" -#include "random-util.h" #include "rm-rf.h" +#include "stat-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" #include "tmpfile-util.h" -#include "user-util.h" #include "xattr-util.h" TEST(copy_file) { diff --git a/src/test/test-core-unit.c b/src/test/test-core-unit.c index 83c8674c6f0..433eff512a3 100644 --- a/src/test/test-core-unit.c +++ b/src/test/test-core-unit.c @@ -2,6 +2,7 @@ #include "alloc-util.h" #include "escape.h" +#include "strv.h" #include "tests.h" #include "unit.h" diff --git a/src/test/test-coredump-util.c b/src/test/test-coredump-util.c index 2f66ed63e02..5ad5f5ff362 100644 --- a/src/test/test-coredump-util.c +++ b/src/test/test-coredump-util.c @@ -7,7 +7,6 @@ #include "fd-util.h" #include "fileio.h" #include "format-util.h" -#include "macro.h" #include "tests.h" TEST(coredump_filter_to_from_string) { diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c index 4fbb7717c55..4758ddeadd5 100644 --- a/src/test/test-cpu-set-util.c +++ b/src/test/test-cpu-set-util.c @@ -2,8 +2,6 @@ #include "alloc-util.h" #include "cpu-set-util.h" -#include "macro.h" -#include "string-util.h" #include "tests.h" TEST(parse_cpu_set) { diff --git a/src/test/test-cryptolib.c b/src/test/test-cryptolib.c index 4f51ead42ad..1a09297a3fe 100644 --- a/src/test/test-cryptolib.c +++ b/src/test/test-cryptolib.c @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" -#include "macro.h" #include "openssl-util.h" -#include "string-util.h" #include "tests.h" TEST(string_hashsum) { diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c index 957f0f2a80f..1d3ac41cdd0 100644 --- a/src/test/test-daemon.c +++ b/src/test/test-daemon.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "sd-daemon.h" #include "parse-util.h" diff --git a/src/test/test-data-fd-util.c b/src/test/test-data-fd-util.c index ef047a3c6a6..97b5cd4a7e5 100644 --- a/src/test/test-data-fd-util.c +++ b/src/test/test-data-fd-util.c @@ -1,16 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include +#include #include #include "data-fd-util.h" #include "fd-util.h" #include "memfd-util.h" -#include "memory-util.h" #include "process-util.h" -#include "random-util.h" #include "tests.h" static void assert_equal_fd(int fd1, int fd2) { diff --git a/src/test/test-date.c b/src/test/test-date.c index f39720aba9a..7005f37283f 100644 --- a/src/test/test-date.c +++ b/src/test/test-date.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "alloc-util.h" diff --git a/src/test/test-dev-setup.c b/src/test/test-dev-setup.c index b748809eb15..75ea33d9fdb 100644 --- a/src/test/test-dev-setup.c +++ b/src/test/test-dev-setup.c @@ -1,8 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "capability-util.h" #include "dev-setup.h" -#include "fs-util.h" #include "mkdir.h" #include "path-util.h" #include "rm-rf.h" diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c index 36fa2ce8eed..2515d5895e9 100644 --- a/src/test/test-device-nodes.c +++ b/src/test/test-device-nodes.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "alloc-util.h" #include "device-nodes.h" -#include "string-util.h" #include "tests.h" /* helpers for test_encode_devnode_name */ diff --git a/src/test/test-dirent-util.c b/src/test/test-dirent-util.c index cb31edcdc64..b5a903fa11d 100644 --- a/src/test/test-dirent-util.c +++ b/src/test/test-dirent-util.c @@ -1,18 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include +#include #include #include -#include "alloc-util.h" #include "dirent-util.h" #include "fs-util.h" -#include "mkdir.h" -#include "path-util.h" #include "rm-rf.h" -#include "stat-util.h" #include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-display-quota.c b/src/test/test-display-quota.c index 0fe9e33956a..c7f0cca5c2a 100644 --- a/src/test/test-display-quota.c +++ b/src/test/test-display-quota.c @@ -6,8 +6,9 @@ #include "format-util.h" #include "log.h" #include "main-func.h" -#include "missing_syscall.h" #include "quota-util.h" +#include "strv.h" +#include "user-util.h" #include "userdb.h" static int show_quota(uid_t uid, const char *path) { diff --git a/src/test/test-dlopen-so.c b/src/test/test-dlopen-so.c index 6d56c19b89d..e044c0fca39 100644 --- a/src/test/test-dlopen-so.c +++ b/src/test/test-dlopen-so.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "apparmor-util.h" #include "bpf-dlopen.h" @@ -12,7 +11,6 @@ #include "idn-util.h" #include "libarchive-util.h" #include "libfido2-util.h" -#include "macro.h" #include "main-func.h" #include "module-util.h" #include "password-quality-util-passwdqc.h" diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c index fd5bc32d5bf..91e1d2f8a38 100644 --- a/src/test/test-dlopen.c +++ b/src/test/test-dlopen.c @@ -3,8 +3,7 @@ #include #include -#include "assert-util.h" -#include "macro.h" +#include "forward.h" int main(int argc, char **argv) { void *handles[argc - 1]; diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c index 302fcfb7fbe..f1d11305c1d 100644 --- a/src/test/test-dns-domain.c +++ b/src/test/test-dns-domain.c @@ -2,7 +2,7 @@ #include "alloc-util.h" #include "dns-domain.h" -#include "macro.h" +#include "in-addr-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c index d70b727cee7..83978446e18 100644 --- a/src/test/test-ellipsize.c +++ b/src/test/test-ellipsize.c @@ -4,7 +4,6 @@ #include "alloc-util.h" #include "ansi-color.h" -#include "constants.h" #include "escape.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-emergency-action.c b/src/test/test-emergency-action.c index 5c0ce7f0530..768ff02a79f 100644 --- a/src/test/test-emergency-action.c +++ b/src/test/test-emergency-action.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "emergency-action.h" +#include "runtime-scope.h" #include "tests.h" TEST(parse_emergency_action) { diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 57774d04c54..56b7920d8d7 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include "bus-util.h" +#include "sd-bus.h" + #include "manager.h" #include "manager-dump.h" #include "rm-rf.h" diff --git a/src/test/test-env-file.c b/src/test/test-env-file.c index f34b2aac723..69c8e48daaf 100644 --- a/src/test/test-env-file.c +++ b/src/test/test-env-file.c @@ -4,7 +4,6 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "strv.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c index 7eda66bd3ec..aa733704bc9 100644 --- a/src/test/test-env-util.c +++ b/src/test/test-env-util.c @@ -1,13 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "env-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" #include "parse-util.h" #include "process-util.h" -#include "serialize.h" -#include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-errno-list.c b/src/test/test-errno-list.c index 032cf3bb11d..fb921802794 100644 --- a/src/test/test-errno-list.c +++ b/src/test/test-errno-list.c @@ -1,11 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "errno-list.h" #include "errno-to-name.h" -#include "macro.h" -#include "string-util.h" #include "tests.h" TEST(errno_list) { diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c index a04e95223a3..1a0154fb059 100644 --- a/src/test/test-errno-util.c +++ b/src/test/test-errno-util.c @@ -2,7 +2,6 @@ #include "errno-util.h" #include "stdio-util.h" -#include "string-util.h" #include "tests.h" TEST(strerror_not_threadsafe) { diff --git a/src/test/test-escape.c b/src/test/test-escape.c index e4dfe32c04d..7162f7ff2dc 100644 --- a/src/test/test-escape.c +++ b/src/test/test-escape.c @@ -2,7 +2,6 @@ #include "alloc-util.h" #include "escape.h" -#include "macro.h" #include "tests.h" TEST(cescape) { diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c index 6987e558ba4..6accb28b565 100644 --- a/src/test/test-exec-util.c +++ b/src/test/test-exec-util.c @@ -1,20 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include -#include #include #include "alloc-util.h" #include "constants.h" -#include "copy.h" #include "env-util.h" #include "exec-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" #include "log.h" -#include "macro.h" #include "path-util.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 1eddf11dd19..88738dd4c98 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -3,22 +3,23 @@ #include #include #include +#include #include #include -#include #include "sd-event.h" +#include "argv-util.h" #include "build-path.h" #include "capability-util.h" #include "copy.h" #include "cpu-set-util.h" #include "dropin.h" #include "errno-list.h" +#include "extract-word.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "manager.h" #include "mkdir.h" #include "mount-util.h" @@ -30,9 +31,9 @@ #include "signal-util.h" #include "stat-util.h" #include "static-destruct.h" +#include "strv.h" #include "sysctl-util.h" #include "tests.h" -#include "tmpfile-util.h" #include "unit.h" #include "user-util.h" #include "virt.h" diff --git a/src/test/test-exit-status.c b/src/test/test-exit-status.c index aab81935192..a24ae5a8285 100644 --- a/src/test/test-exit-status.c +++ b/src/test/test-exit-status.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "exit-status.h" -#include "string-util.h" #include "tests.h" TEST(exit_status_to_string) { diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c index 4c18a45231b..aad9bbc47de 100644 --- a/src/test/test-extract-word.c +++ b/src/test/test-extract-word.c @@ -1,11 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - #include "extract-word.h" -#include "log.h" -#include "string-util.h" #include "tests.h" TEST(extract_first_word) { diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index 2ebc776f479..768a02f5961 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -7,12 +7,8 @@ #include "alloc-util.h" #include "fd-util.h" -#include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "memfd-util.h" -#include "memory-util.h" -#include "missing_syscall.h" #include "mkdir.h" #include "mount-util.h" #include "namespace-util.h" @@ -24,7 +20,6 @@ #include "seccomp-util.h" #include "serialize.h" #include "stat-util.h" -#include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c index 7aeaf5f129c..4d4c5716d67 100644 --- a/src/test/test-fdset.c +++ b/src/test/test-fdset.c @@ -1,12 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "fd-util.h" #include "fdset.h" -#include "fs-util.h" -#include "macro.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-fiemap.c b/src/test/test-fiemap.c index 9094a2b9f1d..5f7ad54bb6e 100644 --- a/src/test/test-fiemap.c +++ b/src/test/test-fiemap.c @@ -1,13 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include -#include -#include +#include #include -#include "errno-util.h" +#include "argv-util.h" #include "fd-util.h" #include "hibernate-util.h" #include "log.h" diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 731a37caf1d..744fb494278 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -1,12 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include #include "alloc-util.h" -#include "ctype.h" #include "env-file.h" #include "env-util.h" #include "errno-util.h" diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c index 93223be29de..1a2121d0849 100644 --- a/src/test/test-firewall-util.c +++ b/src/test/test-firewall-util.c @@ -1,9 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "firewall-util.h" #include "firewall-util-private.h" +#include "in-addr-util.h" #include "log.h" #include "random-util.h" #include "socket-util.h" diff --git a/src/test/test-format-table.c b/src/test/test-format-table.c index 0c80770c4dd..0f16ebffec8 100644 --- a/src/test/test-format-table.c +++ b/src/test/test-format-table.c @@ -1,12 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "alloc-util.h" #include "format-table.h" #include "json-util.h" -#include "string-util.h" -#include "strv.h" #include "terminal-util.h" #include "tests.h" #include "time-util.h" diff --git a/src/test/test-format-util.c b/src/test/test-format-util.c index 8afba4e585f..0a95837dbef 100644 --- a/src/test/test-format-util.c +++ b/src/test/test-format-util.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "format-util.h" -#include "macro.h" -#include "string-util.h" #include "tests.h" #include "uchar.h" diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c index e3c3149db12..32f7c3c6af7 100644 --- a/src/test/test-fs-util.c +++ b/src/test/test-fs-util.c @@ -1,30 +1,28 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include #include #include "alloc-util.h" +#include "argv-util.h" #include "copy.h" -#include "dirent-util.h" #include "fd-util.h" -#include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "mkdir.h" #include "path-util.h" #include "process-util.h" #include "random-util.h" #include "rm-rf.h" #include "stat-util.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "sync-util.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" #include "umask-util.h" -#include "user-util.h" #include "virt.h" static const char *arg_test_dir = NULL; diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c index 49d71f15c71..7e1a264cb9d 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include #include @@ -8,7 +8,6 @@ #include "dirent-util.h" #include "fs-util.h" #include "glob-util.h" -#include "macro.h" #include "rm-rf.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-gpt.c b/src/test/test-gpt.c index 28b53d479a0..2c793181d9c 100644 --- a/src/test/test-gpt.c +++ b/src/test/test-gpt.c @@ -1,12 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "architecture.h" -#include "glyph-util.h" #include "gpt.h" #include "log.h" #include "pretty-print.h" #include "strv.h" -#include "terminal-util.h" #include "tests.h" TEST(gpt_types_against_architectures) { diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c index 28ddff643bd..eb211c3ed73 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -5,7 +5,6 @@ #include "log.h" #include "nulstr-util.h" #include "stdio-util.h" -#include "string-util.h" #include "strv.h" #include "tests.h" #include "time-util.h" diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c index 74e68a473d9..7f25ad10114 100644 --- a/src/test/test-hashmap.c +++ b/src/test/test-hashmap.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "hashmap.h" -#include "string-util.h" #include "tests.h" unsigned custom_counter = 0; diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c index e5121d148e1..ce86dd0d2a3 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" #include "hexdecoct.h" -#include "macro.h" #include "random-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-hmac.c b/src/test/test-hmac.c index 28f7ab9460e..9c74c69da8c 100644 --- a/src/test/test-hmac.c +++ b/src/test/test-hmac.c @@ -2,7 +2,6 @@ #include "hexdecoct.h" #include "hmac.h" -#include "string-util.h" #include "tests.h" static void hmac_sha256_by_string(const char *key, const char *value, uint8_t res[static SHA256_DIGEST_SIZE]) { diff --git a/src/test/test-hostname-setup.c b/src/test/test-hostname-setup.c index fbb7de3689c..87c9f7d7515 100644 --- a/src/test/test-hostname-setup.c +++ b/src/test/test-hostname-setup.c @@ -1,16 +1,14 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +#include #include "alloc-util.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "hostname-setup.h" #include "hostname-util.h" #include "id128-util.h" -#include "string-util.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c index 2667bb7b19c..f9f24e0e03c 100644 --- a/src/test/test-hostname-util.c +++ b/src/test/test-hostname-util.c @@ -1,9 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - -#include "alloc-util.h" -#include "fileio.h" #include "hostname-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 48af629b73d..0ecdf76e806 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include +#include #include #include "sd-daemon.h" @@ -10,11 +10,10 @@ #include "alloc-util.h" #include "fd-util.h" #include "id128-util.h" -#include "macro.h" #include "path-util.h" #include "rm-rf.h" -#include "string-util.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" #define ID128_WALDI SD_ID128_MAKE(01, 02, 03, 04, 05, 06, 07, 08, 09, 0a, 0b, 0c, 0d, 0e, 0f, 10) diff --git a/src/test/test-image-policy.c b/src/test/test-image-policy.c index c1747f3440a..f35bfc6881d 100644 --- a/src/test/test-image-policy.c +++ b/src/test/test-image-policy.c @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "ansi-color.h" #include "image-policy.h" -#include "pager.h" -#include "pretty-print.h" -#include "string-util.h" #include "tests.h" static void test_policy(const ImagePolicy *p, const char *name) { diff --git a/src/test/test-import-util.c b/src/test/test-import-util.c index cc7b1396555..6934ebfcc0c 100644 --- a/src/test/test-import-util.c +++ b/src/test/test-import-util.c @@ -2,8 +2,6 @@ #include "alloc-util.h" #include "import-util.h" -#include "log.h" -#include "string-util.h" #include "tests.h" static void test_import_url_last_component_one(const char *input, const char *output, int ret) { diff --git a/src/test/test-in-addr-prefix-util.c b/src/test/test-in-addr-prefix-util.c index 2b44babf8dd..de2003dd63a 100644 --- a/src/test/test-in-addr-prefix-util.c +++ b/src/test/test-in-addr-prefix-util.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "in-addr-prefix-util.h" +#include "set.h" #include "tests.h" static void test_in_addr_prefix_to_string_one(int f, const char *addr, unsigned prefixlen) { diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c index 090407b8e37..2f38694a055 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -4,7 +4,7 @@ #include "alloc-util.h" #include "fileio.h" -#include "fs-util.h" +#include "hashmap.h" #include "install.h" #include "mkdir.h" #include "rm-rf.h" diff --git a/src/test/test-install.c b/src/test/test-install.c index 5747b84ba52..45704064b20 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -3,6 +3,7 @@ #include #include +#include "hashmap.h" #include "install.h" #include "tests.h" diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c index fa3ef865c94..45da6b83f13 100644 --- a/src/test/test-io-util.c +++ b/src/test/test-io-util.c @@ -4,10 +4,8 @@ #include #include -#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" -#include "macro.h" #include "tests.h" static void test_sparse_write_one(int fd, const char *buffer, size_t n) { diff --git a/src/test/test-ip-protocol-list.c b/src/test/test-ip-protocol-list.c index 210192d9a6d..e21ddc059ae 100644 --- a/src/test/test-ip-protocol-list.c +++ b/src/test/test-ip-protocol-list.c @@ -1,10 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "ip-protocol-list.h" -#include "macro.h" -#include "missing_network.h" #include "stdio-util.h" -#include "string-util.h" #include "tests.h" static void test_int(int i) { diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c index a8e003e649c..370da0b1347 100644 --- a/src/test/test-journal-importer.c +++ b/src/test/test-journal-importer.c @@ -1,14 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include "alloc-util.h" #include "journal-importer.h" #include "log.h" -#include "path-util.h" -#include "string-util.h" #include "tests.h" static void assert_iovec_entry(const struct iovec *iovec, const char* content) { diff --git a/src/test/test-json.c b/src/test/test-json.c index 3fe2f26274c..482e053e7ac 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include "sd-json.h" @@ -8,15 +9,16 @@ #include "alloc-util.h" #include "escape.h" #include "fd-util.h" +#include "format-util.h" #include "fileio.h" #include "iovec-util.h" #include "json-internal.h" #include "json-util.h" #include "math-util.h" #include "ordered-set.h" +#include "pidref.h" +#include "set.h" #include "string-table.h" -#include "string-util.h" -#include "strv.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-label.c b/src/test/test-label.c index 12b8a6d7481..5ce9988ce27 100644 --- a/src/test/test-label.c +++ b/src/test/test-label.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include #include diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 45b02a3c7eb..4fd3b0a07d8 100644 --- a/src/test/test-load-fragment.c +++ b/src/test/test-load-fragment.c @@ -1,31 +1,27 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include #include #include +#include "sd-daemon.h" #include "sd-id128.h" #include "all-units.h" #include "alloc-util.h" #include "capability-util.h" #include "conf-parser.h" -#include "fd-util.h" #include "fileio.h" #include "format-util.h" -#include "fs-util.h" #include "hashmap.h" #include "hostname-setup.h" -#include "hostname-util.h" #include "install.h" #include "install-printf.h" #include "load-fragment.h" -#include "macro.h" -#include "memory-util.h" +#include "manager.h" #include "open-file.h" #include "pcre2-util.h" #include "rm-rf.h" +#include "set.h" #include "specifier.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-local-addresses.c b/src/test/test-local-addresses.c index c2033bfeb32..c038a7b0f4d 100644 --- a/src/test/test-local-addresses.c +++ b/src/test/test-local-addresses.c @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include +#include "sd-netlink.h" + #include "af-list.h" #include "alloc-util.h" -#include "capability-util.h" #include "in-addr-util.h" #include "local-addresses.h" #include "netlink-util.h" diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c index f6386448bc9..e264cff5ddd 100644 --- a/src/test/test-locale-util.c +++ b/src/test/test-locale-util.c @@ -3,7 +3,6 @@ #include "glyph-util.h" #include "kbd-util.h" #include "locale-util.h" -#include "macro.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-lock-util.c b/src/test/test-lock-util.c index 5edd0875822..b68086e3ae2 100644 --- a/src/test/test-lock-util.c +++ b/src/test/test-lock-util.c @@ -7,6 +7,7 @@ #include "lock-util.h" #include "rm-rf.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" TEST(make_lock_file) { diff --git a/src/test/test-log.c b/src/test/test-log.c index 3fb08120991..87cd3628772 100644 --- a/src/test/test-log.c +++ b/src/test/test-log.c @@ -1,10 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - #include "format-util.h" -#include "io-util.h" #include "iovec-util.h" #include "iovec-wrapper.h" #include "log.h" diff --git a/src/test/test-login-util.c b/src/test/test-login-util.c index 2d20e234ef2..6c0f542be87 100644 --- a/src/test/test-login-util.c +++ b/src/test/test-login-util.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "login-util.h" -#include "string-util.h" #include "tests.h" TEST(session_id_valid) { diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c index f5dfec24e9e..d59b4b27b1e 100644 --- a/src/test/test-loop-block.c +++ b/src/test/test-loop-block.c @@ -1,19 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include #include #include -#include #include "alloc-util.h" #include "capability-util.h" #include "dissect-image.h" #include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" #include "gpt.h" +#include "loop-util.h" #include "main-func.h" #include "mkfs-util.h" #include "mount-util.h" @@ -23,8 +22,8 @@ #include "string-util.h" #include "strv.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" -#include "user-util.h" #include "virt.h" static unsigned arg_n_threads = 5; diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c index db6ee0f32dd..03dcffeafc0 100644 --- a/src/test/test-loopback.c +++ b/src/test/test-loopback.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include +#include #include "errno-util.h" #include "log.h" diff --git a/src/test/test-macro.c b/src/test/test-macro.c index 1c76e098585..3b08874b6be 100644 --- a/src/test/test-macro.c +++ b/src/test/test-macro.c @@ -1,14 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include "sd-messages.h" +#include "sd-id128.h" #include "errno-util.h" -#include "id128-util.h" -#include "log.h" -#include "macro.h" #include "tests.h" TEST(saturate_add) { diff --git a/src/test/test-memfd-util.c b/src/test/test-memfd-util.c index 6366eedc24b..e3d9c9fff60 100644 --- a/src/test/test-memfd-util.c +++ b/src/test/test-memfd-util.c @@ -4,7 +4,6 @@ #include "fd-util.h" #include "memfd-util.h" #include "missing_mman.h" -#include "string-util.h" #include "tests.h" TEST(memfd_get_sealed) { diff --git a/src/test/test-memory-util.c b/src/test/test-memory-util.c index cd4b64ac164..d5abad099e0 100644 --- a/src/test/test-memory-util.c +++ b/src/test/test-memory-util.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "memory-util.h" #include "tests.h" diff --git a/src/test/test-mempress.c b/src/test/test-mempress.c index 6f4e6586161..b33ba740c61 100644 --- a/src/test/test-mempress.c +++ b/src/test/test-mempress.c @@ -2,7 +2,9 @@ #include #include +#include #include +#include #include #include "sd-bus.h" @@ -11,6 +13,8 @@ #include "bus-locator.h" #include "bus-wait-for-jobs.h" #include "fd-util.h" +#include "format-util.h" +#include "hashmap.h" #include "path-util.h" #include "process-util.h" #include "random-util.h" @@ -18,6 +22,7 @@ #include "signal-util.h" #include "socket-util.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" #include "unit-def.h" diff --git a/src/test/test-memstream-util.c b/src/test/test-memstream-util.c index bce53e118b6..b3b1e813b13 100644 --- a/src/test/test-memstream-util.c +++ b/src/test/test-memstream-util.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "memstream-util.h" -#include "string-util.h" #include "tests.h" TEST(memstream_done) { diff --git a/src/test/test-mkdir.c b/src/test/test-mkdir.c index c6f187b2190..13dabe62759 100644 --- a/src/test/test-mkdir.c +++ b/src/test/test-mkdir.c @@ -10,8 +10,8 @@ #include "rm-rf.h" #include "stat-util.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" -#include "user-util.h" TEST(mkdir_p_safe) { _cleanup_(rm_rf_physical_and_freep) char *tmp = NULL; diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c index ce6a43101e5..a7fc06bbe14 100644 --- a/src/test/test-mount-util.c +++ b/src/test/test-mount-util.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include "alloc-util.h" @@ -9,7 +10,6 @@ #include "fileio.h" #include "fs-util.h" #include "libmount-util.h" -#include "missing_magic.h" #include "mkdir.h" #include "mount-util.h" #include "mountpoint-util.h" @@ -18,7 +18,6 @@ #include "process-util.h" #include "random-util.h" #include "rm-rf.h" -#include "stat-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c index 51d3e69be77..ee2d21825ad 100644 --- a/src/test/test-mountpoint-util.c +++ b/src/test/test-mountpoint-util.c @@ -1,16 +1,16 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include #include "alloc-util.h" -#include "constants.h" #include "fd-util.h" #include "fileio.h" +#include "fs-util.h" #include "hashmap.h" #include "log.h" -#include "missing_syscall.h" #include "mountpoint-util.h" #include "path-util.h" #include "rm-rf.h" diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index decebf737c9..14558e8794b 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -1,13 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include +#include #include #include #include +#include "sd-id128.h" + #include "alloc-util.h" #include "fd-util.h" #include "fileio.h" +#include "namespace-util.h" #include "namespace.h" #include "pidref.h" #include "process-util.h" diff --git a/src/test/test-net-naming-scheme.c b/src/test/test-net-naming-scheme.c index a339020857a..2c98f96850f 100644 --- a/src/test/test-net-naming-scheme.c +++ b/src/test/test-net-naming-scheme.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "netif-naming-scheme.h" -#include "string-util.h" #include "tests.h" #ifdef _DEFAULT_NET_NAMING_SCHEME diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c index eae13d9b4a3..02ef02be978 100644 --- a/src/test/test-netlink-manual.c +++ b/src/test/test-netlink-manual.c @@ -2,14 +2,10 @@ #include #include -#include -#include -#include #include #include "sd-netlink.h" -#include "macro.h" #include "module-util.h" #include "tests.h" diff --git a/src/test/test-nft-set.c b/src/test/test-nft-set.c index bb0c902493e..6ae2da03eb4 100644 --- a/src/test/test-nft-set.c +++ b/src/test/test-nft-set.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include "firewall-util.h" #include "in-addr-util.h" -#include "log.h" #include "netlink-internal.h" #include "parse-util.h" #include "string-util.h" diff --git a/src/test/test-notify-recv.c b/src/test/test-notify-recv.c index 3178b9da315..5820048c92c 100644 --- a/src/test/test-notify-recv.c +++ b/src/test/test-notify-recv.c @@ -1,16 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "sd-daemon.h" #include "event-util.h" #include "fd-util.h" +#include "fdset.h" #include "notify-recv.h" -#include "path-util.h" +#include "pidref.h" #include "process-util.h" -#include "rm-rf.h" -#include "socket-util.h" +#include "strv.h" #include "tests.h" typedef struct Context { diff --git a/src/test/test-ns.c b/src/test/test-ns.c index 97b9fc98669..245bf345825 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include diff --git a/src/test/test-nss-hosts.c b/src/test/test-nss-hosts.c index 1b2d1078368..df93a7b5285 100644 --- a/src/test/test-nss-hosts.c +++ b/src/test/test-nss-hosts.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include #include "af-list.h" #include "alloc-util.h" @@ -12,7 +10,6 @@ #include "format-ifname.h" #include "hexdecoct.h" #include "hostname-setup.h" -#include "hostname-util.h" #include "in-addr-util.h" #include "local-addresses.h" #include "log.h" @@ -22,7 +19,6 @@ #include "parse-util.h" #include "path-util.h" #include "socket-util.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-nss-users.c b/src/test/test-nss-users.c index 9033fd22c96..0f78995fb72 100644 --- a/src/test/test-nss-users.c +++ b/src/test/test-nss-users.c @@ -2,8 +2,6 @@ #include #include -#include -#include #include "alloc-util.h" #include "dlfcn-util.h" @@ -15,11 +13,9 @@ #include "nss-util.h" #include "parse-util.h" #include "path-util.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" #include "tests.h" -#include "user-util.h" static size_t arg_bufsize = 1024; diff --git a/src/test/test-ordered-set.c b/src/test/test-ordered-set.c index 45e41572968..7125dab2c24 100644 --- a/src/test/test-ordered-set.c +++ b/src/test/test-ordered-set.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "ordered-set.h" -#include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-os-util.c b/src/test/test-os-util.c index 709ee04d6b8..e40c4b49a20 100644 --- a/src/test/test-os-util.c +++ b/src/test/test-os-util.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include "fileio.h" -#include "fs-util.h" #include "log.h" #include "mkdir.h" #include "os-util.h" diff --git a/src/test/test-parse-argument.c b/src/test/test-parse-argument.c index 9fb1a17b24c..d3d88cf0d1c 100644 --- a/src/test/test-parse-argument.c +++ b/src/test/test-parse-argument.c @@ -2,6 +2,8 @@ #include +#include "sd-json.h" + #include "parse-argument.h" #include "stdio-util.h" #include "tests.h" diff --git a/src/test/test-parse-helpers.c b/src/test/test-parse-helpers.c index 483ea671ac7..041d3816540 100644 --- a/src/test/test-parse-helpers.c +++ b/src/test/test-parse-helpers.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include +#include #include -#include "macro.h" #include "parse-helpers.h" #include "tests.h" diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c index a2bb8cf3c3c..2a54dae2a46 100644 --- a/src/test/test-parse-util.c +++ b/src/test/test-parse-util.c @@ -1,16 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include #include +#include #include -#include "alloc-util.h" -#include "errno-list.h" -#include "log.h" #include "parse-util.h" -#include "string-util.h" #include "tests.h" TEST(parse_boolean) { diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c index cff27749317..67f3317be25 100644 --- a/src/test/test-path-lookup.c +++ b/src/test/test-path-lookup.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include "log.h" #include "path-lookup.h" diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index e11599e1859..aa4350e9678 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include "alloc-util.h" +#include "argv-util.h" #include "exec-util.h" #include "fd-util.h" -#include "fs-util.h" -#include "macro.h" #include "path-util.h" #include "process-util.h" #include "rm-rf.h" diff --git a/src/test/test-path.c b/src/test/test-path.c index a20535c1b9b..317537700a9 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -1,17 +1,14 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include -#include #include "all-units.h" #include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" -#include "macro.h" #include "manager.h" #include "mkdir.h" -#include "path-util.h" #include "rm-rf.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-percent-util.c b/src/test/test-percent-util.c index 7e8e11b49ce..5fa680e0647 100644 --- a/src/test/test-percent-util.c +++ b/src/test/test-percent-util.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #include "percent-util.h" #include "tests.h" -#include "time-util.h" TEST(parse_percent) { assert_se(parse_percent("") == -EINVAL); diff --git a/src/test/test-pidref.c b/src/test/test-pidref.c index cb7feb03471..0f6126c5b4f 100644 --- a/src/test/test-pidref.c +++ b/src/test/test-pidref.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" +#include "format-util.h" #include "pidref.h" #include "process-util.h" -#include "signal-util.h" #include "stdio-util.h" #include "tests.h" diff --git a/src/test/test-pretty-print.c b/src/test/test-pretty-print.c index 9ab52c60129..71d8799cbfd 100644 --- a/src/test/test-pretty-print.c +++ b/src/test/test-pretty-print.c @@ -1,14 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include -#include #include #include "alloc-util.h" -#include "macro.h" #include "pretty-print.h" -#include "strv.h" #include "tests.h" #define CYLON_WIDTH 6 diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c index 7f0540e01c8..8ae9d811e07 100644 --- a/src/test/test-proc-cmdline.c +++ b/src/test/test-proc-cmdline.c @@ -1,15 +1,13 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "alloc-util.h" -#include "env-util.h" #include "errno-util.h" #include "initrd-util.h" #include "log.h" -#include "macro.h" #include "nulstr-util.h" #include "proc-cmdline.h" -#include "process-util.h" -#include "special.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index 6747054cc92..376b20b0484 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -3,32 +3,34 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include +#include "strv.h" #if HAVE_VALGRIND_VALGRIND_H #include #endif +#include "sd-daemon.h" + #include "alloc-util.h" #include "architecture.h" -#include "dirent-util.h" +#include "argv-util.h" #include "errno-list.h" #include "errno-util.h" #include "fd-util.h" #include "ioprio-util.h" #include "log.h" -#include "macro.h" #include "missing_sched.h" -#include "missing_syscall.h" #include "namespace-util.h" #include "parse-util.h" #include "pidfd-util.h" +#include "pidref.h" #include "process-util.h" #include "procfs-util.h" #include "rlimit-util.h" @@ -37,6 +39,7 @@ #include "string-util.h" #include "terminal-util.h" #include "tests.h" +#include "time-util.h" #include "user-util.h" #include "virt.h" diff --git a/src/test/test-procfs-util.c b/src/test/test-procfs-util.c index 4835b0461e7..9c5340a30f6 100644 --- a/src/test/test-procfs-util.c +++ b/src/test/test-procfs-util.c @@ -1,13 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "errno-util.h" #include "format-util.h" #include "log.h" #include "process-util.h" #include "procfs-util.h" #include "tests.h" +#include "time-util.h" int main(int argc, char *argv[]) { nsec_t nsec; diff --git a/src/test/test-progress-bar.c b/src/test/test-progress-bar.c index b199741cf56..b8a78223aed 100644 --- a/src/test/test-progress-bar.c +++ b/src/test/test-progress-bar.c @@ -1,8 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "format-util.h" #include "pretty-print.h" +#include "process-util.h" #include "random-util.h" #include "tests.h" +#include "time-util.h" #define PROGRESS_PREFIX "test:" diff --git a/src/test/test-psi-util.c b/src/test/test-psi-util.c index 4ce0811a8d9..1bb25c2b11b 100644 --- a/src/test/test-psi-util.c +++ b/src/test/test-psi-util.c @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "parse-util.h" #include "psi-util.h" #include "tests.h" diff --git a/src/test/test-qrcode-util.c b/src/test/test-qrcode-util.c index 221ad854c20..3545c656fb2 100644 --- a/src/test/test-qrcode-util.c +++ b/src/test/test-qrcode-util.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "locale-util.h" +#include + #include "main-func.h" #include "qrcode-util.h" #include "tests.h" diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c index de208c74083..d8883706ebe 100644 --- a/src/test/test-ratelimit.c +++ b/src/test/test-ratelimit.c @@ -2,7 +2,6 @@ #include -#include "macro.h" #include "ratelimit.h" #include "tests.h" #include "time-util.h" diff --git a/src/test/test-raw-clone.c b/src/test/test-raw-clone.c index a43e2c2c29a..097bbfe29aa 100644 --- a/src/test/test-raw-clone.c +++ b/src/test/test-raw-clone.c @@ -5,7 +5,7 @@ #include "errno-util.h" #include "format-util.h" -#include "missing_syscall.h" +#include "missing_sched.h" #include "raw-clone.h" #include "tests.h" diff --git a/src/test/test-recovery-key.c b/src/test/test-recovery-key.c index 8d5ed717d97..b6782f67c9f 100644 --- a/src/test/test-recovery-key.c +++ b/src/test/test-recovery-key.c @@ -2,8 +2,6 @@ #include -#include "memory-util.h" -#include "random-util.h" #include "recovery-key.h" #include "tests.h" diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c index 8684d064ec3..1502e7f7a89 100644 --- a/src/test/test-recurse-dir.c +++ b/src/test/test-recurse-dir.c @@ -6,8 +6,10 @@ #include "log.h" #include "missing_magic.h" #include "recurse-dir.h" +#include "stat-util.h" #include "strv.h" #include "tests.h" +#include "time-util.h" static char **list_nftw = NULL; diff --git a/src/test/test-replace-var.c b/src/test/test-replace-var.c index 56634a854a7..06a5e13b921 100644 --- a/src/test/test-replace-var.c +++ b/src/test/test-replace-var.c @@ -2,7 +2,6 @@ #include -#include "macro.h" #include "replace-var.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c index 55f512cf009..c8abd9d98d1 100644 --- a/src/test/test-rlimit-util.c +++ b/src/test/test-rlimit-util.c @@ -7,7 +7,6 @@ #include "alloc-util.h" #include "capability-util.h" -#include "macro.h" #include "process-util.h" #include "rlimit-util.h" #include "string-util.h" diff --git a/src/test/test-rm-rf.c b/src/test/test-rm-rf.c index e4a426324f8..1ec6148eb19 100644 --- a/src/test/test-rm-rf.c +++ b/src/test/test-rm-rf.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include -#include "alloc-util.h" #include "process-util.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/test/test-sbat.c b/src/test/test-sbat.c index c41b4192d5f..47b31ba5d31 100644 --- a/src/test/test-sbat.c +++ b/src/test/test-sbat.c @@ -2,7 +2,6 @@ /* We include efi_config.h after undefining PROJECT_VERSION which is also defined in config.h. */ #undef PROJECT_VERSION -#include "build.h" #include "efi_config.h" #include "sbat.h" #include "tests.h" diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index ff90842a0a6..ca0d75d132b 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -6,7 +6,6 @@ #include #include "all-units.h" -#include "macro.h" #include "manager.h" #include "rm-rf.h" #include "tests.h" diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c index a13f7ce7980..0030096a7c4 100644 --- a/src/test/test-sd-hwdb.c +++ b/src/test/test-sd-hwdb.c @@ -2,8 +2,6 @@ #include "sd-hwdb.h" -#include "alloc-util.h" -#include "errno.h" #include "errno-util.h" #include "hwdb-internal.h" #include "nulstr-util.h" diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c index 39a89d1e8dd..b4e8e95aa00 100644 --- a/src/test/test-seccomp.c +++ b/src/test/test-seccomp.c @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include #include #if HAVE_VALGRIND_VALGRIND_H #include @@ -19,7 +19,6 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "macro.h" #include "memory-util.h" #include "missing_sched.h" #include "missing_syscall.h" diff --git a/src/test/test-secure-bits.c b/src/test/test-secure-bits.c index 3d353aecda0..37771d0ce87 100644 --- a/src/test/test-secure-bits.c +++ b/src/test/test-secure-bits.c @@ -1,11 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "securebits-util.h" #include "strv.h" #include "tests.h" -#include "unit-file.h" static const char * const string_bits[] = { "keep-caps", diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c index e7371a81e3a..e51b3a283b1 100644 --- a/src/test/test-selinux.c +++ b/src/test/test-selinux.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include -#include "alloc-util.h" #include "fd-util.h" #include "log.h" #include "selinux-util.h" diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c index ccbd2f89dde..86b1f5f2e01 100644 --- a/src/test/test-serialize.c +++ b/src/test/test-serialize.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "escape.h" +#include "extract-word.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "log.h" #include "serialize.h" +#include "set.h" #include "strv.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-set-disable-mempool.c b/src/test/test-set-disable-mempool.c index 91244b25ac2..450c4160bff 100644 --- a/src/test/test-set-disable-mempool.c +++ b/src/test/test-set-disable-mempool.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include "mempool.h" #include "process-util.h" diff --git a/src/test/test-sha1.c b/src/test/test-sha1.c index bddc7ac241f..3a5ff148df4 100644 --- a/src/test/test-sha1.c +++ b/src/test/test-sha1.c @@ -2,7 +2,6 @@ #include "hexdecoct.h" #include "sha1-fundamental.h" -#include "string-util.h" #include "tests.h" static void sha1_process_string(const char *key, struct sha1_ctx *ctx) { diff --git a/src/test/test-sha256.c b/src/test/test-sha256.c index 1acc893c744..1f4a679ac99 100644 --- a/src/test/test-sha256.c +++ b/src/test/test-sha256.c @@ -2,7 +2,6 @@ #include "hexdecoct.h" #include "sha256.h" -#include "string-util.h" #include "tests.h" static void sha256_process_string(const char *key, struct sha256_ctx *ctx) { diff --git a/src/test/test-shift-uid.c b/src/test/test-shift-uid.c index 27fea2161cd..e1fd58ad90d 100644 --- a/src/test/test-shift-uid.c +++ b/src/test/test-shift-uid.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "log.h" #include "shift-uid.h" -#include "string-util.h" #include "tests.h" #include "user-util.h" diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c index 299463c2435..95b4717b41f 100644 --- a/src/test/test-sigbus.c +++ b/src/test/test-sigbus.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include #include diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c index 45f31b0c543..7d069a7fb24 100644 --- a/src/test/test-signal-util.c +++ b/src/test/test-signal-util.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "log.h" -#include "macro.h" #include "process-util.h" #include "signal-util.h" #include "stdio-util.h" diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index 9332f2750a3..f4c9916f15d 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,20 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include #include #include #include #include #include -#include -#include #define __STDC_WANT_IEC_60559_TYPES_EXT__ #include -#include "assert-util.h" -#include "time-util.h" +#include "forward.h" /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ diff --git a/src/test/test-socket-bind.c b/src/test/test-socket-bind.c index d0e448daa10..f6f48f67232 100644 --- a/src/test/test-socket-bind.c +++ b/src/test/test-socket-bind.c @@ -3,6 +3,7 @@ #include "bpf-socket-bind.h" #include "load-fragment.h" #include "manager.h" +#include "path-util.h" #include "process-util.h" #include "rlimit-util.h" #include "rm-rf.h" diff --git a/src/test/test-socket-netlink.c b/src/test/test-socket-netlink.c index c2a92a75441..9313439cf54 100644 --- a/src/test/test-socket-netlink.c +++ b/src/test/test-socket-netlink.c @@ -6,6 +6,7 @@ #include "fd-util.h" #include "missing_network.h" #include "socket-netlink.h" +#include "socket-util.h" #include "string-util.h" #include "tests.h" diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c index ba2b4470d1c..0313350000a 100644 --- a/src/test/test-socket-util.c +++ b/src/test/test-socket-util.c @@ -2,27 +2,21 @@ #include #include -#include -#include -#include #include #include "alloc-util.h" -#include "async.h" #include "escape.h" -#include "exit-status.h" #include "fd-util.h" #include "fs-util.h" #include "in-addr-util.h" #include "iovec-util.h" #include "log.h" -#include "macro.h" #include "path-util.h" +#include "pidref.h" #include "process-util.h" #include "random-util.h" #include "rm-rf.h" #include "socket-util.h" -#include "string-util.h" #include "tests.h" #include "tmpfile-util.h" #include "user-util.h" diff --git a/src/test/test-specifier.c b/src/test/test-specifier.c index f2f2f057c15..850f961bfed 100644 --- a/src/test/test-specifier.c +++ b/src/test/test-specifier.c @@ -1,16 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "sd-id128.h" #include "alloc-util.h" +#include "format-util.h" #include "log.h" +#include "process-util.h" +#include "runtime-scope.h" #include "specifier.h" -#include "stat-util.h" #include "stdio-util.h" -#include "string-util.h" #include "strv.h" #include "tests.h" -#include "unit-file.h" static void test_specifier_escape_one(const char *a, const char *b) { _cleanup_free_ char *x = NULL; diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c index c5aacc32f1a..fc8bad256f0 100644 --- a/src/test/test-stat-util.c +++ b/src/test/test-stat-util.c @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -11,13 +10,12 @@ #include "errno-list.h" #include "fd-util.h" #include "fs-util.h" -#include "macro.h" #include "mount-util.h" #include "mountpoint-util.h" -#include "namespace-util.h" #include "path-util.h" #include "rm-rf.h" #include "stat-util.h" +#include "strv.h" #include "tests.h" #include "tmpfile-util.h" diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c index 49ff205c53f..4e12ed73660 100644 --- a/src/test/test-strbuf.c +++ b/src/test/test-strbuf.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "nulstr-util.h" #include "strbuf.h" -#include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c index 8e6862c41da..fb3d28ed535 100644 --- a/src/test/test-string-util.c +++ b/src/test/test-string-util.c @@ -1,14 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" +#include "extract-word.h" #include "locale-util.h" -#include "macro.h" #include "string-util.h" #include "strv.h" #include "tests.h" -#include "utf8.h" TEST(string_erase) { char *x; diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 7c06e06bb43..d2524fb52b4 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -3,7 +3,7 @@ #include #include "alloc-util.h" -#include "escape.h" +#include "extract-word.h" #include "string-util.h" #include "strv.h" #include "tests.h" diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c index 00f595c4bb9..1ca5ac7c9e0 100644 --- a/src/test/test-strxcpyx.c +++ b/src/test/test-strxcpyx.c @@ -2,7 +2,6 @@ #include -#include "string-util.h" #include "strxcpyx.h" #include "tests.h" diff --git a/src/test/test-sysctl-util.c b/src/test/test-sysctl-util.c index 83d6c9036c4..16ce41cb933 100644 --- a/src/test/test-sysctl-util.c +++ b/src/test/test-sysctl-util.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include #include "sd-id128.h" #include "errno-util.h" -#include "hostname-util.h" #include "strv.h" #include "sysctl-util.h" #include "tests.h" diff --git a/src/test/test-tables.c b/src/test/test-tables.c index d6e41007604..cd05b179890 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -11,6 +11,7 @@ #include "device-private.h" #include "discover-image.h" #include "execute.h" +#include "gpt.h" #include "import-util.h" #include "install.h" #include "job.h" @@ -18,6 +19,7 @@ #include "locale-util.h" #include "log.h" #include "logs-show.h" +#include "manager.h" #include "mount.h" #include "netif-naming-scheme.h" #include "path.h" diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c index 4b7f23cf510..f128ddca1f1 100644 --- a/src/test/test-terminal-util.c +++ b/src/test/test-terminal-util.c @@ -1,18 +1,15 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include +#include #include #include -#include #include #include "alloc-util.h" #include "ansi-color.h" #include "fd-util.h" -#include "fs-util.h" -#include "macro.h" #include "path-util.h" #include "process-util.h" #include "stat-util.h" diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c index f0daa500eb6..5e01bb2fe32 100644 --- a/src/test/test-time-util.c +++ b/src/test/test-time-util.c @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include #include "env-util.h" -#include "fd-util.h" -#include "fileio.h" #include "random-util.h" #include "serialize.h" #include "string-util.h" diff --git a/src/test/test-tmpfile-util.c b/src/test/test-tmpfile-util.c index bef503bf3ef..413bbf59ab3 100644 --- a/src/test/test-tmpfile-util.c +++ b/src/test/test-tmpfile-util.c @@ -1,6 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include + #include "alloc-util.h" +#include "argv-util.h" #include "errno-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/test/test-tpm2.c b/src/test/test-tpm2.c index 4ccf7401764..8277fab9782 100644 --- a/src/test/test-tpm2.c +++ b/src/test/test-tpm2.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "hexdecoct.h" -#include "macro.h" #include "tests.h" #include "tpm2-util.h" #include "virt.h" diff --git a/src/test/test-udev-util.c b/src/test/test-udev-util.c index 07f4e018ac4..e6c339bcc77 100644 --- a/src/test/test-udev-util.c +++ b/src/test/test-udev-util.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include "macro.h" -#include "string-util.h" #include "tests.h" #include "udev-util.h" diff --git a/src/test/test-uid-classification.c b/src/test/test-uid-classification.c index 9a76ad28a07..4f82eac58db 100644 --- a/src/test/test-uid-classification.c +++ b/src/test/test-uid-classification.c @@ -1,12 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include "fd-util.h" #include "fileio.h" #include "format-util.h" -#include "fs-util.h" #include "tests.h" #include "tmpfile-util.h" #include "uid-classification.h" diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c index 6041d084906..8c4c6eb2643 100644 --- a/src/test/test-uid-range.c +++ b/src/test/test-uid-range.c @@ -1,8 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - -#include "alloc-util.h" #include "errno-util.h" #include "fd-util.h" #include "fileio.h" @@ -10,7 +7,6 @@ #include "tests.h" #include "tmpfile-util.h" #include "uid-range.h" -#include "user-util.h" #include "virt.h" TEST(uid_range) { diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c index 728c193339c..82a9f82210d 100644 --- a/src/test/test-unaligned.c +++ b/src/test/test-unaligned.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "memory-util.h" -#include "sparse-endian.h" #include "tests.h" #include "unaligned.h" diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index b934871f950..2f8b288e535 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "argv-util.h" #include "fileio.h" #include "initrd-util.h" #include "path-lookup.h" @@ -10,6 +11,7 @@ #include "special.h" #include "strv.h" #include "tests.h" +#include "time-util.h" #include "unit-file.h" TEST(unit_validate_alias_symlink_and_warn) { diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index b598eb8bc06..4eb9f052b2d 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -2,17 +2,16 @@ #include #include -#include +#include "sd-daemon.h" #include "sd-id128.h" #include "all-units.h" #include "alloc-util.h" +#include "fd-util.h" #include "format-util.h" #include "glob-util.h" #include "hostname-setup.h" -#include "hostname-util.h" -#include "macro.h" #include "manager.h" #include "path-util.h" #include "rm-rf.h" diff --git a/src/test/test-unit-serialize.c b/src/test/test-unit-serialize.c index 7a1e8a087a8..60cc82373d6 100644 --- a/src/test/test-unit-serialize.c +++ b/src/test/test-unit-serialize.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "manager.h" #include "rm-rf.h" #include "service.h" #include "tests.h" diff --git a/src/test/test-user-record.c b/src/test/test-user-record.c index 2a4df190a1a..db03a7c4ffd 100644 --- a/src/test/test-user-record.c +++ b/src/test/test-user-record.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "json-util.h" -#include "macro.h" #include "tests.h" #include "user-record.h" diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c index bf8dd16d5ba..4df9cb5edcf 100644 --- a/src/test/test-user-util.c +++ b/src/test/test-user-util.c @@ -4,7 +4,6 @@ #include "format-util.h" #include "libcrypt-util.h" #include "log.h" -#include "macro.h" #include "memory-util.h" #include "path-util.h" #include "string-util.h" diff --git a/src/test/test-utmp.c b/src/test/test-utmp.c index ca985d35727..d09d2f06513 100644 --- a/src/test/test-utmp.c +++ b/src/test/test-utmp.c @@ -1,9 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "format-util.h" -#include "socket-util.h" +#include "in-addr-util.h" #include "stdio-util.h" -#include "string-util.h" #include "tests.h" #include "utmp-wtmp.h" diff --git a/src/test/test-varlink-idl.c b/src/test/test-varlink-idl.c index 009d143fbc9..00e142ae61c 100644 --- a/src/test/test-varlink-idl.c +++ b/src/test/test-varlink-idl.c @@ -1,7 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include +#include "sd-event.h" #include "sd-varlink.h" #include "sd-varlink-idl.h" diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c index 649433b3d55..efb09ee2dd0 100644 --- a/src/test/test-varlink.c +++ b/src/test/test-varlink.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "sd-event.h" #include "sd-json.h" @@ -12,10 +13,8 @@ #include "json-util.h" #include "memfd-util.h" #include "rm-rf.h" -#include "strv.h" #include "tests.h" #include "tmpfile-util.h" -#include "user-util.h" #include "varlink-util.h" /* Let's pick some high value, that is higher than the largest listen() backlog, but leaves enough room below diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c index a033d07ee72..03b4836e908 100644 --- a/src/test/test-verbs.c +++ b/src/test/test-verbs.c @@ -2,7 +2,6 @@ #include -#include "macro.h" #include "strv.h" #include "tests.h" #include "verbs.h" diff --git a/src/test/test-vpick.c b/src/test/test-vpick.c index aeea50c603d..7fa879b971d 100644 --- a/src/test/test-vpick.c +++ b/src/test/test-vpick.c @@ -3,7 +3,6 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "mkdir.h" #include "path-util.h" #include "rm-rf.h" #include "tests.h" diff --git a/src/test/test-watch-pid.c b/src/test/test-watch-pid.c index dd8ad11fa41..dd1fa49428c 100644 --- a/src/test/test-watch-pid.c +++ b/src/test/test-watch-pid.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "log.h" #include "manager.h" #include "process-util.h" #include "rm-rf.h" #include "service.h" +#include "set.h" #include "tests.h" TEST(watch_pid) { diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c index 67e6581cfb0..23ba46afe8e 100644 --- a/src/test/test-watchdog.c +++ b/src/test/test-watchdog.c @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include -#include - #include "log.h" #include "tests.h" +#include "time-util.h" #include "watchdog.h" int main(int argc, char *argv[]) { diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c index d376d4a4cd5..bb05f372766 100644 --- a/src/test/test-web-util.c +++ b/src/test/test-web-util.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "macro.h" #include "tests.h" #include "web-util.h" diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c index 880b932af64..a9ca0e69b08 100644 --- a/src/test/test-xattr-util.c +++ b/src/test/test-xattr-util.c @@ -1,20 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include #include #include #include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" -#include "macro.h" #include "nulstr-util.h" #include "rm-rf.h" #include "string-util.h" #include "strv.h" #include "tests.h" +#include "time-util.h" #include "tmpfile-util.h" #include "xattr-util.h" diff --git a/src/test/test-xml.c b/src/test/test-xml.c index 6367f272637..bb9e4c49d09 100644 --- a/src/test/test-xml.c +++ b/src/test/test-xml.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include - #include "alloc-util.h" -#include "string-util.h" #include "tests.h" #include "xml.h"