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=eb5800026d5a6754514fb8f8a8561b49974fc879;hp=a4cc3d44a288ed94c0839bd6970e4bcc8088fb99;hpb=96115cdfe0241ae9b4e7177cd3874c0a93d00b39;p=elogind.git diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index a4cc3d44a..6b3128d3b 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -25,22 +25,21 @@ #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; FDSet *fdset = NULL; int r; - const char *dir = TEST_DIR; /* prepare the test */ - assert_se(set_unit_path(dir) >= 0); - r = manager_new(SYSTEMD_USER, &m); - if (r == -EPERM || r == -EACCES || r == -EADDRINUSE || r == -EHOSTDOWN) { + assert_se(set_unit_path(TEST_DIR) >= 0); + 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 */