From: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
To: bpf@vger.kernel.org, ast@kernel.org, andrii@kernel.org,
daniel@iogearbox.net, kafai@fb.com, kernel-team@fb.com
Subject: [PATCH bpf-next] selftests: fix test group SKIPPED result
Date: Fri, 28 Oct 2022 10:55:30 -0700 [thread overview]
Message-ID: <20221028175530.1413351-1-cerasuolodomenico@gmail.com> (raw)
From: Domenico Cerasuolo <dceras@meta.com>
When showing the result of a test group, if one
of the subtests was skipped, while still having
passing subtets, the group result was marked as
SKIPPED.
#223/1 usdt/basic:SKIP
#223/2 usdt/multispec:OK
#223 usdt:SKIP
With this change only if all of the subtests
were skipped the group test is marked as SKIPPED.
#223/1 usdt/basic:SKIP
#223/2 usdt/multispec:OK
#223 usdt:OK
Signed-off-by: Domenico Cerasuolo <dceras@meta.com>
---
tools/testing/selftests/bpf/test_progs.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 0e9a47f97890..14b70393018b 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -222,6 +222,11 @@ static char *test_result(bool failed, bool skipped)
return failed ? "FAIL" : (skipped ? "SKIP" : "OK");
}
+static char *test_group_result(int tests_count, bool failed, int skipped)
+{
+ return failed ? "FAIL" : (skipped == tests_count ? "SKIP" : "OK");
+}
+
static void print_test_log(char *log_buf, size_t log_cnt)
{
log_buf[log_cnt] = '\0';
@@ -308,7 +313,8 @@ static void dump_test_log(const struct prog_test_def *test,
}
print_test_name(test->test_num, test->test_name,
- test_result(test_failed, test_state->skip_cnt));
+ test_group_result(test_state->subtest_num,
+ test_failed, test_state->skip_cnt));
}
static void stdio_restore(void);
@@ -1071,7 +1077,8 @@ static void run_one_test(int test_num)
if (verbose() && env.worker_id == -1)
print_test_name(test_num + 1, test->test_name,
- test_result(state->error_cnt, state->skip_cnt));
+ test_group_result(state->subtest_num,
+ state->error_cnt, state->skip_cnt));
reset_affinity();
restore_netns();
--
2.30.2
next reply other threads:[~2022-10-28 17:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-28 17:55 Domenico Cerasuolo [this message]
2022-10-28 23:24 ` [PATCH bpf-next] selftests: fix test group SKIPPED result John Fastabend
2022-10-31 23:44 ` Mykola Lysenko
2022-11-01 14:23 ` Daniel Borkmann
2022-11-01 15:37 ` Mykola Lysenko
2022-11-04 21:34 ` Andrii Nakryiko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221028175530.1413351-1-cerasuolodomenico@gmail.com \
--to=cerasuolodomenico@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=kernel-team@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox