diff options
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-cleanup.c | 22 | ||||
| -rw-r--r-- | src/test/test-engine.c | 2 | ||||
| -rw-r--r-- | src/test/test-sched-prio.c | 2 |
3 files changed, 21 insertions, 5 deletions
diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libsystemd/sd-bus/test-bus-cleanup.c index e36a69f0d1..f586880593 100644 --- a/src/libsystemd/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/sd-bus/test-bus-cleanup.c @@ -34,11 +34,18 @@ static void test_bus_new(void) { printf("after new: refcount %u\n", REFCNT_GET(bus->n_ref)); } -static void test_bus_open(void) { +static int test_bus_open(void) { _cleanup_bus_unref_ sd_bus *bus = NULL; + int r; - assert_se(sd_bus_open_system(&bus) >= 0); + r = sd_bus_open_system(&bus); + if (r == -ECONNREFUSED || r == -ENOENT) + return r; + + assert_se(r >= 0); printf("after open: refcount %u\n", REFCNT_GET(bus->n_ref)); + + return 0; } static void test_bus_new_method_call(void) { @@ -70,11 +77,20 @@ static void test_bus_new_signal(void) { } int main(int argc, char **argv) { + int r; + log_parse_environment(); log_open(); test_bus_new(); - test_bus_open(); + r = test_bus_open(); + if (r < 0) { + log_info("Failed to connect to bus, skipping tests."); + return EXIT_TEST_SKIP; + } + test_bus_new_method_call(); test_bus_new_signal(); + + return EXIT_SUCCESS; } diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 1b71416a04..6acd394c67 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { /* prepare the test */ assert_se(set_unit_path(TEST_DIR) >= 0); r = manager_new(SYSTEMD_USER, true, &m); - if (r == -EPERM || r == -EACCES || r == -EADDRINUSE || r == -EHOSTDOWN) { + if (IN_SET(r, -EPERM, -EACCES, -EADDRINUSE, -EHOSTDOWN, -ENOENT)) { printf("Skipping test: manager_new: %s", strerror(-r)); return EXIT_TEST_SKIP; } diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index 2f559b0413..6b3128d3b7 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, true, &m); - if (r == -EPERM || r == -EACCES || r == -EADDRINUSE || r == -EHOSTDOWN) { + if (IN_SET(r, -EPERM, -EACCES, -EADDRINUSE, -EHOSTDOWN, -ENOENT)) { printf("Skipping test: manager_new: %s", strerror(-r)); return EXIT_TEST_SKIP; } |