From: Luca Boccassi <bluca@debian.org>
Date: Wed, 30 Jun 2021 23:04:58 +0000 (+0100)
Subject: core: do not setup/teardown cgroup if MANAGER_TEST_RUN_MINIMAL is set as a flag
X-Git-Tag: v249-rc3~12^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dd2f5ff078423d2e191b699b7f3bb38abf654b3;p=thirdparty%2Fsystemd.git

core: do not setup/teardown cgroup if MANAGER_TEST_RUN_MINIMAL is set as a flag

Rather than checking if test_run_flags is set exclusively to MANAGER_TEST_RUN_MINIMAL,
check if it is set as a flag, so that it can be used together with other flags.
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 3f8e06240fa..8f39c9436bf 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -3303,7 +3303,7 @@ void manager_shutdown_cgroup(Manager *m, bool delete) {
 
         /* We can't really delete the group, since we are in it. But
          * let's trim it. */
-        if (delete && m->cgroup_root && m->test_run_flags != MANAGER_TEST_RUN_MINIMAL)
+        if (delete && m->cgroup_root && !FLAGS_SET(m->test_run_flags, MANAGER_TEST_RUN_MINIMAL))
                 (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, false);
 
         m->cgroup_empty_event_source = sd_event_source_unref(m->cgroup_empty_event_source);
diff --git a/src/core/manager.c b/src/core/manager.c
index f3275a4070e..c239737e400 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -870,7 +870,7 @@ int manager_new(UnitFileScope scope, ManagerTestRunFlags test_run_flags, Manager
         if (r < 0)
                 return r;
 
-        if (test_run_flags == MANAGER_TEST_RUN_MINIMAL) {
+        if (FLAGS_SET(test_run_flags, MANAGER_TEST_RUN_MINIMAL)) {
                 m->cgroup_root = strdup("");
                 if (!m->cgroup_root)
                         return -ENOMEM;