diff options
author | Alexei Starovoitov <ast@kernel.org> | 2019-08-06 20:17:52 -0400 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2019-08-06 20:17:53 -0400 |
commit | 682cdbdc216028f5340e48e92e59e3e9503957bb (patch) | |
tree | 1822c880732872e2ffb4a9496a4bfaf221da58ce /tools/testing/selftests/bpf/prog_tests/send_signal.c | |
parent | 8c30396074c131765b19eb3cb7ff764a4f2f2913 (diff) | |
parent | 16e910d4467ccdf1cae5035e71035e5f7197e77d (diff) |
Merge branch 'test_progs-stdio'
Stanislav Fomichev says:
====================
I was looking into converting test_sockops* to test_progs framework
and that requires using cgroup_helpers.c which rely on stdio/stderr.
Let's use open_memstream to override stdout into buffer during
subtests instead of custom test_{v,}printf wrappers. That lets
us continue to use stdio in the subtests and dump it on failure
if required.
That would also fix bpf_find_map which currently uses printf to
signal failure (missed during test_printf conversion).
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/send_signal.c')
-rw-r--r-- | tools/testing/selftests/bpf/prog_tests/send_signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/send_signal.c b/tools/testing/selftests/bpf/prog_tests/send_signal.c index 461b423d0584..1575f0a1f586 100644 --- a/tools/testing/selftests/bpf/prog_tests/send_signal.c +++ b/tools/testing/selftests/bpf/prog_tests/send_signal.c | |||
@@ -202,8 +202,8 @@ static int test_send_signal_nmi(void) | |||
202 | -1 /* cpu */, -1 /* group_fd */, 0 /* flags */); | 202 | -1 /* cpu */, -1 /* group_fd */, 0 /* flags */); |
203 | if (pmu_fd == -1) { | 203 | if (pmu_fd == -1) { |
204 | if (errno == ENOENT) { | 204 | if (errno == ENOENT) { |
205 | test__printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", | 205 | printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", |
206 | __func__); | 206 | __func__); |
207 | return 0; | 207 | return 0; |
208 | } | 208 | } |
209 | /* Let the test fail with a more informative message */ | 209 | /* Let the test fail with a more informative message */ |