From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: keescook@chromium.org, shuah@kernel.org, netdev@vger.kernel.org,
luto@amacapital.net, wad@chromium.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-team@fb.com, Tim.Bird@sony.com,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v6 3/5] kselftest: run tests by fixture
Date: Mon, 27 Apr 2020 18:03:49 -0700 [thread overview]
Message-ID: <20200428010351.331260-4-kuba@kernel.org> (raw)
In-Reply-To: <20200428010351.331260-1-kuba@kernel.org>
Now that all tests have a fixture object move from a global
list of tests to a list of tests per fixture.
Order of tests may change as we will now group and run test
fixture by fixture, rather than in declaration order.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
---
v5 (Kees):
- move a comment;
- remove temporary variable.
---
tools/testing/selftests/kselftest_harness.h | 23 +++++++++++++--------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index de283fd6fc4d..fa7185e45472 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -659,9 +659,12 @@
} \
}
+struct __test_metadata;
+
/* Contains all the information about a fixture. */
struct __fixture_metadata {
const char *name;
+ struct __test_metadata *tests;
struct __fixture_metadata *prev, *next;
} _fixture_global __attribute__((unused)) = {
.name = "global",
@@ -698,7 +701,6 @@ struct __test_metadata {
};
/* Storage for the (global) tests to be run. */
-static struct __test_metadata *__test_list;
static unsigned int __test_count;
/*
@@ -713,7 +715,7 @@ static unsigned int __test_count;
static inline void __register_test(struct __test_metadata *t)
{
__test_count++;
- __LIST_APPEND(__test_list, t);
+ __LIST_APPEND(t->fixture->tests, t);
}
static inline int __bail(int for_realz, bool no_print, __u8 step)
@@ -843,6 +845,7 @@ void __run_test(struct __fixture_metadata *f,
static int test_harness_run(int __attribute__((unused)) argc,
char __attribute__((unused)) **argv)
{
+ struct __fixture_metadata *f;
struct __test_metadata *t;
int ret = 0;
unsigned int count = 0;
@@ -851,13 +854,15 @@ static int test_harness_run(int __attribute__((unused)) argc,
/* TODO(wad) add optional arguments similar to gtest. */
printf("[==========] Running %u tests from %u test cases.\n",
__test_count, __fixture_count + 1);
- for (t = __test_list; t; t = t->next) {
- count++;
- __run_test(t->fixture, t);
- if (t->passed)
- pass_count++;
- else
- ret = 1;
+ for (f = __fixture_list; f; f = f->next) {
+ for (t = f->tests; t; t = t->next) {
+ count++;
+ __run_test(f, t);
+ if (t->passed)
+ pass_count++;
+ else
+ ret = 1;
+ }
}
printf("[==========] %u / %u tests passed.\n", pass_count, count);
printf("[ %s ]\n", (ret ? "FAILED" : "PASSED"));
--
2.25.4
next prev parent reply other threads:[~2020-04-28 1:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 1:03 [PATCH net-next v6 0/5] kselftest: add fixture parameters Jakub Kicinski
2020-04-28 1:03 ` [PATCH net-next v6 1/5] kselftest: factor out list manipulation to a helper Jakub Kicinski
2020-04-28 1:03 ` [PATCH net-next v6 2/5] kselftest: create fixture objects Jakub Kicinski
2020-04-28 1:03 ` Jakub Kicinski [this message]
2020-04-28 1:03 ` [PATCH net-next v6 4/5] kselftest: add fixture variants Jakub Kicinski
2020-04-28 1:03 ` [PATCH net-next v6 5/5] selftests: tls: run all tests for TLS 1.2 and TLS 1.3 Jakub Kicinski
2020-04-28 20:31 ` [PATCH net-next v6 0/5] kselftest: add fixture parameters David Miller
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=20200428010351.331260-4-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=Tim.Bird@sony.com \
--cc=davem@davemloft.net \
--cc=keescook@chromium.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=netdev@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=wad@chromium.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).