From: Geliang Tang <tanggeliang@xxxxxxxxxx>
Just like handling ENOTSUPP in test_lsm_cgroup_functional(), this patch
checks ENOTSUPP (524) and ENOTSUP (95) in ASSERT_OK(), invoke test__skip()
in this case instead of test__fail().
Signed-off-by: Geliang Tang <tanggeliang@xxxxxxxxxx>
---
tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c | 6 +-----
tools/testing/selftests/bpf/test_progs.h | 9 +++++++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c b/tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c
index 6df25de8f080..6511f5f4a00f 100644
--- a/tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c
+++ b/tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c
@@ -102,12 +102,8 @@ static void test_lsm_cgroup_functional(void)
ASSERT_EQ(query_prog_cnt(cgroup_fd, "bpf_lsm_sk_alloc_security"), 0, "prog count");
ASSERT_EQ(query_prog_cnt(cgroup_fd, NULL), 0, "total prog count");
err = bpf_prog_attach(alloc_prog_fd, cgroup_fd, BPF_LSM_CGROUP, 0);
- if (err == -ENOTSUPP) {
- test__skip();
- goto close_cgroup;
- }
if (!ASSERT_OK(err, "attach alloc_prog_fd"))
- goto detach_cgroup;
+ goto close_cgroup;
ASSERT_EQ(query_prog_cnt(cgroup_fd, "bpf_lsm_sk_alloc_security"), 1, "prog count");
ASSERT_EQ(query_prog_cnt(cgroup_fd, NULL), 1, "total prog count");
diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
index 0ba5a20b19ba..25f6976c08b5 100644
--- a/tools/testing/selftests/bpf/test_progs.h
+++ b/tools/testing/selftests/bpf/test_progs.h
@@ -338,8 +338,13 @@ int test__join_cgroup(const char *path);
static int duration = 0; \
long long ___res = (res); \
bool ___ok = ___res == 0; \
- CHECK(!___ok, (name), "unexpected error: %lld (errno %d)\n", \
- ___res, errno); \
+ if (___res == -ENOTSUPP || ___res == -ENOTSUP || \
+ errno == ENOTSUPP || errno == ENOTSUP) \
+ test__skip(); \
+ else \
+ CHECK(!___ok, (name), \
+ "unexpected error: %lld (errno %d)\n", \
+ ___res, errno); \
___ok; \
})
--
2.43.0
