From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 11 Nov 2019 20:04:25 +0000 (+0100)
Subject: test-bpf-devices: skip test on !unified
X-Git-Tag: v244-rc1~62^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26444635eabf481dfa05d18cc552cb90a6885a54;p=thirdparty%2Fsystemd.git

test-bpf-devices: skip test on !unified

The code in cgroup.c has support for all hierarchies, but the test,
as written, will only work on unified. Since the test is really about
bpf code, and not the legacy devices controller, let's just skip
the test.
---

diff --git a/src/test/test-bpf-devices.c b/src/test/test-bpf-devices.c
index aaa2c3ce3a4..1322af48122 100644
--- a/src/test/test-bpf-devices.c
+++ b/src/test/test-bpf-devices.c
@@ -263,6 +263,10 @@ int main(int argc, char *argv[]) {
         rl.rlim_cur = rl.rlim_max = MAX(rl.rlim_max, CAN_MEMLOCK_SIZE);
         (void) setrlimit(RLIMIT_MEMLOCK, &rl);
 
+        r = cg_all_unified();
+        if (r <= 0)
+                return log_tests_skipped("We don't seem to be running with unified cgroup hierarchy");
+
         if (!can_memlock())
                 return log_tests_skipped("Can't use mlock()");