From 623f13d8198b83df890f014b1d27255f4d78f35b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2016 03:00:49 -0400 Subject: wip --- src/test/test-acl-util.c | 10 +++++----- src/test/test-af-list.c | 12 ++++++------ src/test/test-alloc-util.c | 6 +++--- src/test/test-architecture.c | 8 ++++---- src/test/test-arphrd-list.c | 12 ++++++------ src/test/test-ask-password-api.c | 6 +++--- src/test/test-async.c | 8 ++++---- src/test/test-barrier.c | 4 ++-- src/test/test-bitmap.c | 2 +- src/test/test-boot-timestamps.c | 10 +++++----- src/test/test-btrfs.c | 14 +++++++------- src/test/test-calendarspec.c | 8 ++++---- src/test/test-cap-list.c | 12 ++++++------ src/test/test-capability.c | 8 ++++---- src/test/test-cgroup-mask.c | 6 +++--- src/test/test-cgroup-util.c | 20 ++++++++++---------- src/test/test-cgroup.c | 8 ++++---- src/test/test-clock.c | 10 +++++----- src/test/test-condition.c | 24 ++++++++++++------------ src/test/test-conf-files.c | 20 ++++++++++---------- src/test/test-conf-parser.c | 12 ++++++------ src/test/test-copy.c | 26 +++++++++++++------------- src/test/test-cpu-set-util.c | 6 +++--- src/test/test-daemon.c | 2 +- src/test/test-date.c | 6 +++--- src/test/test-device-nodes.c | 8 ++++---- src/test/test-dns-domain.c | 8 ++++---- src/test/test-ellipsize.c | 10 +++++----- src/test/test-engine.c | 6 +++--- src/test/test-env-util.c | 8 ++++---- src/test/test-escape.c | 6 +++--- src/test/test-execute.c | 14 +++++++------- src/test/test-extract-word.c | 6 +++--- src/test/test-fd-util.c | 8 ++++---- src/test/test-fdset.c | 10 +++++----- src/test/test-fileio.c | 22 +++++++++++----------- src/test/test-firewall-util.c | 4 ++-- src/test/test-fs-util.c | 20 ++++++++++---------- src/test/test-fstab-util.c | 10 +++++----- src/test/test-glob-util.c | 8 ++++---- src/test/test-hashmap-plain.c | 10 +++++----- src/test/test-hashmap.c | 4 ++-- src/test/test-helper.h | 2 +- src/test/test-hexdecoct.c | 8 ++++---- src/test/test-hostname-util.c | 10 +++++----- src/test/test-hostname.c | 2 +- src/test/test-id128.c | 12 ++++++------ src/test/test-install-root.c | 12 ++++++------ src/test/test-install.c | 2 +- src/test/test-io-util.c | 8 ++++---- src/test/test-ipcrm.c | 6 +++--- src/test/test-libudev.c | 12 ++++++------ src/test/test-list.c | 4 ++-- src/test/test-locale-util.c | 6 +++--- src/test/test-log.c | 6 +++--- src/test/test-loopback.c | 2 +- src/test/test-namespace.c | 10 +++++----- src/test/test-netlink-manual.c | 6 +++--- src/test/test-ns.c | 2 +- src/test/test-nss.c | 24 ++++++++++++------------ src/test/test-parse-util.c | 4 ++-- src/test/test-path-lookup.c | 10 +++++----- src/test/test-path-util.c | 18 +++++++++--------- src/test/test-path.c | 20 ++++++++++---------- src/test/test-prioq.c | 10 +++++----- src/test/test-proc-cmdline.c | 14 +++++++------- src/test/test-process-util.c | 24 ++++++++++++------------ src/test/test-ratelimit.c | 6 +++--- src/test/test-replace-var.c | 8 ++++---- src/test/test-rlimit-util.c | 12 ++++++------ src/test/test-sched-prio.c | 6 +++--- src/test/test-selinux.c | 14 +++++++------- src/test/test-set.c | 2 +- src/test/test-sigbus.c | 6 +++--- src/test/test-signal-util.c | 4 ++-- src/test/test-siphash24.c | 4 ++-- src/test/test-sizeof.c | 4 ++-- src/test/test-sleep.c | 8 ++++---- src/test/test-socket-util.c | 18 +++++++++--------- src/test/test-stat-util.c | 10 +++++----- src/test/test-strbuf.c | 8 ++++---- src/test/test-string-util.c | 8 ++++---- src/test/test-strip-tab-ansi.c | 6 +++--- src/test/test-strv.c | 10 +++++----- src/test/test-strxcpyx.c | 6 +++--- src/test/test-tables.c | 24 ++++++++++++------------ src/test/test-terminal-util.c | 12 ++++++------ src/test/test-time.c | 4 ++-- src/test/test-tmpfiles.c | 16 ++++++++-------- src/test/test-udev.c | 14 +++++++------- src/test/test-uid-range.c | 8 ++++---- src/test/test-unaligned.c | 6 +++--- src/test/test-unit-file.c | 32 ++++++++++++++++---------------- src/test/test-unit-name.c | 20 ++++++++++---------- src/test/test-user-util.c | 10 +++++----- src/test/test-utf8.c | 8 ++++---- src/test/test-util.c | 16 ++++++++-------- src/test/test-verbs.c | 6 +++--- src/test/test-watchdog.c | 4 ++-- src/test/test-web-util.c | 4 ++-- src/test/test-xattr-util.c | 12 ++++++------ src/test/test-xml.c | 8 ++++---- 102 files changed, 500 insertions(+), 500 deletions(-) (limited to 'src/test') diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c index 1417d596e4..39302135d7 100644 --- a/src/test/test-acl-util.c +++ b/src/test/test-acl-util.c @@ -22,11 +22,11 @@ #include #include -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/string-util.h" -#include "basic/user-util.h" -#include "shared/acl-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-shared/acl-util.h" static void test_add_acls_for_user(void) { char fn[] = "/tmp/test-empty.XXXXXX"; diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c index 21115e677a..a117550e88 100644 --- a/src/test/test-af-list.c +++ b/src/test/test-af-list.c @@ -20,15 +20,15 @@ #include #include -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static const struct af_name* lookup_af(register const char *str, register unsigned int len); -#include "basic/af-from-name.h" -#include "basic/af-list.h" -#include "basic/af-to-name.h" +#include "af-from-name.h" +#include "af-to-name.h" +#include "systemd-basic/af-list.h" int main(int argc, const char *argv[]) { diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c index 520951495d..6ab6a19c3e 100644 --- a/src/test/test-alloc-util.c +++ b/src/test/test-alloc-util.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/macro.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/util.h" static void test_alloca(void) { static const uint8_t zero[997] = { }; diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c index 6373b798b0..0f0525436b 100644 --- a/src/test/test-architecture.c +++ b/src/test/test-architecture.c @@ -17,10 +17,10 @@ along with systemd; If not, see . ***/ -#include "basic/architecture.h" -#include "basic/log.h" -#include "basic/util.h" -#include "basic/virt.h" +#include "systemd-basic/architecture.h" +#include "systemd-basic/log.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" int main(int argc, char *argv[]) { int a, v; diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c index 976958e733..605607f7bb 100644 --- a/src/test/test-arphrd-list.c +++ b/src/test/test-arphrd-list.c @@ -20,15 +20,15 @@ #include #include -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); -#include "basic/arphrd-from-name.h" -#include "basic/arphrd-list.h" -#include "basic/arphrd-to-name.h" +#include "arphrd-from-name.h" +#include "arphrd-to-name.h" +#include "systemd-basic/arphrd-list.h" int main(int argc, const char *argv[]) { diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c index a93e821c7d..c33f714989 100644 --- a/src/test/test-ask-password-api.c +++ b/src/test/test-ask-password-api.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "shared/ask-password-api.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-shared/ask-password-api.h" static void ask_password(void) { int r; diff --git a/src/test/test-async.c b/src/test/test-async.c index 627768b392..1e4a182dfa 100644 --- a/src/test/test-async.c +++ b/src/test/test-async.c @@ -19,10 +19,10 @@ #include -#include "basic/async.h" -#include "basic/fileio.h" -#include "basic/macro.h" -#include "basic/util.h" +#include "systemd-basic/async.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/util.h" static bool test_async = false; diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c index 1123f33f16..56a0de0e83 100644 --- a/src/test/test-barrier.c +++ b/src/test/test-barrier.c @@ -31,8 +31,8 @@ #include #include -#include "basic/barrier.h" -#include "basic/util.h" +#include "systemd-basic/barrier.h" +#include "systemd-basic/util.h" /* 20ms to test deadlocks; All timings use multiples of this constant as * alarm/sleep timers. If this timeout is too small for slow machines to perform diff --git a/src/test/test-bitmap.c b/src/test/test-bitmap.c index b18bcef9ae..ef8470b2e6 100644 --- a/src/test/test-bitmap.c +++ b/src/test/test-bitmap.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "basic/bitmap.h" +#include "systemd-basic/bitmap.h" int main(int argc, const char *argv[]) { _cleanup_bitmap_free_ Bitmap *b = NULL, *b2 = NULL; diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c index 022d101957..2347547f66 100644 --- a/src/test/test-boot-timestamps.c +++ b/src/test/test-boot-timestamps.c @@ -18,11 +18,11 @@ along with systemd; If not, see . ***/ -#include "basic/log.h" -#include "basic/util.h" -#include "shared/acpi-fpdt.h" -#include "shared/boot-timestamps.h" -#include "shared/efivars.h" +#include "systemd-basic/log.h" +#include "systemd-basic/util.h" +#include "systemd-shared/acpi-fpdt.h" +#include "systemd-shared/boot-timestamps.h" +#include "systemd-shared/efivars.h" static int test_acpi_fpdt(void) { usec_t loader_start; diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index eb33a3937f..648fe2296b 100644 --- a/src/test/test-btrfs.c +++ b/src/test/test-btrfs.c @@ -19,13 +19,13 @@ #include -#include "basic/btrfs-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/parse-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" int main(int argc, char *argv[]) { BtrfsQuotaInfo quota; diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index c7cbf99cf0..94e755bf3c 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -19,10 +19,10 @@ #include -#include "basic/alloc-util.h" -#include "basic/calendarspec.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/calendarspec.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static void test_one(const char *input, const char *output) { CalendarSpec *c; diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c index 6af0a45b66..2fd1ee75d5 100644 --- a/src/test/test-cap-list.c +++ b/src/test/test-cap-list.c @@ -19,12 +19,12 @@ #include -#include "basic/alloc-util.h" -#include "basic/cap-list.h" -#include "basic/capability-util.h" -#include "basic/fileio.h" -#include "basic/parse-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cap-list.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/util.h" /* verify the capability parser */ static void test_cap_list(void) { diff --git a/src/test/test-capability.c b/src/test/test-capability.c index 07e52c2ba8..5bd53246d7 100644 --- a/src/test/test-capability.c +++ b/src/test/test-capability.c @@ -25,10 +25,10 @@ #include #include -#include "basic/capability-util.h" -#include "basic/fd-util.h" -#include "basic/macro.h" -#include "basic/util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/util.h" static uid_t test_uid = -1; static gid_t test_gid = -1; diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 6d889c98d2..28736780d3 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -19,10 +19,10 @@ #include -#include "basic/macro.h" -#include "basic/rm-rf.h" #include "manager.h" -#include "shared/tests.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-shared/tests.h" #include "unit.h" #include "test-helper.h" diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index 394839bc83..1b3e55083a 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -17,16 +17,16 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/cgroup-util.h" -#include "basic/dirent-util.h" -#include "basic/fd-util.h" -#include "basic/formats-util.h" -#include "basic/parse-util.h" -#include "basic/process-util.h" -#include "basic/string-util.h" -#include "basic/user-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" #include "test-helper.h" diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c index c969185337..4daa59f367 100644 --- a/src/test/test-cgroup.c +++ b/src/test/test-cgroup.c @@ -20,10 +20,10 @@ #include #include -#include "basic/cgroup-util.h" -#include "basic/path-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/cgroup-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" int main(int argc, char*argv[]) { char *path; diff --git a/src/test/test-clock.c b/src/test/test-clock.c index c6a8e7aa1c..251e41f8bd 100644 --- a/src/test/test-clock.c +++ b/src/test/test-clock.c @@ -20,11 +20,11 @@ #include #include -#include "basic/clock-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/macro.h" +#include "systemd-basic/clock-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" static void test_clock_is_localtime(void) { char adjtime[] = "/tmp/test-adjtime.XXXXXX"; diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 9d27a66a95..848de002b0 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -19,18 +19,18 @@ #include -#include "basic/alloc-util.h" -#include "basic/architecture.h" -#include "basic/audit-util.h" -#include "basic/hostname-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/selinux-util.h" -#include "basic/smack-util.h" -#include "basic/util.h" -#include "shared/apparmor-util.h" -#include "shared/condition.h" -#include "shared/ima-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/architecture.h" +#include "systemd-basic/audit-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/smack-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/apparmor-util.h" +#include "systemd-shared/condition.h" +#include "systemd-shared/ima-util.h" static void test_condition_test_path(void) { Condition *condition; diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c index 336e980e07..0736b55d98 100644 --- a/src/test/test-conf-files.c +++ b/src/test/test-conf-files.c @@ -20,16 +20,16 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/conf-files.h" -#include "basic/fs-util.h" -#include "basic/macro.h" -#include "basic/parse-util.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/user-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" static void setup_test_dir(char *tmp_dir, const char *files, ...) { va_list ap; diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index 1536e7937d..ff949406e8 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -17,12 +17,12 @@ along with systemd; If not, see . ***/ -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" -#include "shared/conf-parser.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-shared/conf-parser.h" static void test_config_parse_path_one(const char *rvalue, const char *expected) { char *path = NULL; diff --git a/src/test/test-copy.c b/src/test/test-copy.c index cd9def191c..fca324c90a 100644 --- a/src/test/test-copy.c +++ b/src/test/test-copy.c @@ -19,19 +19,19 @@ #include -#include "basic/alloc-util.h" -#include "basic/copy.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/fs-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" static void test_copy_file(void) { _cleanup_free_ char *buf = NULL; diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c index 0558f323ea..6fc4ab6404 100644 --- a/src/test/test-cpu-set-util.c +++ b/src/test/test-cpu-set-util.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/cpu-set-util.h" -#include "basic/macro.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/cpu-set-util.h" +#include "systemd-basic/macro.h" static void test_parse_cpu_set(void) { cpu_set_t *c = NULL; diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c index 98988e1e31..a3740195ec 100644 --- a/src/test/test-daemon.c +++ b/src/test/test-daemon.c @@ -21,7 +21,7 @@ #include -#include "basic/strv.h" +#include "systemd-basic/strv.h" int main(int argc, char*argv[]) { _cleanup_strv_free_ char **l = NULL; diff --git a/src/test/test-date.c b/src/test/test-date.c index a7a2e9087c..6edc820f38 100644 --- a/src/test/test-date.c +++ b/src/test/test-date.c @@ -19,9 +19,9 @@ #include -#include "basic/alloc-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static void test_should_pass(const char *p) { usec_t t, q; diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c index 2310fbb9c3..a13ff0e903 100644 --- a/src/test/test-device-nodes.c +++ b/src/test/test-device-nodes.c @@ -19,10 +19,10 @@ #include -#include "basic/alloc-util.h" -#include "basic/device-nodes.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/device-nodes.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" /* helpers for test_encode_devnode_name */ static char *do_encode_string(const char *in) { diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c index 930bd5dd62..c31d09e945 100644 --- a/src/test/test-dns-domain.c +++ b/src/test/test-dns-domain.c @@ -17,10 +17,10 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-shared/dns-domain.h" static void test_dns_label_unescape_one(const char *what, const char *expect, size_t buffer_sz, int ret) { char buffer[buffer_sz]; diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c index 45e95fe597..9ac1669537 100644 --- a/src/test/test-ellipsize.c +++ b/src/test/test-ellipsize.c @@ -19,11 +19,11 @@ #include -#include "basic/alloc-util.h" -#include "basic/def.h" -#include "basic/string-util.h" -#include "basic/terminal-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" static void test_one(const char *p) { _cleanup_free_ char *t; diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 9d21bb5723..73ae386b4d 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -21,10 +21,10 @@ #include #include -#include "basic/rm-rf.h" #include "manager.h" -#include "shared/bus-util.h" -#include "shared/tests.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-shared/tests.h" #include "test-helper.h" diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c index 30d99fcd51..a6bab469cd 100644 --- a/src/test/test-env-util.c +++ b/src/test/test-env-util.c @@ -20,10 +20,10 @@ #include -#include "basic/env-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" static void test_strv_env_delete(void) { _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL, **d = NULL; diff --git a/src/test/test-escape.c b/src/test/test-escape.c index 874647541c..32abd73a7f 100644 --- a/src/test/test-escape.c +++ b/src/test/test-escape.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/escape.h" -#include "basic/macro.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/macro.h" static void test_cescape(void) { _cleanup_free_ char *escaped; diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 7cd63168c8..1fe6421314 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -23,14 +23,14 @@ #include #include -#include "basic/fileio.h" -#include "basic/fs-util.h" -#include "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/rm-rf.h" -#include "basic/util.h" #include "manager.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/util.h" #include "unit.h" #include "test-helper.h" diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c index 3d6548b7c7..f3a6a6378e 100644 --- a/src/test/test-extract-word.c +++ b/src/test/test-extract-word.c @@ -21,9 +21,9 @@ #include #include -#include "basic/extract-word.h" -#include "basic/log.h" -#include "basic/string-util.h" +#include "systemd-basic/extract-word.h" +#include "systemd-basic/log.h" +#include "systemd-basic/string-util.h" static void test_extract_first_word(void) { const char *p, *original; diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index f6c1f302c1..10577bfbed 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -20,10 +20,10 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/macro.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/macro.h" static void test_close_many(void) { int fds[3]; diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c index 71b155ae8d..5073e0bf17 100644 --- a/src/test/test-fdset.c +++ b/src/test/test-fdset.c @@ -20,11 +20,11 @@ #include #include -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/macro.h" -#include "basic/util.h" -#include "shared/fdset.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/util.h" +#include "systemd-shared/fdset.h" static void test_fdset_new_fill(void) { int fd = -1; diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index f5a99d668d..c58abff8d6 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -22,17 +22,17 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/def.h" -#include "basic/env-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/io-util.h" -#include "basic/parse-util.h" -#include "basic/process-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/env-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" static void test_parse_env_file(void) { char t[] = "/tmp/test-fileio-in-XXXXXX", diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c index 28ab25dd78..b1e679e6b1 100644 --- a/src/test/test-firewall-util.c +++ b/src/test/test-firewall-util.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/log.h" -#include "firewall-util.h" +#include "systemd-basic/log.h" +#include "systemd-firewall/firewall-util.h" #define MAKE_IN_ADDR_UNION(a,b,c,d) (union in_addr_union) { .in.s_addr = htobe32((uint32_t) (a) << 24 | (uint32_t) (b) << 16 | (uint32_t) (c) << 8 | (uint32_t) (d))} diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c index 30b521c297..e98da45197 100644 --- a/src/test/test-fs-util.c +++ b/src/test/test-fs-util.c @@ -19,16 +19,16 @@ #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/fs-util.h" -#include "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" static void test_unlink_noerrno(void) { char name[] = "/tmp/test-close_nointr.XXXXXX"; diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c index 181ff230e0..7d73384d26 100644 --- a/src/test/test-fstab-util.c +++ b/src/test/test-fstab-util.c @@ -17,11 +17,11 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "shared/fstab-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/fstab-util.h" /* int fstab_filter_options(const char *opts, const char *names, diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c index fd6dde113a..b5cf10a683 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -20,10 +20,10 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fileio.h" -#include "basic/glob-util.h" -#include "basic/macro.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/macro.h" static void test_glob_exists(void) { char name[] = "/tmp/test-glob_exists.XXXXXX"; diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c index bbb24d885e..d1b3ac527b 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -17,11 +17,11 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/hashmap.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" void test_hashmap_funcs(void); diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c index c927d99079..10de53ff41 100644 --- a/src/test/test-hashmap.c +++ b/src/test/test-hashmap.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/hashmap.h" -#include "basic/util.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/util.h" void test_hashmap_funcs(void); void test_ordered_hashmap_funcs(void); diff --git a/src/test/test-helper.h b/src/test/test-helper.h index 0b1acde587..d5f44d53e3 100644 --- a/src/test/test-helper.h +++ b/src/test/test-helper.h @@ -21,7 +21,7 @@ #include -#include "basic/macro.h" +#include "systemd-basic/macro.h" #define TEST_REQ_RUNNING_SYSTEMD(x) \ if (sd_booted() > 0) { \ diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c index f56035d84a..b3587b6645 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -17,10 +17,10 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/hexdecoct.h" -#include "basic/macro.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c index a8e598c58e..62ce59ae4b 100644 --- a/src/test/test-hostname-util.c +++ b/src/test/test-hostname-util.c @@ -19,11 +19,11 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/fileio.h" -#include "basic/hostname-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static void test_hostname_is_valid(void) { assert_se(hostname_is_valid("foobar", false)); diff --git a/src/test/test-hostname.c b/src/test/test-hostname.c index 7408d51725..fb9a66a5d8 100644 --- a/src/test/test-hostname.c +++ b/src/test/test-hostname.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/util.h" #include "hostname-setup.h" +#include "systemd-basic/util.h" int main(int argc, char* argv[]) { int r; diff --git a/src/test/test-id128.c b/src/test/test-id128.c index c9240cf40d..ada678a6c9 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -22,13 +22,13 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/util.h" #include "sd-id128/id128-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #define ID128_WALDI SD_ID128_MAKE(01, 02, 03, 04, 05, 06, 07, 08, 09, 0a, 0b, 0c, 0d, 0e, 0f, 10) #define STR_WALDI "0102030405060708090a0b0c0d0e0f10" diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c index 9a0a48131c..9124c0c73a 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -17,12 +17,12 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/fileio.h" -#include "basic/mkdir.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "shared/install.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-shared/install.h" static void test_basic_mask_and_enable(const char *root) { const char *p; diff --git a/src/test/test-install.c b/src/test/test-install.c index 784bcfdd5f..d9b93c306a 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -20,7 +20,7 @@ #include #include -#include "shared/install.h" +#include "systemd-shared/install.h" static void dump_changes(UnitFileChange *c, unsigned n) { unsigned i; diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c index 496b58eb95..528517af31 100644 --- a/src/test/test-io-util.c +++ b/src/test/test-io-util.c @@ -21,10 +21,10 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/io-util.h" -#include "basic/macro.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/macro.h" static void test_sparse_write_one(int fd, const char *buffer, size_t n) { char check[n]; diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c index a37aa4a10d..9705884b6c 100644 --- a/src/test/test-ipcrm.c +++ b/src/test/test-ipcrm.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include "basic/user-util.h" -#include "basic/util.h" -#include "shared/clean-ipc.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/clean-ipc.h" int main(int argc, char *argv[]) { uid_t uid; diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c index 83c8b81690..a76fbc3877 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -24,12 +24,12 @@ #include -#include "basic/fd-util.h" -#include "basic/log.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "shared/udev-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/udev-util.h" static void print_device(struct udev_device *device) { const char *str; diff --git a/src/test/test-list.c b/src/test/test-list.c index ec32684d78..542e2ef623 100644 --- a/src/test/test-list.c +++ b/src/test/test-list.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/list.h" -#include "basic/util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/util.h" int main(int argc, const char *argv[]) { size_t i; diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c index 702134ca46..2e5aa46f13 100644 --- a/src/test/test-locale-util.c +++ b/src/test/test-locale-util.c @@ -18,9 +18,9 @@ ***/ -#include "basic/locale-util.h" -#include "basic/macro.h" -#include "basic/strv.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/strv.h" static void test_get_locales(void) { _cleanup_strv_free_ char **locales = NULL; diff --git a/src/test/test-log.c b/src/test/test-log.c index 7a5f78a3d6..5241ba8183 100644 --- a/src/test/test-log.c +++ b/src/test/test-log.c @@ -20,9 +20,9 @@ #include #include -#include "basic/formats-util.h" -#include "basic/log.h" -#include "basic/util.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/util.h" int main(int argc, char* argv[]) { diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c index 479f74862f..bc5a5eeb2f 100644 --- a/src/test/test-loopback.c +++ b/src/test/test-loopback.c @@ -20,8 +20,8 @@ #include #include -#include "basic/log.h" #include "loopback-setup.h" +#include "systemd-basic/log.h" int main(int argc, char* argv[]) { int r; diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index d877c61756..d1f55abd5d 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -19,12 +19,12 @@ #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/process-util.h" -#include "basic/string-util.h" -#include "basic/util.h" #include "namespace.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static void test_tmpdir(const char *id, const char *A, const char *B) { _cleanup_free_ char *a, *b; diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c index 50c960882c..abe705f58e 100644 --- a/src/test/test-netlink-manual.c +++ b/src/test/test-netlink-manual.c @@ -24,9 +24,9 @@ #include #include -#include "basic/macro.h" -#include "basic/util.h" -#include "sd-netlink/sd-netlink.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/util.h" +#include "systemd-staging/sd-netlink.h" static int load_module(const char *mod_name) { struct kmod_ctx *ctx; diff --git a/src/test/test-ns.c b/src/test/test-ns.c index 43cbbb69b0..8db88155c5 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -20,8 +20,8 @@ #include #include -#include "basic/log.h" #include "namespace.h" +#include "systemd-basic/log.h" int main(int argc, char *argv[]) { const char * const writable[] = { diff --git a/src/test/test-nss.c b/src/test/test-nss.c index 5be5c409d5..1ccd0def3f 100644 --- a/src/test/test-nss.c +++ b/src/test/test-nss.c @@ -21,19 +21,19 @@ #include #include -#include "basic/af-list.h" -#include "basic/alloc-util.h" -#include "basic/errno-list.h" -#include "basic/hexdecoct.h" -#include "basic/hostname-util.h" -#include "basic/in-addr-util.h" -#include "basic/log.h" -#include "basic/nss-util.h" -#include "basic/path-util.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" #include "sd-netlink/local-addresses.h" +#include "systemd-basic/af-list.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/errno-list.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/nss-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" static const char* nss_status_to_string(enum nss_status status, char *buf, size_t buf_len) { switch (status) { diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c index 1e90800a33..20c6fd9b92 100644 --- a/src/test/test-parse-util.c +++ b/src/test/test-parse-util.c @@ -21,8 +21,8 @@ #include #include -#include "basic/log.h" -#include "basic/parse-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/parse-util.h" static void test_parse_boolean(void) { assert_se(parse_boolean("1") == 1); diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c index 6c6315bf2d..0d94971580 100644 --- a/src/test/test-path-lookup.c +++ b/src/test/test-path-lookup.c @@ -20,11 +20,11 @@ #include #include -#include "basic/log.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "shared/path-lookup.h" +#include "systemd-basic/log.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-shared/path-lookup.h" static void test_paths(UnitFileScope scope) { char template[] = "/tmp/test-path-lookup.XXXXXXX"; diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index aa1ed1ec81..852c85d2e6 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -21,15 +21,15 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/macro.h" -#include "basic/mount-util.h" -#include "basic/path-util.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mount-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" #define test_path_compare(a, b, result) { \ assert_se(path_compare(a, b) == result); \ diff --git a/src/test/test-path.c b/src/test/test-path.c index 1cd09c89d8..56f19b2d0a 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -20,17 +20,17 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" #include "manager.h" -#include "shared/tests.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-shared/tests.h" #include "unit.h" #include "test-helper.h" diff --git a/src/test/test-prioq.c b/src/test/test-prioq.c index c0917d2187..1f02df4375 100644 --- a/src/test/test-prioq.c +++ b/src/test/test-prioq.c @@ -19,11 +19,11 @@ #include -#include "basic/alloc-util.h" -#include "basic/prioq.h" -#include "basic/set.h" -#include "basic/siphash24.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/prioq.h" +#include "systemd-basic/set.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/util.h" #define SET_SIZE 1024*4 diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c index 35e6541150..1fbe620756 100644 --- a/src/test/test-proc-cmdline.c +++ b/src/test/test-proc-cmdline.c @@ -17,13 +17,13 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/proc-cmdline.h" -#include "basic/special.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/proc-cmdline.h" +#include "systemd-basic/special.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static int parse_item(const char *key, const char *value) { assert_se(key); diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index 65dc6a9140..01dcee74b0 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -30,18 +30,18 @@ #include #endif -#include "basic/alloc-util.h" -#include "basic/architecture.h" -#include "basic/fd-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/parse-util.h" -#include "basic/process-util.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" -#include "basic/terminal-util.h" -#include "basic/util.h" -#include "basic/virt.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/architecture.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" static void test_get_process_comm(pid_t pid) { struct stat st; diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c index 76bd254694..0b867d6801 100644 --- a/src/test/test-ratelimit.c +++ b/src/test/test-ratelimit.c @@ -19,9 +19,9 @@ #include -#include "basic/macro.h" -#include "basic/ratelimit.h" -#include "basic/time-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/ratelimit.h" +#include "systemd-basic/time-util.h" static void test_ratelimit_test(void) { int i; diff --git a/src/test/test-replace-var.c b/src/test/test-replace-var.c index 5dce1d81d7..fbd6b4fa94 100644 --- a/src/test/test-replace-var.c +++ b/src/test/test-replace-var.c @@ -19,10 +19,10 @@ #include -#include "basic/macro.h" -#include "basic/replace-var.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/replace-var.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static char *lookup(const char *variable, void *userdata) { return strjoin("<<<", variable, ">>>", NULL); diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c index 7a3ed8354d..6d5733b03d 100644 --- a/src/test/test-rlimit-util.c +++ b/src/test/test-rlimit-util.c @@ -17,12 +17,12 @@ #include -#include "basic/alloc-util.h" -#include "basic/capability-util.h" -#include "basic/macro.h" -#include "basic/rlimit-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/rlimit-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static void test_rlimit_parse_format(int resource, const char *string, rlim_t soft, rlim_t hard, int ret, const char *formatted) { _cleanup_free_ char *f = NULL; diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index a0f46ad1c9..d903354049 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -19,10 +19,10 @@ #include -#include "basic/macro.h" -#include "basic/rm-rf.h" #include "manager.h" -#include "shared/tests.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-shared/tests.h" #include "test-helper.h" diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c index 326c24e6c4..244bc218d6 100644 --- a/src/test/test-selinux.c +++ b/src/test/test-selinux.c @@ -19,13 +19,13 @@ #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/log.h" -#include "basic/selinux-util.h" -#include "basic/string-util.h" -#include "basic/time-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/time-util.h" +#include "systemd-basic/util.h" static void test_testing(void) { bool b; diff --git a/src/test/test-set.c b/src/test/test-set.c index 59f3366b44..7ba5524939 100644 --- a/src/test/test-set.c +++ b/src/test/test-set.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "basic/set.h" +#include "systemd-basic/set.h" static void test_set_steal_first(void) { _cleanup_set_free_ Set *m = NULL; diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c index ecbb0f87ea..8f6bc1ef2f 100644 --- a/src/test/test-sigbus.c +++ b/src/test/test-sigbus.c @@ -19,9 +19,9 @@ #include -#include "basic/fd-util.h" -#include "basic/sigbus.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/sigbus.h" +#include "systemd-basic/util.h" int main(int argc, char *argv[]) { _cleanup_close_ int fd = -1; diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c index 74e34394ab..3feb681645 100644 --- a/src/test/test-signal-util.c +++ b/src/test/test-signal-util.c @@ -20,8 +20,8 @@ #include #include -#include "basic/macro.h" -#include "basic/signal-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/signal-util.h" static void test_block_signals(void) { sigset_t ss; diff --git a/src/test/test-siphash24.c b/src/test/test-siphash24.c index 2c40776dd0..6ed4ce6e60 100644 --- a/src/test/test-siphash24.c +++ b/src/test/test-siphash24.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/siphash24.h" -#include "basic/util.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/util.h" #define ITERATIONS 10000000ULL diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index 6869846e98..7330c8ba5b 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/log.h" -#include "basic/time-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/time-util.h" /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c index b8ddc53ed0..0c78f68ca8 100644 --- a/src/test/test-sleep.c +++ b/src/test/test-sleep.c @@ -19,10 +19,10 @@ #include -#include "basic/log.h" -#include "basic/strv.h" -#include "basic/util.h" -#include "shared/sleep-config.h" +#include "systemd-basic/log.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-shared/sleep-config.h" static void test_sleep(void) { _cleanup_strv_free_ char diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c index 44786ee262..85a5ebcced 100644 --- a/src/test/test-socket-util.c +++ b/src/test/test-socket-util.c @@ -17,15 +17,15 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/async.h" -#include "basic/fd-util.h" -#include "basic/in-addr-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/socket-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/async.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static void test_ifname_valid(void) { assert(ifname_valid("foo")); diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c index 941a38b1fb..e183ef101f 100644 --- a/src/test/test-stat-util.c +++ b/src/test/test-stat-util.c @@ -20,11 +20,11 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/macro.h" -#include "basic/stat-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/stat-util.h" static void test_files_same(void) { _cleanup_close_ int fd = -1; diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c index 74b5c03f7b..a9af4bc5a9 100644 --- a/src/test/test-strbuf.c +++ b/src/test/test-strbuf.c @@ -20,10 +20,10 @@ #include #include -#include "basic/strbuf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/strbuf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" static ssize_t add_string(struct strbuf *sb, const char *s) { return strbuf_add_string(sb, s, strlen(s)); diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c index 7f867a2ced..52bc529a6e 100644 --- a/src/test/test-string-util.c +++ b/src/test/test-string-util.c @@ -17,10 +17,10 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/strv.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" static void test_string_erase(void) { char *x; diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c index a9569e527b..33f06e04ef 100644 --- a/src/test/test-strip-tab-ansi.c +++ b/src/test/test-strip-tab-ansi.c @@ -19,9 +19,9 @@ #include -#include "basic/string-util.h" -#include "basic/terminal-util.h" -#include "basic/util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" int main(int argc, char *argv[]) { char *p; diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 0ad23ef3bb..ebee80d08e 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -20,11 +20,11 @@ #include -#include "basic/alloc-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/util.h" -#include "shared/specifier.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-shared/specifier.h" static void test_specifier_printf(void) { static const Specifier table[] = { diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c index b5c6d5f191..0e9c78d4a3 100644 --- a/src/test/test-strxcpyx.c +++ b/src/test/test-strxcpyx.c @@ -19,9 +19,9 @@ #include -#include "basic/string-util.h" -#include "basic/strxcpyx.h" -#include "basic/util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strxcpyx.h" +#include "systemd-basic/util.h" static void test_strpcpy(void) { char target[25]; diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 51ac9632f8..2fd3e00e82 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -18,19 +18,12 @@ ***/ #include "automount.h" -#include "basic/architecture.h" -#include "basic/locale-util.h" -#include "basic/log.h" -#include "basic/rlimit-util.h" -#include "basic/socket-util.h" -#include "basic/unit-name.h" -#include "basic/util.h" #include "busname.h" #include "cgroup.h" #include "device.h" #include "execute.h" #include "job.h" -#include "journald-server.h" +#include "journal-core/journald-server.h" #include "kill.h" #include "link-config.h" #include "mount.h" @@ -38,13 +31,20 @@ #include "scope.h" #include "sd-journal/compress.h" #include "service.h" -#include "shared/condition.h" -#include "shared/install.h" -#include "shared/logs-show.h" -#include "shared/test-tables.h" #include "slice.h" #include "socket.h" #include "swap.h" +#include "systemd-basic/architecture.h" +#include "systemd-basic/locale-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/rlimit-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/util.h" +#include "systemd-shared/condition.h" +#include "systemd-shared/install.h" +#include "systemd-shared/logs-show.h" +#include "systemd-shared/test-tables.h" #include "target.h" #include "timer.h" #include "unit.h" diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c index bcdc048196..a8f3d44ece 100644 --- a/src/test/test-terminal-util.c +++ b/src/test/test-terminal-util.c @@ -21,12 +21,12 @@ #include #include -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/terminal-util.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/terminal-util.h" +#include "systemd-basic/util.h" static void test_default_term_for_tty(void) { puts(default_term_for_tty("/dev/tty23")); diff --git a/src/test/test-time.c b/src/test/test-time.c index d6ff1f958f..77f3474494 100644 --- a/src/test/test-time.c +++ b/src/test/test-time.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/strv.h" -#include "basic/time-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/time-util.h" static void test_parse_sec(void) { usec_t u; diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c index df262e0b92..1c88434d0b 100644 --- a/src/test/test-tmpfiles.c +++ b/src/test/test-tmpfiles.c @@ -22,14 +22,14 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/formats-util.h" -#include "basic/fs-util.h" -#include "basic/log.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/formats-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" int main(int argc, char** argv) { _cleanup_free_ char *cmd = NULL, *cmd2 = NULL, *ans = NULL, *ans2 = NULL, *d = NULL, *tmp = NULL, *line = NULL; diff --git a/src/test/test-udev.c b/src/test/test-udev.c index 1f6dc878c8..042dfbd2fd 100644 --- a/src/test/test-udev.c +++ b/src/test/test-udev.c @@ -26,13 +26,13 @@ #include #include -#include "basic/fs-util.h" -#include "basic/log.h" -#include "basic/missing.h" -#include "basic/selinux-util.h" -#include "basic/signal-util.h" -#include "basic/string-util.h" -#include "shared/udev-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/selinux-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-shared/udev-util.h" #include "udev.h" static int fake_filesystems(void) { diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c index bb79ae6c3e..6c9a7864f2 100644 --- a/src/test/test-uid-range.c +++ b/src/test/test-uid-range.c @@ -19,10 +19,10 @@ #include -#include "basic/alloc-util.h" -#include "basic/user-util.h" -#include "basic/util.h" -#include "shared/uid-range.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/uid-range.h" int main(int argc, char *argv[]) { _cleanup_free_ UidRange *p = NULL; diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c index 0568211e0c..14a272c0b7 100644 --- a/src/test/test-unaligned.c +++ b/src/test/test-unaligned.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include "basic/sparse-endian.h" -#include "basic/unaligned.h" -#include "basic/util.h" +#include "systemd-basic/sparse-endian.h" +#include "systemd-basic/unaligned.h" +#include "systemd-basic/util.h" static uint8_t data[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index ba21dbcc83..b94a5f8219 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -25,23 +25,23 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/capability-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/hashmap.h" -#include "basic/hostname-util.h" -#include "basic/macro.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/user-util.h" -#include "basic/util.h" #include "load-fragment.h" -#include "shared/install-printf.h" -#include "shared/install.h" -#include "shared/specifier.h" -#include "shared/tests.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/install-printf.h" +#include "systemd-shared/install.h" +#include "systemd-shared/specifier.h" +#include "systemd-shared/tests.h" #include "test-helper.h" diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index e17355eac1..1bf6b35f7b 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -24,17 +24,17 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/glob-util.h" -#include "basic/hostname-util.h" -#include "basic/macro.h" -#include "basic/path-util.h" -#include "basic/string-util.h" -#include "basic/unit-name.h" -#include "basic/user-util.h" -#include "basic/util.h" #include "manager.h" -#include "shared/specifier.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/glob-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unit-name.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/specifier.h" #include "unit-printf.h" #include "unit.h" diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c index 8460396b2c..16311d2264 100644 --- a/src/test/test-user-util.c +++ b/src/test/test-user-util.c @@ -17,11 +17,11 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/user-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/user-util.h" +#include "systemd-basic/util.h" static void test_uid_to_name_one(uid_t uid, const char *name) { _cleanup_free_ char *t = NULL; diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c index e6cfdac8ed..dcaedd632f 100644 --- a/src/test/test-utf8.c +++ b/src/test/test-utf8.c @@ -17,10 +17,10 @@ along with systemd; If not, see . ***/ -#include "basic/alloc-util.h" -#include "basic/string-util.h" -#include "basic/utf8.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" static void test_utf8_is_printable(void) { assert_se(utf8_is_printable("ascii is valid\tunicode", 22)); diff --git a/src/test/test-util.c b/src/test/test-util.c index c0ac362c9d..45e5bfac18 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -23,14 +23,14 @@ #include #include -#include "basic/def.h" -#include "basic/fileio.h" -#include "basic/fs-util.h" -#include "basic/parse-util.h" -#include "basic/raw-clone.h" -#include "basic/rm-rf.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/raw-clone.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static void test_align_power2(void) { unsigned long i, p2; diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c index 01a0ded37b..c426f89ded 100644 --- a/src/test/test-verbs.c +++ b/src/test/test-verbs.c @@ -17,9 +17,9 @@ along with systemd; If not, see . ***/ -#include "basic/macro.h" -#include "basic/strv.h" -#include "basic/verbs.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/verbs.h" static int noop_dispatcher(int argc, char *argv[], void *userdata) { return 0; diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c index 64814fc174..5a918b2658 100644 --- a/src/test/test-watchdog.c +++ b/src/test/test-watchdog.c @@ -19,8 +19,8 @@ #include -#include "basic/log.h" -#include "shared/watchdog.h" +#include "systemd-basic/log.h" +#include "systemd-shared/watchdog.h" int main(int argc, char *argv[]) { usec_t t = 10 * USEC_PER_SEC; diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c index 4907a5544c..a95d3c7ec0 100644 --- a/src/test/test-web-util.c +++ b/src/test/test-web-util.c @@ -17,8 +17,8 @@ along with systemd; If not, see . ***/ -#include "basic/macro.h" -#include "basic/web-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/web-util.h" static void test_is_valid_documentation_url(void) { assert_se(documentation_url_is_valid("http://www.freedesktop.org/wiki/Software/systemd")); diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c index 1a78e54d3c..c067f2eaaf 100644 --- a/src/test/test-xattr-util.c +++ b/src/test/test-xattr-util.c @@ -23,12 +23,12 @@ #include #include -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fs-util.h" -#include "basic/macro.h" -#include "basic/string-util.h" -#include "basic/xattr-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/xattr-util.h" static void test_fgetxattrat_fake(void) { char t[] = "/var/tmp/xattrtestXXXXXX"; diff --git a/src/test/test-xml.c b/src/test/test-xml.c index 22e92b2075..03c32d5102 100644 --- a/src/test/test-xml.c +++ b/src/test/test-xml.c @@ -19,10 +19,10 @@ #include -#include "basic/alloc-util.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "basic/xml.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-basic/xml.h" static void test_one(const char *data, ...) { void *state = NULL; -- cgit v1.2.3-54-g00ecf