chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: fix "make check"
[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 c57f6a3671295f7fb4af08461d63a51cfed39da3..a4cc3d44a288ed94c0839bd6970e4bcc8088fb99 100644
(file)
--- a/
src/test/test-sched-prio.c
+++ b/
src/test/test-sched-prio.c
@@
-22,7
+22,7
@@
#include <sched.h>
#include "manager.h"
#include <sched.h>
#include "manager.h"
-
+#include "macro.h"
int main(int argc, char *argv[]) {
Manager *m;
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;
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."
);
- return EXIT_
SUCCESS
;
+ 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);
assert_se(manager_startup(m, serial, fdset) >= 0);
}
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);
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;
}