diff options
author | Daniel Borkmann <daniel@iogearbox.net> | 2019-08-28 00:35:40 +0200 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2019-08-28 00:35:40 +0200 |
commit | 7bc7d83870b2bcbdd10e85935fc435e9d5d15659 (patch) | |
tree | 655d18d477eac4e67179af7be663a04050bd1f6b /tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c | |
parent | 08eea4f312c09e1c203ad3e7840978fe3240888e (diff) | |
parent | 86ccc384cfcac22f45b1158b57d9ef5b4079e027 (diff) |
Merge branch 'bpf-misc-test-fixes'
Stanislav Fomichev says:
====================
* add test__skip to indicate skipped tests
* remove global success/error counts (use environment)
* remove asserts from the tests
* remove unused ret from send_signal test
v3:
* QCHECK -> CHECK_FAIL (Daniel Borkmann)
v2:
* drop patch that changes output to keep consistent with test_verifier
(Alexei Starovoitov)
* QCHECK instead of test__fail (Andrii Nakryiko)
* test__skip count number of subtests (Andrii Nakryiko)
====================
Cc: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c')
-rw-r--r-- | tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c index ac44fda84833..d841dced971f 100644 --- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c +++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c @@ -51,9 +51,10 @@ retry: "err %d errno %d\n", err, errno)) goto disable_pmu; - assert(system("dd if=/dev/urandom of=/dev/zero count=4 2> /dev/null") - == 0); - assert(system("./urandom_read") == 0); + if (CHECK_FAIL(system("dd if=/dev/urandom of=/dev/zero count=4 2> /dev/null"))) + goto disable_pmu; + if (CHECK_FAIL(system("./urandom_read"))) + goto disable_pmu; /* disable stack trace collection */ key = 0; val = 1; |