From f0b7ca9768f8b451832c340a9bfdf5561dc9f34d Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 10 May 2025 12:31:19 +0100 Subject: [PATCH] test: fix root check for test-bpf-foreign-programs This test requires root, but the check was mistakenly dropped, causing it to fail with an assert when running without root: src/test/test-bpf-foreign-programs.c:308: Assertion failed: expected "test_bpf_cgroup_programs(m, "single_prog.service", single_prog, ELEMENTSOF(single_prog))" to succeed, but got error: Operation not permitted Restore the uid check Follow-up for 22e2f0642897cfa7ba975527f5394bd7fcdf639b --- src/test/test-bpf-foreign-programs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/test-bpf-foreign-programs.c b/src/test/test-bpf-foreign-programs.c index 3128b26b8eb..337243972c2 100644 --- a/src/test/test-bpf-foreign-programs.c +++ b/src/test/test-bpf-foreign-programs.c @@ -279,9 +279,12 @@ int main(int argc, char *argv[]) { if (detect_container() > 0) return log_tests_skipped("test-bpf fails inside LXC and Docker containers: https://github.com/systemd/systemd/issues/9666"); + if (getuid() != 0) + return log_tests_skipped("not running as root"); + r = bpf_program_supported(); if (r < 0) - return log_tests_skipped_errno(r, "not running as root"); + return log_tests_skipped_errno(r, "BPF programs not supported"); ASSERT_OK(getrlimit(RLIMIT_MEMLOCK, &rl)); rl.rlim_cur = rl.rlim_max = MAX(rl.rlim_max, CAN_MEMLOCK_SIZE); -- 2.47.3