X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-sched-prio.c;h=6b3128d3b7956f3e852406cb463fd143f26197f7;hb=0e707326fcecd3968efa7dc827123032f1b2cb61;hp=ba0aacf79dfe422147ee7d2514b34bbfa1902d8d;hpb=49e5de64e22ea4794092b91393545ab08e658e0a;p=elogind.git diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index ba0aacf79..6b3128d3b 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -25,7 +25,7 @@ #include "macro.h" int main(int argc, char *argv[]) { - Manager *m; + Manager *m = NULL; Unit *idle_ok, *idle_bad, *rr_ok, *rr_bad, *rr_sched; Service *ser; FILE *serial = NULL; @@ -34,12 +34,12 @@ int main(int argc, char *argv[]) { /* prepare the test */ assert_se(set_unit_path(TEST_DIR) >= 0); - r = manager_new(SYSTEMD_USER, &m); - if (r == -EPERM) { - puts("manager_new: Permission denied. Skipping test."); + r = manager_new(SYSTEMD_USER, true, &m); + if (IN_SET(r, -EPERM, -EACCES, -EADDRINUSE, -EHOSTDOWN, -ENOENT)) { + printf("Skipping test: manager_new: %s", strerror(-r)); return EXIT_TEST_SKIP; } - assert(r >= 0); + assert_se(r >= 0); assert_se(manager_startup(m, serial, fdset) >= 0); /* load idle ok */ @@ -88,5 +88,7 @@ int main(int argc, char *argv[]) { assert_se(ser->exec_context.cpu_sched_policy == SCHED_RR); assert_se(ser->exec_context.cpu_sched_priority == 99); + manager_free(m); + return EXIT_SUCCESS; }