From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 17 Nov 2017 10:10:21 +0000 (+0100)
Subject: test-cgroup-util: skip cg hierarchy tests when necessary (#7371)
X-Git-Tag: v236~192
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05d69e0294b6bbc7aa348d4fd09bfa847b6e178a;p=thirdparty%2Fsystemd.git

test-cgroup-util: skip cg hierarchy tests when necessary (#7371)
---

diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 2c220578a3f..0761463067b 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -372,9 +372,14 @@ static void test_is_wanted(void) {
 }
 
 static void test_cg_tests(void) {
-        int all, hybrid, systemd;
+        int all, hybrid, systemd, r;
 
-        assert_se(cg_unified_flush() == 0);
+        r = cg_unified_flush();
+        if (r == -ENOMEDIUM) {
+                log_notice_errno(r, "Skipping cg hierarchy tests: %m");
+                return;
+        }
+        assert_se(r == 0);
 
         all = cg_all_unified();
         assert_se(IN_SET(all, 0, 1));