diff options
| author | Andrii Nakryiko <andrii@kernel.org> | 2021-04-26 12:29:45 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-04-26 18:37:13 -0700 |
| commit | 7a2fa70aaffc2f8823feca22709a00f5c069a8a9 (patch) | |
| tree | c1b6ec1d78c4d6cdcc24fb8920a97c20393d9a2d /tools/testing/selftests/bpf/prog_tests/resolve_btfids.c | |
| parent | 87bd9e602e39585c5280556a2b6a6363bb334257 (diff) | |
| download | linux-7a2fa70aaffc2f8823feca22709a00f5c069a8a9.tar.gz linux-7a2fa70aaffc2f8823feca22709a00f5c069a8a9.tar.bz2 linux-7a2fa70aaffc2f8823feca22709a00f5c069a8a9.zip | |
selftests/bpf: Add remaining ASSERT_xxx() variants
Add ASSERT_TRUE/ASSERT_FALSE for conditions calculated with custom logic to
true/false. Also add remaining arithmetical assertions:
- ASSERT_LE -- less than or equal;
- ASSERT_GT -- greater than;
- ASSERT_GE -- greater than or equal.
This should cover most scenarios where people fall back to error-prone
CHECK()s.
Also extend ASSERT_ERR() to print out errno, in addition to direct error.
Also convert few CHECK() instances to ensure new ASSERT_xxx() variants work as
expected. Subsequent patch will also use ASSERT_TRUE/ASSERT_FALSE more
extensively.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Lorenz Bauer <lmb@cloudflare.com>
Link: https://lore.kernel.org/bpf/20210426192949.416837-2-andrii@kernel.org
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/resolve_btfids.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/resolve_btfids.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c index 6ace5e9efec1..d3c2de2c24d1 100644 --- a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c +++ b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c @@ -160,11 +160,8 @@ int test_resolve_btfids(void) break; if (i > 0) { - ret = CHECK(test_set.ids[i - 1] > test_set.ids[i], - "sort_check", - "test_set is not sorted\n"); - if (ret) - break; + if (!ASSERT_LE(test_set.ids[i - 1], test_set.ids[i], "sort_check")) + return -1; } } |