On Thu, Mar 12, 2020 at 08:17:49PM -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@xxxxxxxxxx>
I like this!
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
-Kees
> ---
> tools/testing/selftests/kselftest_harness.h | 57 +++++++++++++++++----
> 1 file changed, 46 insertions(+), 11 deletions(-)
>
> diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
> index 5336b26506ab..a396afe4a579 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, \
> }; \
> @@ -631,10 +636,44 @@
> } \
> } while (0); OPTIONAL_HANDLER(_assert)
>
> +/* 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++;
> + /* Circular linked list where only prev is circular. */
> + if (__constructor_order == _CONSTRUCTOR_ORDER_FORWARD) {
> + f->next = NULL;
> + f->prev = __fixture_list->prev;
> + f->prev->next = f;
> + __fixture_list->prev = f;
> + } else {
> + f->next = __fixture_list;
> + f->next->prev = f;
> + f->prev = f;
> + __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 */
> @@ -647,11 +686,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
> @@ -702,7 +736,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) {
> @@ -751,7 +785,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
