diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-11-19 21:01:24 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-20 19:37:02 +0100 |
| commit | a454d241ef8b08e0984c6efbbd6187d70e32145b (patch) | |
| tree | 190f029d8033649e98c9189e18710112a25076b0 /src/test | |
| parent | 911121a7c837040454c5d0422e2a225a8d799eef (diff) | |
test: exit early if we would conflict with running user systemd
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-sched-prio.c | 2 | ||||
| -rw-r--r-- | src/test/test-unit-name.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index 1bbe867317..aee75e81cf 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) { /* prepare the test */ assert_se(set_unit_path(TEST_DIR) >= 0); r = manager_new(SYSTEMD_USER, false, &m); - if (r == -EPERM || r == -EACCES) { + if (r == -EPERM || r == -EACCES || r == -EADDRINUSE) { puts("manager_new: Permission denied. Skipping test."); return EXIT_TEST_SKIP; } diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index 67ccdd4228..bde643ad56 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -125,7 +125,7 @@ static int test_unit_printf(void) { assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0); r = manager_new(SYSTEMD_USER, false, &m); - if (r == -EPERM || r == -EACCES) { + if (r == -EPERM || r == -EACCES || r == -EADDRINUSE) { puts("manager_new: Permission denied. Skipping test."); return EXIT_TEST_SKIP; } |