From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 26 Jun 2019 12:56:59 +0000 (+0200)
Subject: core: do not enumerate units in MANAGER_TEST_RUN_MINIMAL mode
X-Git-Tag: v243~340^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1d5246d2953415cb6ef7c229cf93e3151740725;p=platform%2Fupstream%2Fsystemd.git

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.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 78f03a8..0c1adf2 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)) {