bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrii Nakryiko <andrii@kernel.org>
To: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>, <ast@fb.com>,
	<daniel@iogearbox.net>
Cc: <andrii@kernel.org>, <kernel-team@fb.com>
Subject: [PATCH v2 bpf-next 6/7] selftests/bpf: add support for marking sub-tests as skipped
Date: Mon, 30 Nov 2020 16:31:36 -0800	[thread overview]
Message-ID: <20201201003137.1692914-7-andrii@kernel.org> (raw)
In-Reply-To: <20201201003137.1692914-1-andrii@kernel.org>

Previously skipped sub-tests would be counted as passing with ":OK" appened
in the log. Change that to be accounted as ":SKIP".

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 tools/testing/selftests/bpf/test_progs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 17587754b7a7..5ef081bdae4e 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -149,15 +149,15 @@ void test__end_subtest()
 
 	if (sub_error_cnt)
 		env.fail_cnt++;
-	else
+	else if (test->skip_cnt == 0)
 		env.sub_succ_cnt++;
 	skip_account();
 
 	dump_test_log(test, sub_error_cnt);
 
 	fprintf(env.stdout, "#%d/%d %s:%s\n",
-	       test->test_num, test->subtest_num,
-	       test->subtest_name, sub_error_cnt ? "FAIL" : "OK");
+	       test->test_num, test->subtest_num, test->subtest_name,
+	       sub_error_cnt ? "FAIL" : (test->skip_cnt ? "SKIP" : "OK"));
 
 	free(test->subtest_name);
 	test->subtest_name = NULL;
-- 
2.24.1


  parent reply	other threads:[~2020-12-01  0:33 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-01  0:31 [PATCH v2 bpf-next 0/7] libbpf: add support for kernel module BTF CO-RE relocations Andrii Nakryiko
2020-12-01  0:31 ` [PATCH v2 bpf-next 1/7] bpf: fix bpf_put_raw_tracepoint()'s use of __module_address() Andrii Nakryiko
2020-12-01  0:31 ` [PATCH v2 bpf-next 2/7] libbpf: add internal helper to load BTF data by FD Andrii Nakryiko
2020-12-01  0:31 ` [PATCH v2 bpf-next 3/7] libbpf: refactor CO-RE relocs to not assume a single BTF object Andrii Nakryiko
2020-12-01  0:31 ` [PATCH v2 bpf-next 4/7] libbpf: add kernel module BTF support for CO-RE relocations Andrii Nakryiko
2020-12-01  0:31 ` [PATCH v2 bpf-next 5/7] selftests/bpf: add bpf_testmod kernel module for testing Andrii Nakryiko
2020-12-01  0:31 ` Andrii Nakryiko [this message]
2020-12-01  0:31 ` [PATCH v2 bpf-next 7/7] selftests/bpf: add CO-RE relocs selftest relying on kernel module BTF 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=20201201003137.1692914-7-andrii@kernel.org \
    --to=andrii@kernel.org \
    --cc=ast@fb.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=kernel-team@fb.com \
    --cc=netdev@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).