chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load-fragment: remove wrong ifdef guard
[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 63f7ebda08d05bedc1d0abe8ddcedf8224247a30..6b3128d3b7956f3e852406cb463fd143f26197f7 100644
(file)
--- a/
src/test/test-sched-prio.c
+++ b/
src/test/test-sched-prio.c
@@
-22,18
+22,24
@@
#include <sched.h>
#include "manager.h"
#include <sched.h>
#include "manager.h"
-
+#include "macro.h"
int main(int argc, char *argv[]) {
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;
Unit *idle_ok, *idle_bad, *rr_ok, *rr_bad, *rr_sched;
Service *ser;
FILE *serial = NULL;
FDSet *fdset = NULL;
+ int r;
/* prepare the test */
assert_se(set_unit_path(TEST_DIR) >= 0);
/* prepare the test */
assert_se(set_unit_path(TEST_DIR) >= 0);
- assert_se(manager_new(SYSTEMD_USER, &m) >= 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_se(r >= 0);
assert_se(manager_startup(m, serial, fdset) >= 0);
/* load idle ok */
assert_se(manager_startup(m, serial, fdset) >= 0);
/* load idle ok */
@@
-82,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);
assert_se(ser->exec_context.cpu_sched_policy == SCHED_RR);
assert_se(ser->exec_context.cpu_sched_priority == 99);
- return 0;
+ manager_free(m);
+
+ return EXIT_SUCCESS;
}
}