From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 11 Sep 2021 11:37:50 +0000 (+0900)
Subject: test-oomd-util: skip tests if cgroup memory controller is not available
X-Git-Tag: v250-rc1~694^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b2e22579a6549ab8423858819703fc142862bcb;p=thirdparty%2Fsystemd.git

test-oomd-util: skip tests if cgroup memory controller is not available

Fixes #20593 and #20655.
---

diff --git a/src/oom/test-oomd-util.c b/src/oom/test-oomd-util.c
index 776c65820e3..29f2c54ab13 100644
--- a/src/oom/test-oomd-util.c
+++ b/src/oom/test-oomd-util.c
@@ -90,6 +90,7 @@ static void test_oomd_cgroup_context_acquire_and_insert(void) {
         _cleanup_free_ char *cgroup = NULL;
         ManagedOOMPreference root_pref;
         OomdCGroupContext *c1, *c2;
+        CGroupMask mask;
         bool test_xattrs;
         int root_xattrs, r;
 
@@ -102,6 +103,11 @@ static void test_oomd_cgroup_context_acquire_and_insert(void) {
         if (cg_all_unified() <= 0)
                 return (void) log_tests_skipped("cgroups are not running in unified mode");
 
+        assert_se(cg_mask_supported(&mask) >= 0);
+
+        if (!FLAGS_SET(mask, CGROUP_MASK_MEMORY))
+                return (void) log_tests_skipped("cgroup memory controller is not available");
+
         assert_se(cg_pid_get_path(NULL, 0, &cgroup) >= 0);
 
         /* If we don't have permissions to set xattrs we're likely in a userns or missing capabilities