From e1a4c5422deec7970cc5ce0154fd4fc721ee8dc2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 28 Jul 2016 00:24:41 -0400 Subject: fix --- src/test/test-acl-util.c | 2 +- src/test/test-ask-password-api.c | 2 +- src/test/test-boot-timestamps.c | 6 +++--- src/test/test-cgroup-mask.c | 2 +- src/test/test-condition.c | 6 +++--- src/test/test-conf-parser.c | 2 +- src/test/test-dns-domain.c | 2 +- src/test/test-engine.c | 4 ++-- src/test/test-fstab-util.c | 2 +- src/test/test-install-root.c | 2 +- src/test/test-install.c | 2 +- src/test/test-ipcrm.c | 2 +- src/test/test-libudev.c | 2 +- src/test/test-path-lookup.c | 2 +- src/test/test-path.c | 2 +- src/test/test-sched-prio.c | 2 +- src/test/test-sleep.c | 2 +- src/test/test-strv.c | 2 +- src/test/test-tables.c | 8 ++++---- src/test/test-udev.c | 2 +- src/test/test-uid-range.c | 2 +- src/test/test-unit-file.c | 8 ++++---- src/test/test-unit-name.c | 2 +- src/test/test-watchdog.c | 2 +- 24 files changed, 35 insertions(+), 35 deletions(-) (limited to 'src/test') diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c index de6bb2ce99..8672f008b8 100644 --- a/src/test/test-acl-util.c +++ b/src/test/test-acl-util.c @@ -22,7 +22,7 @@ #include #include -#include "acl-util.h" +#include "shared/acl-util.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/string-util.h" diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c index d94b88ddca..b12f3c2e47 100644 --- a/src/test/test-ask-password-api.c +++ b/src/test/test-ask-password-api.c @@ -18,7 +18,7 @@ ***/ #include "basic/alloc-util.h" -#include "ask-password-api.h" +#include "shared/ask-password-api.h" #include "basic/log.h" static void ask_password(void) { diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c index 3ff8cdd6d5..5ac6cd16e3 100644 --- a/src/test/test-boot-timestamps.c +++ b/src/test/test-boot-timestamps.c @@ -18,9 +18,9 @@ along with systemd; If not, see . ***/ -#include "acpi-fpdt.h" -#include "boot-timestamps.h" -#include "efivars.h" +#include "shared/acpi-fpdt.h" +#include "shared/boot-timestamps.h" +#include "shared/efivars.h" #include "basic/log.h" #include "basic/util.h" diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index c33a49eea0..30c3ec9ae6 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -23,7 +23,7 @@ #include "manager.h" #include "basic/rm-rf.h" #include "test-helper.h" -#include "tests.h" +#include "shared/tests.h" #include "unit.h" static int test_cgroup_mask(void) { diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 5b16b942b0..868e1dcf8d 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -20,12 +20,12 @@ #include #include "basic/alloc-util.h" -#include "apparmor-util.h" +#include "shared/apparmor-util.h" #include "basic/architecture.h" #include "basic/audit-util.h" -#include "condition.h" +#include "shared/condition.h" #include "basic/hostname-util.h" -#include "ima-util.h" +#include "shared/ima-util.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/selinux-util.h" diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index 9fc0f1e554..5b63e60b32 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "conf-parser.h" +#include "shared/conf-parser.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/string-util.h" diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c index fcb3443320..6165948314 100644 --- a/src/test/test-dns-domain.c +++ b/src/test/test-dns-domain.c @@ -18,7 +18,7 @@ ***/ #include "basic/alloc-util.h" -#include "dns-domain.h" +#include "shared/dns-domain.h" #include "basic/macro.h" #include "basic/string-util.h" diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 94272b8818..86f8b0d335 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -21,11 +21,11 @@ #include #include -#include "bus-util.h" +#include "shared/bus-util.h" #include "manager.h" #include "basic/rm-rf.h" #include "test-helper.h" -#include "tests.h" +#include "shared/tests.h" int main(int argc, char *argv[]) { _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL; diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c index 69d59f6def..42c7368801 100644 --- a/src/test/test-fstab-util.c +++ b/src/test/test-fstab-util.c @@ -18,7 +18,7 @@ ***/ #include "basic/alloc-util.h" -#include "fstab-util.h" +#include "shared/fstab-util.h" #include "basic/log.h" #include "basic/string-util.h" #include "basic/util.h" diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c index 57b449567d..69eb85593b 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -19,7 +19,7 @@ #include "basic/alloc-util.h" #include "basic/fileio.h" -#include "install.h" +#include "shared/install.h" #include "basic/mkdir.h" #include "basic/rm-rf.h" #include "basic/string-util.h" diff --git a/src/test/test-install.c b/src/test/test-install.c index 0ac85f040a..784bcfdd5f 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -20,7 +20,7 @@ #include #include -#include "install.h" +#include "shared/install.h" static void dump_changes(UnitFileChange *c, unsigned n) { unsigned i; diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c index f9071f8200..8ca3952bf5 100644 --- a/src/test/test-ipcrm.c +++ b/src/test/test-ipcrm.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "clean-ipc.h" +#include "shared/clean-ipc.h" #include "basic/user-util.h" #include "basic/util.h" diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c index 29db6a0446..40205ecb8c 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -28,7 +28,7 @@ #include "basic/log.h" #include "basic/stdio-util.h" #include "basic/string-util.h" -#include "udev-util.h" +#include "shared/udev-util.h" #include "basic/util.h" static void print_device(struct udev_device *device) { diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c index 24db2da200..41eb48d787 100644 --- a/src/test/test-path-lookup.c +++ b/src/test/test-path-lookup.c @@ -21,7 +21,7 @@ #include #include "basic/log.h" -#include "path-lookup.h" +#include "shared/path-lookup.h" #include "basic/rm-rf.h" #include "basic/string-util.h" #include "basic/strv.h" diff --git a/src/test/test-path.c b/src/test/test-path.c index 2e2e4d8e70..ed87cfdb8f 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -30,7 +30,7 @@ #include "basic/string-util.h" #include "basic/strv.h" #include "test-helper.h" -#include "tests.h" +#include "shared/tests.h" #include "unit.h" #include "basic/util.h" diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index 4452cf8bb5..33249fe12c 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -23,7 +23,7 @@ #include "manager.h" #include "basic/rm-rf.h" #include "test-helper.h" -#include "tests.h" +#include "shared/tests.h" int main(int argc, char *argv[]) { _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL; diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c index 573e3ef9eb..9260428d04 100644 --- a/src/test/test-sleep.c +++ b/src/test/test-sleep.c @@ -20,7 +20,7 @@ #include #include "basic/log.h" -#include "sleep-config.h" +#include "shared/sleep-config.h" #include "basic/strv.h" #include "basic/util.h" diff --git a/src/test/test-strv.c b/src/test/test-strv.c index d46ed342b4..90fcb20cdd 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -21,7 +21,7 @@ #include #include "basic/alloc-util.h" -#include "specifier.h" +#include "shared/specifier.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/util.h" diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 9c7a1d79b8..2643a05648 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -22,17 +22,17 @@ #include "busname.h" #include "cgroup.h" #include "compress.h" -#include "condition.h" +#include "shared/condition.h" #include "device.h" #include "execute.h" -#include "install.h" +#include "shared/install.h" #include "job.h" #include "journald-server.h" #include "kill.h" #include "link-config.h" #include "basic/locale-util.h" #include "basic/log.h" -#include "logs-show.h" +#include "shared/logs-show.h" #include "mount.h" #include "path.h" #include "basic/rlimit-util.h" @@ -43,7 +43,7 @@ #include "socket.h" #include "swap.h" #include "target.h" -#include "test-tables.h" +#include "shared/test-tables.h" #include "timer.h" #include "basic/unit-name.h" #include "unit.h" diff --git a/src/test/test-udev.c b/src/test/test-udev.c index 6da4470c72..1f6dc878c8 100644 --- a/src/test/test-udev.c +++ b/src/test/test-udev.c @@ -32,7 +32,7 @@ #include "basic/selinux-util.h" #include "basic/signal-util.h" #include "basic/string-util.h" -#include "udev-util.h" +#include "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 dc53491e99..50da66bde1 100644 --- a/src/test/test-uid-range.c +++ b/src/test/test-uid-range.c @@ -20,7 +20,7 @@ #include #include "basic/alloc-util.h" -#include "uid-range.h" +#include "shared/uid-range.h" #include "basic/user-util.h" #include "basic/util.h" diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 562398c40a..09481364b9 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -31,16 +31,16 @@ #include "basic/fileio.h" #include "basic/hashmap.h" #include "basic/hostname-util.h" -#include "install-printf.h" -#include "install.h" +#include "shared/install-printf.h" +#include "shared/install.h" #include "load-fragment.h" #include "basic/macro.h" #include "basic/rm-rf.h" -#include "specifier.h" +#include "shared/specifier.h" #include "basic/string-util.h" #include "basic/strv.h" #include "test-helper.h" -#include "tests.h" +#include "shared/tests.h" #include "basic/user-util.h" #include "basic/util.h" diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index cf003dc0de..b4c91cfa6c 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -30,7 +30,7 @@ #include "basic/macro.h" #include "manager.h" #include "basic/path-util.h" -#include "specifier.h" +#include "shared/specifier.h" #include "basic/string-util.h" #include "test-helper.h" #include "basic/unit-name.h" diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c index 011c957b14..64814fc174 100644 --- a/src/test/test-watchdog.c +++ b/src/test/test-watchdog.c @@ -20,7 +20,7 @@ #include #include "basic/log.h" -#include "watchdog.h" +#include "shared/watchdog.h" int main(int argc, char *argv[]) { usec_t t = 10 * USEC_PER_SEC; -- cgit v1.2.3-54-g00ecf