diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-cgroup-mask.c | 2 | ||||
| -rw-r--r-- | src/test/test-engine.c | 2 | ||||
| -rw-r--r-- | src/test/test-execute.c | 2 | ||||
| -rw-r--r-- | src/test/test-path-lookup.c | 18 | ||||
| -rw-r--r-- | src/test/test-path.c | 2 | ||||
| -rw-r--r-- | src/test/test-sched-prio.c | 2 | ||||
| -rw-r--r-- | src/test/test-unit-name.c | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index d14a07e1f4..289dddbaac 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -35,7 +35,7 @@ static int test_cgroup_mask(void) { /* Prepare the manager. */ assert_se(set_unit_path(TEST_DIR) >= 0); - r = manager_new(SYSTEMD_USER, true, &m); + r = manager_new(MANAGER_USER, true, &m); if (r == -EPERM || r == -EACCES) { puts("manager_new: Permission denied. Skipping test."); return EXIT_TEST_SKIP; diff --git a/src/test/test-engine.c b/src/test/test-engine.c index d543d23b7a..a7ab21a415 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) { /* prepare the test */ assert_se(set_unit_path(TEST_DIR) >= 0); - r = manager_new(SYSTEMD_USER, true, &m); + r = manager_new(MANAGER_USER, true, &m); if (IN_SET(r, -EPERM, -EACCES, -EADDRINUSE, -EHOSTDOWN, -ENOENT)) { printf("Skipping test: manager_new: %s", strerror(-r)); return EXIT_TEST_SKIP; diff --git a/src/test/test-execute.c b/src/test/test-execute.c index a84a9254f9..0f4172e722 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) { assert_se(set_unit_path(TEST_DIR) >= 0); - r = manager_new(SYSTEMD_USER, true, &m); + r = manager_new(MANAGER_USER, true, &m); if (IN_SET(r, -EPERM, -EACCES, -EADDRINUSE, -EHOSTDOWN, -ENOENT)) { printf("Skipping test: manager_new: %s", strerror(-r)); return EXIT_TEST_SKIP; diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c index 66b0b99741..aa4bac6cdd 100644 --- a/src/test/test-path-lookup.c +++ b/src/test/test-path-lookup.c @@ -26,7 +26,7 @@ #include "strv.h" #include "rm-rf.h" -static void test_paths(SystemdRunningAs running_as, bool personal) { +static void test_paths(ManagerRunningAs running_as, bool personal) { char template[] = "/tmp/test-path-lookup.XXXXXXX"; _cleanup_lookup_paths_free_ LookupPaths lp = {}; @@ -46,11 +46,11 @@ static void test_paths(SystemdRunningAs running_as, bool personal) { assert_se(rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL) >= 0); } -static void print_generator_paths(SystemdRunningAs running_as) { +static void print_generator_paths(ManagerRunningAs running_as) { _cleanup_strv_free_ char **paths; char **dir; - log_info("Generators dirs (%s):", running_as == SYSTEMD_SYSTEM ? "system" : "user"); + log_info("Generators dirs (%s):", running_as == MANAGER_SYSTEM ? "system" : "user"); paths = generator_paths(running_as); STRV_FOREACH(dir, paths) @@ -62,13 +62,13 @@ int main(int argc, char **argv) { log_parse_environment(); log_open(); - test_paths(SYSTEMD_SYSTEM, false); - test_paths(SYSTEMD_SYSTEM, true); - test_paths(SYSTEMD_USER, false); - test_paths(SYSTEMD_USER, true); + test_paths(MANAGER_SYSTEM, false); + test_paths(MANAGER_SYSTEM, true); + test_paths(MANAGER_USER, false); + test_paths(MANAGER_USER, true); - print_generator_paths(SYSTEMD_SYSTEM); - print_generator_paths(SYSTEMD_USER); + print_generator_paths(MANAGER_SYSTEM); + print_generator_paths(MANAGER_USER); return EXIT_SUCCESS; } diff --git a/src/test/test-path.c b/src/test/test-path.c index 0504ae76bb..5d190378f1 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -39,7 +39,7 @@ static int setup_test(Manager **m) { assert_se(m); - r = manager_new(SYSTEMD_USER, true, &tmp); + r = manager_new(MANAGER_USER, true, &tmp); if (IN_SET(r, -EPERM, -EACCES, -EADDRINUSE, -EHOSTDOWN, -ENOENT)) { printf("Skipping test: manager_new: %s", strerror(-r)); return -EXIT_TEST_SKIP; diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index 6b3128d3b7..f915539e00 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) { /* prepare the test */ assert_se(set_unit_path(TEST_DIR) >= 0); - r = manager_new(SYSTEMD_USER, true, &m); + r = manager_new(MANAGER_USER, true, &m); if (IN_SET(r, -EPERM, -EACCES, -EADDRINUSE, -EHOSTDOWN, -ENOENT)) { printf("Skipping test: manager_new: %s", strerror(-r)); return EXIT_TEST_SKIP; diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index de8f7ddfa8..5053d69d1d 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -200,7 +200,7 @@ static int test_unit_printf(void) { assert_se((root = getpwnam("root"))); assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0); - r = manager_new(SYSTEMD_USER, true, &m); + r = manager_new(MANAGER_USER, true, &m); if (r == -EPERM || r == -EACCES || r == -EADDRINUSE) { puts("manager_new: Permission denied. Skipping test."); return EXIT_TEST_SKIP; |