From b1d5246d2953415cb6ef7c229cf93e3151740725 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 26 Jun 2019 14:56:59 +0200 Subject: [PATCH] core: do not enumerate units in MANAGER_TEST_RUN_MINIMAL mode In this mode we are not supposed to "interact with the environment", so loading all units and printing warnings about syntax errors and /var/run usage seems inappropriate. --- src/core/manager.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/core/manager.c b/src/core/manager.c index 78f03a824c..0c1adf2850 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1378,6 +1378,9 @@ static void manager_enumerate_perpetual(Manager *m) { assert(m); + if (m->test_run_flags == MANAGER_TEST_RUN_MINIMAL) + return; + /* Let's ask every type to load all units from disk/kernel that it might know */ for (c = 0; c < _UNIT_TYPE_MAX; c++) { if (!unit_type_supported(c)) { @@ -1395,6 +1398,9 @@ static void manager_enumerate(Manager *m) { assert(m); + if (m->test_run_flags == MANAGER_TEST_RUN_MINIMAL) + return; + /* Let's ask every type to load all units from disk/kernel that it might know */ for (c = 0; c < _UNIT_TYPE_MAX; c++) { if (!unit_type_supported(c)) { -- 2.25.1