| From 4cd12df48b83cef9cc7d6b80b128afbf68746718 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Sat, 14 Mar 2020 07:31:34 -0700 |
| Subject: [PATCH] selftest/bpf: Use CHECK macro instead of RET_IF |
| |
| backporting 634efb750435d0a489dc58477d4fcb88b2692942 causes build |
| failures because RET_IF is defined in 7ee0d4e97b889c0478af9c1a6e5af658b181423f |
| but that is not backported |
| |
| Upstream-Status: Submitted |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Cc: Jakub Sitnicki <jakub@cloudflare.com> |
| Cc: Alexei Starovoitov <ast@kernel.org> |
| Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> |
| --- |
| tools/testing/selftests/bpf/test_select_reuseport.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/tools/testing/selftests/bpf/test_select_reuseport.c b/tools/testing/selftests/bpf/test_select_reuseport.c |
| index 079d0f5a2909..7e4c91f2238d 100644 |
| --- a/tools/testing/selftests/bpf/test_select_reuseport.c |
| +++ b/tools/testing/selftests/bpf/test_select_reuseport.c |
| @@ -668,12 +668,12 @@ static void cleanup_per_test(void) |
| |
| for (i = 0; i < NR_RESULTS; i++) { |
| err = bpf_map_update_elem(result_map, &i, &zero, BPF_ANY); |
| - RET_IF(err, "reset elem in result_map", |
| + CHECK(err, "reset elem in result_map", |
| "i:%u err:%d errno:%d\n", i, err, errno); |
| } |
| |
| err = bpf_map_update_elem(linum_map, &zero, &zero, BPF_ANY); |
| - RET_IF(err, "reset line number in linum_map", "err:%d errno:%d\n", |
| + CHECK(err, "reset line number in linum_map", "err:%d errno:%d\n", |
| err, errno); |
| |
| for (i = 0; i < REUSEPORT_ARRAY_SIZE; i++) |
| -- |
| 2.26.0 |
| |