From: Kees Cook <keescook@chromium.org>
To: Jakub Kicinski <kuba@kernel.org>
Cc: shuah@kernel.org, luto@amacapital.net, wad@chromium.org,
linux-kselftest@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-team@fb.com,
Tim.Bird@sony.com
Subject: Re: [PATCH v3 3/6] kselftest: create fixture objects
Date: Tue, 17 Mar 2020 13:23:23 -0700 [thread overview]
Message-ID: <202003171323.7A18C455@keescook> (raw)
In-Reply-To: <20200316225647.3129354-4-kuba@kernel.org>
On Mon, Mar 16, 2020 at 03:56:43PM -0700, Jakub Kicinski wrote:
> Grouping tests by fixture will allow us to parametrize
> test runs. Create full objects for fixtures.
>
> Add a "global" fixture for tests without a fixture.
>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
-Kees
> ---
> tools/testing/selftests/kselftest_harness.h | 46 ++++++++++++++++-----
> 1 file changed, 35 insertions(+), 11 deletions(-)
>
> diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
> index aaf58fffc8f7..0f68943d6f04 100644
> --- a/tools/testing/selftests/kselftest_harness.h
> +++ b/tools/testing/selftests/kselftest_harness.h
> @@ -169,8 +169,10 @@
> #define __TEST_IMPL(test_name, _signal) \
> static void test_name(struct __test_metadata *_metadata); \
> static struct __test_metadata _##test_name##_object = \
> - { .name = "global." #test_name, \
> - .fn = &test_name, .termsig = _signal, \
> + { .name = #test_name, \
> + .fn = &test_name, \
> + .fixture = &_fixture_global, \
> + .termsig = _signal, \
> .timeout = TEST_TIMEOUT_DEFAULT, }; \
> static void __attribute__((constructor)) _register_##test_name(void) \
> { \
> @@ -212,10 +214,12 @@
> * populated and cleaned up using FIXTURE_SETUP() and FIXTURE_TEARDOWN().
> */
> #define FIXTURE(fixture_name) \
> + static struct __fixture_metadata _##fixture_name##_fixture_object = \
> + { .name = #fixture_name, }; \
> static void __attribute__((constructor)) \
> _register_##fixture_name##_data(void) \
> { \
> - __fixture_count++; \
> + __register_fixture(&_##fixture_name##_fixture_object); \
> } \
> FIXTURE_DATA(fixture_name)
>
> @@ -309,8 +313,9 @@
> } \
> static struct __test_metadata \
> _##fixture_name##_##test_name##_object = { \
> - .name = #fixture_name "." #test_name, \
> + .name = #test_name, \
> .fn = &wrapper_##fixture_name##_##test_name, \
> + .fixture = &_##fixture_name##_fixture_object, \
> .termsig = signal, \
> .timeout = tmout, \
> }; \
> @@ -654,10 +659,33 @@
> } \
> }
>
> +/* Contains all the information about a fixture */
> +struct __fixture_metadata {
> + const char *name;
> + struct __fixture_metadata *prev, *next;
> +} _fixture_global __attribute__((unused)) = {
> + .name = "global",
> + .prev = &_fixture_global,
> +};
> +
> +static struct __fixture_metadata *__fixture_list = &_fixture_global;
> +static unsigned int __fixture_count;
> +static int __constructor_order;
> +
> +#define _CONSTRUCTOR_ORDER_FORWARD 1
> +#define _CONSTRUCTOR_ORDER_BACKWARD -1
> +
> +static inline void __register_fixture(struct __fixture_metadata *f)
> +{
> + __fixture_count++;
> + __LIST_APPEND(__fixture_list, f);
> +}
> +
> /* Contains all the information for test execution and status checking. */
> struct __test_metadata {
> const char *name;
> void (*fn)(struct __test_metadata *);
> + struct __fixture_metadata *fixture;
> int termsig;
> int passed;
> int trigger; /* extra handler after the evaluation */
> @@ -670,11 +698,6 @@ struct __test_metadata {
> /* Storage for the (global) tests to be run. */
> static struct __test_metadata *__test_list;
> static unsigned int __test_count;
> -static unsigned int __fixture_count;
> -static int __constructor_order;
> -
> -#define _CONSTRUCTOR_ORDER_FORWARD 1
> -#define _CONSTRUCTOR_ORDER_BACKWARD -1
>
> /*
> * Since constructors are called in reverse order, reverse the test
> @@ -708,7 +731,7 @@ void __run_test(struct __test_metadata *t)
>
> t->passed = 1;
> t->trigger = 0;
> - printf("[ RUN ] %s\n", t->name);
> + printf("[ RUN ] %s.%s\n", t->fixture->name, t->name);
> alarm(t->timeout);
> child_pid = fork();
> if (child_pid < 0) {
> @@ -757,7 +780,8 @@ void __run_test(struct __test_metadata *t)
> status);
> }
> }
> - printf("[ %4s ] %s\n", (t->passed ? "OK" : "FAIL"), t->name);
> + printf("[ %4s ] %s.%s\n", (t->passed ? "OK" : "FAIL"),
> + t->fixture->name, t->name);
> alarm(0);
> }
>
> --
> 2.24.1
>
--
Kees Cook
next prev parent reply other threads:[~2020-03-17 20:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 22:56 [PATCH v3 0/6] kselftest: add fixture parameters Jakub Kicinski
2020-03-16 22:56 ` [PATCH v3 1/6] selftests/seccomp: use correct FIXTURE macro Jakub Kicinski
2020-03-17 20:22 ` Kees Cook
2020-03-16 22:56 ` [PATCH v3 2/6] kselftest: factor out list manipulation to a helper Jakub Kicinski
2020-03-17 20:22 ` Kees Cook
2020-03-16 22:56 ` [PATCH v3 3/6] kselftest: create fixture objects Jakub Kicinski
2020-03-17 20:23 ` Kees Cook [this message]
2020-03-16 22:56 ` [PATCH v3 4/6] kselftest: run tests by fixture Jakub Kicinski
2020-03-17 20:25 ` Kees Cook
2020-03-16 22:56 ` [PATCH v3 5/6] kselftest: add fixture parameters Jakub Kicinski
2020-03-17 20:36 ` Kees Cook
2020-03-16 22:56 ` [PATCH v3 5/6] kselftest: add fixture variants Jakub Kicinski
2020-03-17 20:37 ` Kees Cook
2020-03-16 22:56 ` [PATCH v3 6/6] selftests: tls: run all tests for TLS 1.2 and TLS 1.3 Jakub Kicinski
2020-03-17 20:46 ` Kees Cook
2020-03-16 22:59 ` [PATCH v3 0/6] kselftest: add fixture parameters Jakub Kicinski
2020-03-17 20:47 ` Kees Cook
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=202003171323.7A18C455@keescook \
--to=keescook@chromium.org \
--cc=Tim.Bird@sony.com \
--cc=kernel-team@fb.com \
--cc=kuba@kernel.org \
--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).