X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-sched-prio.c;h=a4cc3d44a288ed94c0839bd6970e4bcc8088fb99;hb=dd513a5dbfa0d5f97084c7c8e475530a03cfd973;hp=c57f6a3671295f7fb4af08461d63a51cfed39da3;hpb=c5e33bf8342daa6bab22f495ef774741184de09d;p=elogind.git diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index c57f6a367..a4cc3d44a 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -22,7 +22,7 @@ #include #include "manager.h" - +#include "macro.h" int main(int argc, char *argv[]) { Manager *m; @@ -31,13 +31,14 @@ int main(int argc, char *argv[]) { FILE *serial = NULL; FDSet *fdset = NULL; int r; + const char *dir = TEST_DIR; /* prepare the test */ - assert_se(set_unit_path(TEST_DIR) >= 0); + assert_se(set_unit_path(dir) >= 0); r = manager_new(SYSTEMD_USER, &m); - if (r == -EPERM) { - puts("manager_new: Permission denied. Skipping test."); - return EXIT_SUCCESS; + if (r == -EPERM || r == -EACCES || r == -EADDRINUSE || r == -EHOSTDOWN) { + printf("Skipping test: manager_new: %s", strerror(-r)); + return EXIT_TEST_SKIP; } assert(r >= 0); assert_se(manager_startup(m, serial, fdset) >= 0); @@ -88,5 +89,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; }