diff options
Diffstat (limited to 'src/test/test-helper.c')
| -rw-r--r-- | src/test/test-helper.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/test/test-helper.c b/src/test/test-helper.c index 5b707c3276..c371e199ba 100644 --- a/src/test/test-helper.c +++ b/src/test/test-helper.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ /*** This file is part of systemd. @@ -22,20 +23,25 @@ #include "alloc-util.h" #include "cgroup-util.h" -void enter_cgroup_subroot(void) { +int enter_cgroup_subroot(void) { _cleanup_free_ char *cgroup_root = NULL, *cgroup_subroot = NULL; CGroupMask supported; + int r; + + r = cg_pid_get_path(NULL, 0, &cgroup_root); + if (r == -ENOMEDIUM) + return log_warning_errno(r, "cg_pid_get_path(NULL, 0, ...) failed: %m"); + assert(r >= 0); - assert_se(cg_pid_get_path(NULL, 0, &cgroup_root) >= 0); assert_se(asprintf(&cgroup_subroot, "%s/%" PRIx64, cgroup_root, random_u64()) >= 0); assert_se(cg_mask_supported(&supported) >= 0); /* If this fails, then we don't mind as the later cgroup operations will fail too, and it's fine if we handle * any errors at that point. */ - if (cg_create_everywhere(supported, _CGROUP_MASK_ALL, cgroup_subroot) < 0) - return; + r = cg_create_everywhere(supported, _CGROUP_MASK_ALL, cgroup_subroot); + if (r < 0) + return r; - if (cg_attach_everywhere(supported, cgroup_subroot, 0, NULL, NULL) < 0) - return; + return cg_attach_everywhere(supported, cgroup_subroot, 0, NULL, NULL); } |