chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwdb: fix case-sensitive match
[elogind.git]
/
src
/
test
/
test-sched-prio.c
diff --git
a/src/test/test-sched-prio.c
b/src/test/test-sched-prio.c
index ba0aacf79dfe422147ee7d2514b34bbfa1902d8d..e984ee420375478b828d075d00e1156301511d71 100644
(file)
--- a/
src/test/test-sched-prio.c
+++ b/
src/test/test-sched-prio.c
@@
-25,18
+25,19
@@
#include "macro.h"
int main(int argc, char *argv[]) {
#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;
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 */
/* prepare the test */
- assert_se(set_unit_path(
TEST_DIR
) >= 0);
+ assert_se(set_unit_path(
dir
) >= 0);
r = manager_new(SYSTEMD_USER, &m);
r = manager_new(SYSTEMD_USER, &m);
- if (r == -EPERM) {
- p
uts("manager_new: Permission denied. Skipping test."
);
+ if (r == -EPERM
|| r == -EACCES || r == -EADDRINUSE || r == -EHOSTDOWN
) {
+ p
rintf("Skipping test: manager_new: %s", strerror(-r)
);
return EXIT_TEST_SKIP;
}
assert(r >= 0);
return EXIT_TEST_SKIP;
}
assert(r >= 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);
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;
}
return EXIT_SUCCESS;
}