tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

selftests/bpf: Convert sockopt_inherit test to ASSERT_* macros

Convert the selftest to use the preferred ASSERT_* macros instead of the
deprecated CHECK().

Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/1664169131-32405-5-git-send-email-wangyufen@huawei.com

authored by

Wang Yufen and committed by
Andrii Nakryiko 675bc8ab 099763e7

+13 -17
+13 -17
tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
··· 76 76 pthread_cond_signal(&server_started); 77 77 pthread_mutex_unlock(&server_started_mtx); 78 78 79 - if (CHECK_FAIL(err < 0)) { 80 - perror("Failed to listed on socket"); 79 + if (!ASSERT_GE(err, 0, "listed on socket")) 81 80 return NULL; 82 - } 83 81 84 82 err += verify_sockopt(fd, CUSTOM_INHERIT1, "listen", 1); 85 83 err += verify_sockopt(fd, CUSTOM_INHERIT2, "listen", 1); 86 84 err += verify_sockopt(fd, CUSTOM_LISTENER, "listen", 1); 87 85 88 86 client_fd = accept(fd, (struct sockaddr *)&addr, &len); 89 - if (CHECK_FAIL(client_fd < 0)) { 90 - perror("Failed to accept client"); 87 + if (!ASSERT_GE(client_fd, 0, "accept client")) 91 88 return NULL; 92 - } 93 89 94 90 err += verify_sockopt(client_fd, CUSTOM_INHERIT1, "accept", 1); 95 91 err += verify_sockopt(client_fd, CUSTOM_INHERIT2, "accept", 1); ··· 179 183 goto close_bpf_object; 180 184 181 185 err = prog_attach(obj, cgroup_fd, "cgroup/getsockopt", "_getsockopt"); 182 - if (CHECK_FAIL(err)) 186 + if (!ASSERT_OK(err, "prog_attach _getsockopt")) 183 187 goto close_bpf_object; 184 188 185 189 err = prog_attach(obj, cgroup_fd, "cgroup/setsockopt", "_setsockopt"); 186 - if (CHECK_FAIL(err)) 190 + if (!ASSERT_OK(err, "prog_attach _setsockopt")) 187 191 goto close_bpf_object; 188 192 189 193 server_fd = start_server(); 190 - if (CHECK_FAIL(server_fd < 0)) 194 + if (!ASSERT_GE(server_fd, 0, "start_server")) 191 195 goto close_bpf_object; 192 196 193 197 pthread_mutex_lock(&server_started_mtx); 194 - if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread, 195 - (void *)&server_fd))) { 198 + if (!ASSERT_OK(pthread_create(&tid, NULL, server_thread, 199 + (void *)&server_fd), "pthread_create")) { 196 200 pthread_mutex_unlock(&server_started_mtx); 197 201 goto close_server_fd; 198 202 } ··· 200 204 pthread_mutex_unlock(&server_started_mtx); 201 205 202 206 client_fd = connect_to_server(server_fd); 203 - if (CHECK_FAIL(client_fd < 0)) 207 + if (!ASSERT_GE(client_fd, 0, "connect_to_server")) 204 208 goto close_server_fd; 205 209 206 - CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_INHERIT1, "connect", 0)); 207 - CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_INHERIT2, "connect", 0)); 208 - CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_LISTENER, "connect", 0)); 210 + ASSERT_OK(verify_sockopt(client_fd, CUSTOM_INHERIT1, "connect", 0), "verify_sockopt1"); 211 + ASSERT_OK(verify_sockopt(client_fd, CUSTOM_INHERIT2, "connect", 0), "verify_sockopt2"); 212 + ASSERT_OK(verify_sockopt(client_fd, CUSTOM_LISTENER, "connect", 0), "verify_sockopt ener"); 209 213 210 214 pthread_join(tid, &server_err); 211 215 212 216 err = (int)(long)server_err; 213 - CHECK_FAIL(err); 217 + ASSERT_OK(err, "pthread_join retval"); 214 218 215 219 close(client_fd); 216 220 ··· 225 229 int cgroup_fd; 226 230 227 231 cgroup_fd = test__join_cgroup("/sockopt_inherit"); 228 - if (CHECK_FAIL(cgroup_fd < 0)) 232 + if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup")) 229 233 return; 230 234 231 235 run_test(cgroup_fd);