From 26444635eabf481dfa05d18cc552cb90a6885a54 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 11 Nov 2019 21:04:25 +0100 Subject: [PATCH] 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. --- src/test/test-bpf-devices.c | 4 ++++ 1 file changed, 4 insertions(+) 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()"); -- 2.47.3