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 208fca854033b39748438006659f7cd35c25c4a6..6b3128d3b7956f3e852406cb463fd143f26197f7 100644
(file)
--- 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[]) {
#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;
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);
/* prepare the test */
assert_se(set_unit_path(TEST_DIR) >= 0);
- r = manager_new(SYSTEMD_USER,
fals
e, &m);
- if (
r == -EPERM || r == -EACCES || r == -EADDRINUSE || r == -EHOSTDOWN
) {
+ r = manager_new(SYSTEMD_USER,
tru
e, &m);
+ if (
IN_SET(r, -EPERM, -EACCES, -EADDRINUSE, -EHOSTDOWN, -ENOENT)
) {
printf("Skipping test: manager_new: %s", strerror(-r));
return EXIT_TEST_SKIP;
}
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 */
assert_se(manager_startup(m, serial, fdset) >= 0);
/* load idle ok */