| Message ID | 20230610005149.1145665-2-rmoar@google.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Brendan Higgins |
| Headers | show |
| Series | kunit: Add test attributes API | expand |
On Sat, 10 Jun 2023 at 08:52, Rae Moar <rmoar@google.com> wrote: > > Add the basic structure of the test attribute API to KUnit, which can be > used to save and access test associated data. > > Add attributes.c and attributes.h to hold associated structs and functions > for the API. > > Create a struct that holds a variety of associated helper functions for > each test attribute. These helper functions will be used to get the > attribute value, convert the value to a string, and filter based on the > value. This struct is flexible by design to allow for attributes of > numerous types and contexts. > > Add a method to print test attributes in the format of "# [<test_name if > not suite>.]<attribute_name>: <attribute_value>". > > Example for a suite: "# speed: slow" > > Example for a test case: "# test_case.speed: very_slow" > > Use this method to report attributes in the KTAP output and _list_tests > output. Can we have a link to the draft KTAP spec for this? Also, by _list_tests, I assume we're talking about the kunit.action=list option. That's been an "internal" feature for the kunit script thus far, but kunit.py doesn't use this attribute info anywhere yet, apart from to print it out via --list_tests. Maybe we should make including the attributes optional, as the raw list of tests is currently more useful. > > In test.h, add fields and associated helper functions to test cases and > suites to hold user-inputted test attributes. > > Signed-off-by: Rae Moar <rmoar@google.com> > --- > include/kunit/attributes.h | 19 +++++++++++ > include/kunit/test.h | 33 +++++++++++++++++++ > lib/kunit/Makefile | 3 +- > lib/kunit/attributes.c | 65 ++++++++++++++++++++++++++++++++++++++ > lib/kunit/executor.c | 10 +++++- > lib/kunit/test.c | 17 ++++++---- > 6 files changed, 138 insertions(+), 9 deletions(-) > create mode 100644 include/kunit/attributes.h > create mode 100644 lib/kunit/attributes.c > > diff --git a/include/kunit/attributes.h b/include/kunit/attributes.h > new file mode 100644 > index 000000000000..9fcd184cce36 > --- /dev/null > +++ b/include/kunit/attributes.h > @@ -0,0 +1,19 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * KUnit API to save and access test attributes > + * > + * Copyright (C) 2023, Google LLC. > + * Author: Rae Moar <rmoar@google.com> > + */ > + > +#ifndef _KUNIT_ATTRIBUTES_H > +#define _KUNIT_ATTRIBUTES_H > + > +/* > + * Print all test attributes for a test case or suite. > + * Output format for test cases: "# <test_name>.<attribute>: <value>" > + * Output format for test suites: "# <attribute>: <value>" > + */ > +void kunit_print_attr(void *test_or_suite, bool is_test, unsigned int test_level); > + > +#endif /* _KUNIT_ATTRIBUTES_H */ > diff --git a/include/kunit/test.h b/include/kunit/test.h > index 23120d50499e..1fc9155988e9 100644 > --- a/include/kunit/test.h > +++ b/include/kunit/test.h > @@ -63,12 +63,16 @@ enum kunit_status { > KUNIT_SKIPPED, > }; > > +/* Holds attributes for each test case and suite */ > +struct kunit_attributes {}; This is a placeholder as attributes won't be included until patch 2, right? > + > /** > * struct kunit_case - represents an individual test case. > * > * @run_case: the function representing the actual test case. > * @name: the name of the test case. > * @generate_params: the generator function for parameterized tests. > + * @attr: the attributes associated with the test > * > * A test case is a function with the signature, > * ``void (*)(struct kunit *)`` > @@ -104,6 +108,7 @@ struct kunit_case { > void (*run_case)(struct kunit *test); > const char *name; > const void* (*generate_params)(const void *prev, char *desc); > + struct kunit_attributes attr; > > /* private: internal use only. */ > enum kunit_status status; > @@ -133,6 +138,18 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) > */ > #define KUNIT_CASE(test_name) { .run_case = test_name, .name = #test_name } > > +/** > + * KUNIT_CASE_ATTR - A helper for creating a &struct kunit_case > + * with attributes > + * > + * @test_name: a reference to a test case function. > + * @attributes: a reference to a struct kunit_attributes object containing > + * test attributes > + */ > +#define KUNIT_CASE_ATTR(test_name, attributes) \ > + { .run_case = test_name, .name = #test_name, \ > + .attr = attributes } > + This is a bit awkward, as the attributes are either entirely unset (i.e., zero-initialised), or have to be specified here. I assume the plan is to use designated initialisers, e.g.: KUNIT_CASE_ATTR(foo_test, {.speed = KUNIT_SPEED_SLOW, .flaky = true}). That at least makes it reasonably user-friendly, though the whole need to make sure zero-initialised values are the defaults is a bit icky. > /** > * KUNIT_CASE_PARAM - A helper for creation a parameterized &struct kunit_case > * > @@ -154,6 +171,20 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) > { .run_case = test_name, .name = #test_name, \ > .generate_params = gen_params } > > +/** > + * KUNIT_CASE_PARAM_ATTR - A helper for creating a parameterized &struct > + * kunit_case with attributes > + * > + * @test_name: a reference to a test case function. > + * @gen_params: a reference to a parameter generator function. > + * @attributes: a reference to a struct kunit_attributes object containing > + * test attributes > + */ > +#define KUNIT_CASE_PARAM_ATTR(test_name, gen_params, attributes) \ > + { .run_case = test_name, .name = #test_name, \ > + .generate_params = gen_params, \ > + .attr = attributes } > + > /** > * struct kunit_suite - describes a related collection of &struct kunit_case > * > @@ -163,6 +194,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) > * @init: called before every test case. > * @exit: called after every test case. > * @test_cases: a null terminated array of test cases. > + * @attr: the attributes associated with the test suite > * > * A kunit_suite is a collection of related &struct kunit_case s, such that > * @init is called before every test case and @exit is called after every > @@ -182,6 +214,7 @@ struct kunit_suite { > int (*init)(struct kunit *test); > void (*exit)(struct kunit *test); > struct kunit_case *test_cases; > + struct kunit_attributes attr; > > /* private: internal use only */ > char status_comment[KUNIT_STATUS_COMMENT_SIZE]; > diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile > index cb417f504996..46f75f23dfe4 100644 > --- a/lib/kunit/Makefile > +++ b/lib/kunit/Makefile > @@ -6,7 +6,8 @@ kunit-objs += test.o \ > string-stream.o \ > assert.o \ > try-catch.o \ > - executor.o > + executor.o \ > + attributes.o > > ifeq ($(CONFIG_KUNIT_DEBUGFS),y) > kunit-objs += debugfs.o > diff --git a/lib/kunit/attributes.c b/lib/kunit/attributes.c > new file mode 100644 > index 000000000000..0ea641be795f > --- /dev/null > +++ b/lib/kunit/attributes.c > @@ -0,0 +1,65 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * KUnit API to save and access test attributes > + * > + * Copyright (C) 2023, Google LLC. > + * Author: Rae Moar <rmoar@google.com> > + */ > + > +#include <kunit/test.h> > +#include <kunit/attributes.h> > + > +/** > + * struct kunit_attr - represents a test attribute and holds flexible > + * helper functions to interact with attribute. > + * > + * @name: name of test attribute, eg. speed > + * @get_attr: function to return attribute value given a test > + * @to_string: function to return string representation of given > + * attribute value > + * @filter: function to indicate whether a given attribute value passes a > + * filter > + */ > +struct kunit_attr { > + const char *name; > + void *(*get_attr)(void *test_or_suite, bool is_test); > + const char *(*to_string)(void *attr, bool *to_free); > + int (*filter)(void *attr, const char *input, int *err); > + void *attr_default; > +}; > + > +/* List of all Test Attributes */ > + > +static struct kunit_attr kunit_attr_list[1] = {}; > + > +/* Helper Functions to Access Attributes */ > + > +void kunit_print_attr(void *test_or_suite, bool is_test, unsigned int test_level) > +{ > + int i; > + bool to_free; > + void *attr; > + const char *attr_name, *attr_str; > + struct kunit_suite *suite = is_test ? NULL : test_or_suite; > + struct kunit_case *test = is_test ? test_or_suite : NULL; > + > + for (i = 0; i < ARRAY_SIZE(kunit_attr_list); i++) { > + attr = kunit_attr_list[i].get_attr(test_or_suite, is_test); > + if (attr) { > + attr_name = kunit_attr_list[i].name; > + attr_str = kunit_attr_list[i].to_string(attr, &to_free); > + if (test) { > + kunit_log(KERN_INFO, test, "%*s# %s.%s: %s", > + KUNIT_INDENT_LEN * test_level, "", test->name, > + attr_name, attr_str); > + } else { > + kunit_log(KERN_INFO, suite, "%*s# %s: %s", > + KUNIT_INDENT_LEN * test_level, "", attr_name, attr_str); > + } > + > + /* Free to_string of attribute if needed */ > + if (to_free) > + kfree(attr_str); > + } > + } > +} > diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c > index 74982b83707c..767a84e32f06 100644 > --- a/lib/kunit/executor.c > +++ b/lib/kunit/executor.c > @@ -2,6 +2,7 @@ > > #include <linux/reboot.h> > #include <kunit/test.h> > +#include <kunit/attributes.h> > #include <linux/glob.h> > #include <linux/moduleparam.h> > > @@ -180,10 +181,17 @@ static void kunit_exec_list_tests(struct suite_set *suite_set) > /* Hack: print a ktap header so kunit.py can find the start of KUnit output. */ > pr_info("KTAP version 1\n"); > > - for (suites = suite_set->start; suites < suite_set->end; suites++) > + for (suites = suite_set->start; suites < suite_set->end; suites++) { > + /* Print suite name and suite attributes */ > + pr_info("%s\n", (*suites)->name); > + kunit_print_attr((void *)(*suites), false, 0); > + > + /* Print test case name and attributes in suite */ > kunit_suite_for_each_test_case((*suites), test_case) { > pr_info("%s.%s\n", (*suites)->name, test_case->name); > + kunit_print_attr((void *)test_case, true, 0); > } > + } > } > > int kunit_run_all_tests(void) > diff --git a/lib/kunit/test.c b/lib/kunit/test.c > index 84e4666555c9..9ee55139ecd1 100644 > --- a/lib/kunit/test.c > +++ b/lib/kunit/test.c > @@ -9,6 +9,7 @@ > #include <kunit/resource.h> > #include <kunit/test.h> > #include <kunit/test-bug.h> > +#include <kunit/attributes.h> > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/moduleparam.h> > @@ -168,6 +169,13 @@ size_t kunit_suite_num_test_cases(struct kunit_suite *suite) > } > EXPORT_SYMBOL_GPL(kunit_suite_num_test_cases); > > +/* Currently supported test levels */ > +enum { > + KUNIT_LEVEL_SUITE = 0, > + KUNIT_LEVEL_CASE, > + KUNIT_LEVEL_CASE_PARAM, > +}; > + > static void kunit_print_suite_start(struct kunit_suite *suite) > { > /* > @@ -181,17 +189,11 @@ static void kunit_print_suite_start(struct kunit_suite *suite) > pr_info(KUNIT_SUBTEST_INDENT "KTAP version 1\n"); > pr_info(KUNIT_SUBTEST_INDENT "# Subtest: %s\n", > suite->name); > + kunit_print_attr((void *)suite, false, KUNIT_LEVEL_CASE); > pr_info(KUNIT_SUBTEST_INDENT "1..%zd\n", > kunit_suite_num_test_cases(suite)); > } > > -/* Currently supported test levels */ > -enum { > - KUNIT_LEVEL_SUITE = 0, > - KUNIT_LEVEL_CASE, > - KUNIT_LEVEL_CASE_PARAM, > -}; > - > static void kunit_print_ok_not_ok(struct kunit *test, > unsigned int test_level, > enum kunit_status status, > @@ -651,6 +653,7 @@ int kunit_run_tests(struct kunit_suite *suite) > } > } > > + kunit_print_attr((void *)test_case, true, KUNIT_LEVEL_CASE); > > kunit_print_test_stats(&test, param_stats); > > -- > 2.41.0.162.gfafddb0af9-goog >
On Sat, Jun 10, 2023 at 4:29 AM David Gow <davidgow@google.com> wrote: > > On Sat, 10 Jun 2023 at 08:52, Rae Moar <rmoar@google.com> wrote: > > > > Add the basic structure of the test attribute API to KUnit, which can be > > used to save and access test associated data. > > > > Add attributes.c and attributes.h to hold associated structs and functions > > for the API. > > > > Create a struct that holds a variety of associated helper functions for > > each test attribute. These helper functions will be used to get the > > attribute value, convert the value to a string, and filter based on the > > value. This struct is flexible by design to allow for attributes of > > numerous types and contexts. > > > > Add a method to print test attributes in the format of "# [<test_name if > > not suite>.]<attribute_name>: <attribute_value>". > > > > Example for a suite: "# speed: slow" > > > > Example for a test case: "# test_case.speed: very_slow" > > > > Use this method to report attributes in the KTAP output and _list_tests > > output. > > Can we have a link to the draft KTAP spec for this? > Here is the link: https://docs.kernel.org/dev-tools/ktap.html. I will also add a link in the next version. > Also, by _list_tests, I assume we're talking about the > kunit.action=list option. That's been an "internal" feature for the > kunit script thus far, but kunit.py doesn't use this attribute info > anywhere yet, apart from to print it out via --list_tests. Maybe we > should make including the attributes optional, as the raw list of > tests is currently more useful. > Oh this is an interesting idea. I could pass in the option to include or not include attributes. Maybe the flag could then be --list_tests_attrs? I could also remove the plain test information in this new option. However, I do like seeing tests that have no set attributes in the output. I'll work on this implementation. > > > > In test.h, add fields and associated helper functions to test cases and > > suites to hold user-inputted test attributes. > > > > Signed-off-by: Rae Moar <rmoar@google.com> > > --- > > include/kunit/attributes.h | 19 +++++++++++ > > include/kunit/test.h | 33 +++++++++++++++++++ > > lib/kunit/Makefile | 3 +- > > lib/kunit/attributes.c | 65 ++++++++++++++++++++++++++++++++++++++ > > lib/kunit/executor.c | 10 +++++- > > lib/kunit/test.c | 17 ++++++---- > > 6 files changed, 138 insertions(+), 9 deletions(-) > > create mode 100644 include/kunit/attributes.h > > create mode 100644 lib/kunit/attributes.c > > > > diff --git a/include/kunit/attributes.h b/include/kunit/attributes.h > > new file mode 100644 > > index 000000000000..9fcd184cce36 > > --- /dev/null > > +++ b/include/kunit/attributes.h > > @@ -0,0 +1,19 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > +/* > > + * KUnit API to save and access test attributes > > + * > > + * Copyright (C) 2023, Google LLC. > > + * Author: Rae Moar <rmoar@google.com> > > + */ > > + > > +#ifndef _KUNIT_ATTRIBUTES_H > > +#define _KUNIT_ATTRIBUTES_H > > + > > +/* > > + * Print all test attributes for a test case or suite. > > + * Output format for test cases: "# <test_name>.<attribute>: <value>" > > + * Output format for test suites: "# <attribute>: <value>" > > + */ > > +void kunit_print_attr(void *test_or_suite, bool is_test, unsigned int test_level); > > + > > +#endif /* _KUNIT_ATTRIBUTES_H */ > > diff --git a/include/kunit/test.h b/include/kunit/test.h > > index 23120d50499e..1fc9155988e9 100644 > > --- a/include/kunit/test.h > > +++ b/include/kunit/test.h > > @@ -63,12 +63,16 @@ enum kunit_status { > > KUNIT_SKIPPED, > > }; > > > > +/* Holds attributes for each test case and suite */ > > +struct kunit_attributes {}; > > This is a placeholder as attributes won't be included until patch 2, right? Yes, this is just a placeholder until the next patch. Should I add a temporary comment? > > > + > > /** > > * struct kunit_case - represents an individual test case. > > * > > * @run_case: the function representing the actual test case. > > * @name: the name of the test case. > > * @generate_params: the generator function for parameterized tests. > > + * @attr: the attributes associated with the test > > * > > * A test case is a function with the signature, > > * ``void (*)(struct kunit *)`` > > @@ -104,6 +108,7 @@ struct kunit_case { > > void (*run_case)(struct kunit *test); > > const char *name; > > const void* (*generate_params)(const void *prev, char *desc); > > + struct kunit_attributes attr; > > > > /* private: internal use only. */ > > enum kunit_status status; > > @@ -133,6 +138,18 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) > > */ > > #define KUNIT_CASE(test_name) { .run_case = test_name, .name = #test_name } > > > > +/** > > + * KUNIT_CASE_ATTR - A helper for creating a &struct kunit_case > > + * with attributes > > + * > > + * @test_name: a reference to a test case function. > > + * @attributes: a reference to a struct kunit_attributes object containing > > + * test attributes > > + */ > > +#define KUNIT_CASE_ATTR(test_name, attributes) \ > > + { .run_case = test_name, .name = #test_name, \ > > + .attr = attributes } > > + > > This is a bit awkward, as the attributes are either entirely unset > (i.e., zero-initialised), or have to be specified here. I assume the > plan is to use designated initialisers, e.g.: > KUNIT_CASE_ATTR(foo_test, {.speed = KUNIT_SPEED_SLOW, .flaky = true}). > > That at least makes it reasonably user-friendly, though the whole need > to make sure zero-initialised values are the defaults is a bit icky. > Yeah there seem to be positives and negatives to this approach. If we allow attributes to be uninitialized, the user experience is slightly better and it is evident if the attribute is set or not. However, this results in the negative implication that attributes with a zero-equivalent value are treated as if they are unset. This results in requiring enum values to have an unset option at the zero-index (which I think is a fine solution) and it requires boolean attributes to allow false values to act as the default (a little bit messier, but a solution to this is switching booleans to enums when necessary). > > > > /** > > * KUNIT_CASE_PARAM - A helper for creation a parameterized &struct kunit_case > > * > > @@ -154,6 +171,20 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) > > { .run_case = test_name, .name = #test_name, \ > > .generate_params = gen_params } > > > > +/** > > + * KUNIT_CASE_PARAM_ATTR - A helper for creating a parameterized &struct > > + * kunit_case with attributes > > + * > > + * @test_name: a reference to a test case function. > > + * @gen_params: a reference to a parameter generator function. > > + * @attributes: a reference to a struct kunit_attributes object containing > > + * test attributes > > + */ > > +#define KUNIT_CASE_PARAM_ATTR(test_name, gen_params, attributes) \ > > + { .run_case = test_name, .name = #test_name, \ > > + .generate_params = gen_params, \ > > + .attr = attributes } > > + > > /** > > * struct kunit_suite - describes a related collection of &struct kunit_case > > * > > @@ -163,6 +194,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) > > * @init: called before every test case. > > * @exit: called after every test case. > > * @test_cases: a null terminated array of test cases. > > + * @attr: the attributes associated with the test suite > > * > > * A kunit_suite is a collection of related &struct kunit_case s, such that > > * @init is called before every test case and @exit is called after every > > @@ -182,6 +214,7 @@ struct kunit_suite { > > int (*init)(struct kunit *test); > > void (*exit)(struct kunit *test); > > struct kunit_case *test_cases; > > + struct kunit_attributes attr; > > > > /* private: internal use only */ > > char status_comment[KUNIT_STATUS_COMMENT_SIZE]; > > diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile > > index cb417f504996..46f75f23dfe4 100644 > > --- a/lib/kunit/Makefile > > +++ b/lib/kunit/Makefile > > @@ -6,7 +6,8 @@ kunit-objs += test.o \ > > string-stream.o \ > > assert.o \ > > try-catch.o \ > > - executor.o > > + executor.o \ > > + attributes.o > > > > ifeq ($(CONFIG_KUNIT_DEBUGFS),y) > > kunit-objs += debugfs.o > > diff --git a/lib/kunit/attributes.c b/lib/kunit/attributes.c > > new file mode 100644 > > index 000000000000..0ea641be795f > > --- /dev/null > > +++ b/lib/kunit/attributes.c > > @@ -0,0 +1,65 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * KUnit API to save and access test attributes > > + * > > + * Copyright (C) 2023, Google LLC. > > + * Author: Rae Moar <rmoar@google.com> > > + */ > > + > > +#include <kunit/test.h> > > +#include <kunit/attributes.h> > > + > > +/** > > + * struct kunit_attr - represents a test attribute and holds flexible > > + * helper functions to interact with attribute. > > + * > > + * @name: name of test attribute, eg. speed > > + * @get_attr: function to return attribute value given a test > > + * @to_string: function to return string representation of given > > + * attribute value > > + * @filter: function to indicate whether a given attribute value passes a > > + * filter > > + */ > > +struct kunit_attr { > > + const char *name; > > + void *(*get_attr)(void *test_or_suite, bool is_test); > > + const char *(*to_string)(void *attr, bool *to_free); > > + int (*filter)(void *attr, const char *input, int *err); > > + void *attr_default; > > +}; > > + > > +/* List of all Test Attributes */ > > + > > +static struct kunit_attr kunit_attr_list[1] = {}; > > + > > +/* Helper Functions to Access Attributes */ > > + > > +void kunit_print_attr(void *test_or_suite, bool is_test, unsigned int test_level) > > +{ > > + int i; > > + bool to_free; > > + void *attr; > > + const char *attr_name, *attr_str; > > + struct kunit_suite *suite = is_test ? NULL : test_or_suite; > > + struct kunit_case *test = is_test ? test_or_suite : NULL; > > + > > + for (i = 0; i < ARRAY_SIZE(kunit_attr_list); i++) { > > + attr = kunit_attr_list[i].get_attr(test_or_suite, is_test); > > + if (attr) { > > + attr_name = kunit_attr_list[i].name; > > + attr_str = kunit_attr_list[i].to_string(attr, &to_free); > > + if (test) { > > + kunit_log(KERN_INFO, test, "%*s# %s.%s: %s", > > + KUNIT_INDENT_LEN * test_level, "", test->name, > > + attr_name, attr_str); > > + } else { > > + kunit_log(KERN_INFO, suite, "%*s# %s: %s", > > + KUNIT_INDENT_LEN * test_level, "", attr_name, attr_str); > > + } > > + > > + /* Free to_string of attribute if needed */ > > + if (to_free) > > + kfree(attr_str); > > + } > > + } > > +} > > diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c > > index 74982b83707c..767a84e32f06 100644 > > --- a/lib/kunit/executor.c > > +++ b/lib/kunit/executor.c > > @@ -2,6 +2,7 @@ > > > > #include <linux/reboot.h> > > #include <kunit/test.h> > > +#include <kunit/attributes.h> > > #include <linux/glob.h> > > #include <linux/moduleparam.h> > > > > @@ -180,10 +181,17 @@ static void kunit_exec_list_tests(struct suite_set *suite_set) > > /* Hack: print a ktap header so kunit.py can find the start of KUnit output. */ > > pr_info("KTAP version 1\n"); > > > > - for (suites = suite_set->start; suites < suite_set->end; suites++) > > + for (suites = suite_set->start; suites < suite_set->end; suites++) { > > + /* Print suite name and suite attributes */ > > + pr_info("%s\n", (*suites)->name); > > + kunit_print_attr((void *)(*suites), false, 0); > > + > > + /* Print test case name and attributes in suite */ > > kunit_suite_for_each_test_case((*suites), test_case) { > > pr_info("%s.%s\n", (*suites)->name, test_case->name); > > + kunit_print_attr((void *)test_case, true, 0); > > } > > + } > > } > > > > int kunit_run_all_tests(void) > > diff --git a/lib/kunit/test.c b/lib/kunit/test.c > > index 84e4666555c9..9ee55139ecd1 100644 > > --- a/lib/kunit/test.c > > +++ b/lib/kunit/test.c > > @@ -9,6 +9,7 @@ > > #include <kunit/resource.h> > > #include <kunit/test.h> > > #include <kunit/test-bug.h> > > +#include <kunit/attributes.h> > > #include <linux/kernel.h> > > #include <linux/module.h> > > #include <linux/moduleparam.h> > > @@ -168,6 +169,13 @@ size_t kunit_suite_num_test_cases(struct kunit_suite *suite) > > } > > EXPORT_SYMBOL_GPL(kunit_suite_num_test_cases); > > > > +/* Currently supported test levels */ > > +enum { > > + KUNIT_LEVEL_SUITE = 0, > > + KUNIT_LEVEL_CASE, > > + KUNIT_LEVEL_CASE_PARAM, > > +}; > > + > > static void kunit_print_suite_start(struct kunit_suite *suite) > > { > > /* > > @@ -181,17 +189,11 @@ static void kunit_print_suite_start(struct kunit_suite *suite) > > pr_info(KUNIT_SUBTEST_INDENT "KTAP version 1\n"); > > pr_info(KUNIT_SUBTEST_INDENT "# Subtest: %s\n", > > suite->name); > > + kunit_print_attr((void *)suite, false, KUNIT_LEVEL_CASE); > > pr_info(KUNIT_SUBTEST_INDENT "1..%zd\n", > > kunit_suite_num_test_cases(suite)); > > } > > > > -/* Currently supported test levels */ > > -enum { > > - KUNIT_LEVEL_SUITE = 0, > > - KUNIT_LEVEL_CASE, > > - KUNIT_LEVEL_CASE_PARAM, > > -}; > > - > > static void kunit_print_ok_not_ok(struct kunit *test, > > unsigned int test_level, > > enum kunit_status status, > > @@ -651,6 +653,7 @@ int kunit_run_tests(struct kunit_suite *suite) > > } > > } > > > > + kunit_print_attr((void *)test_case, true, KUNIT_LEVEL_CASE); > > > > kunit_print_test_stats(&test, param_stats); > > > > -- > > 2.41.0.162.gfafddb0af9-goog > >
diff --git a/include/kunit/attributes.h b/include/kunit/attributes.h new file mode 100644 index 000000000000..9fcd184cce36 --- /dev/null +++ b/include/kunit/attributes.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * KUnit API to save and access test attributes + * + * Copyright (C) 2023, Google LLC. + * Author: Rae Moar <rmoar@google.com> + */ + +#ifndef _KUNIT_ATTRIBUTES_H +#define _KUNIT_ATTRIBUTES_H + +/* + * Print all test attributes for a test case or suite. + * Output format for test cases: "# <test_name>.<attribute>: <value>" + * Output format for test suites: "# <attribute>: <value>" + */ +void kunit_print_attr(void *test_or_suite, bool is_test, unsigned int test_level); + +#endif /* _KUNIT_ATTRIBUTES_H */ diff --git a/include/kunit/test.h b/include/kunit/test.h index 23120d50499e..1fc9155988e9 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -63,12 +63,16 @@ enum kunit_status { KUNIT_SKIPPED, }; +/* Holds attributes for each test case and suite */ +struct kunit_attributes {}; + /** * struct kunit_case - represents an individual test case. * * @run_case: the function representing the actual test case. * @name: the name of the test case. * @generate_params: the generator function for parameterized tests. + * @attr: the attributes associated with the test * * A test case is a function with the signature, * ``void (*)(struct kunit *)`` @@ -104,6 +108,7 @@ struct kunit_case { void (*run_case)(struct kunit *test); const char *name; const void* (*generate_params)(const void *prev, char *desc); + struct kunit_attributes attr; /* private: internal use only. */ enum kunit_status status; @@ -133,6 +138,18 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) */ #define KUNIT_CASE(test_name) { .run_case = test_name, .name = #test_name } +/** + * KUNIT_CASE_ATTR - A helper for creating a &struct kunit_case + * with attributes + * + * @test_name: a reference to a test case function. + * @attributes: a reference to a struct kunit_attributes object containing + * test attributes + */ +#define KUNIT_CASE_ATTR(test_name, attributes) \ + { .run_case = test_name, .name = #test_name, \ + .attr = attributes } + /** * KUNIT_CASE_PARAM - A helper for creation a parameterized &struct kunit_case * @@ -154,6 +171,20 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) { .run_case = test_name, .name = #test_name, \ .generate_params = gen_params } +/** + * KUNIT_CASE_PARAM_ATTR - A helper for creating a parameterized &struct + * kunit_case with attributes + * + * @test_name: a reference to a test case function. + * @gen_params: a reference to a parameter generator function. + * @attributes: a reference to a struct kunit_attributes object containing + * test attributes + */ +#define KUNIT_CASE_PARAM_ATTR(test_name, gen_params, attributes) \ + { .run_case = test_name, .name = #test_name, \ + .generate_params = gen_params, \ + .attr = attributes } + /** * struct kunit_suite - describes a related collection of &struct kunit_case * @@ -163,6 +194,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status) * @init: called before every test case. * @exit: called after every test case. * @test_cases: a null terminated array of test cases. + * @attr: the attributes associated with the test suite * * A kunit_suite is a collection of related &struct kunit_case s, such that * @init is called before every test case and @exit is called after every @@ -182,6 +214,7 @@ struct kunit_suite { int (*init)(struct kunit *test); void (*exit)(struct kunit *test); struct kunit_case *test_cases; + struct kunit_attributes attr; /* private: internal use only */ char status_comment[KUNIT_STATUS_COMMENT_SIZE]; diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile index cb417f504996..46f75f23dfe4 100644 --- a/lib/kunit/Makefile +++ b/lib/kunit/Makefile @@ -6,7 +6,8 @@ kunit-objs += test.o \ string-stream.o \ assert.o \ try-catch.o \ - executor.o + executor.o \ + attributes.o ifeq ($(CONFIG_KUNIT_DEBUGFS),y) kunit-objs += debugfs.o diff --git a/lib/kunit/attributes.c b/lib/kunit/attributes.c new file mode 100644 index 000000000000..0ea641be795f --- /dev/null +++ b/lib/kunit/attributes.c @@ -0,0 +1,65 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * KUnit API to save and access test attributes + * + * Copyright (C) 2023, Google LLC. + * Author: Rae Moar <rmoar@google.com> + */ + +#include <kunit/test.h> +#include <kunit/attributes.h> + +/** + * struct kunit_attr - represents a test attribute and holds flexible + * helper functions to interact with attribute. + * + * @name: name of test attribute, eg. speed + * @get_attr: function to return attribute value given a test + * @to_string: function to return string representation of given + * attribute value + * @filter: function to indicate whether a given attribute value passes a + * filter + */ +struct kunit_attr { + const char *name; + void *(*get_attr)(void *test_or_suite, bool is_test); + const char *(*to_string)(void *attr, bool *to_free); + int (*filter)(void *attr, const char *input, int *err); + void *attr_default; +}; + +/* List of all Test Attributes */ + +static struct kunit_attr kunit_attr_list[1] = {}; + +/* Helper Functions to Access Attributes */ + +void kunit_print_attr(void *test_or_suite, bool is_test, unsigned int test_level) +{ + int i; + bool to_free; + void *attr; + const char *attr_name, *attr_str; + struct kunit_suite *suite = is_test ? NULL : test_or_suite; + struct kunit_case *test = is_test ? test_or_suite : NULL; + + for (i = 0; i < ARRAY_SIZE(kunit_attr_list); i++) { + attr = kunit_attr_list[i].get_attr(test_or_suite, is_test); + if (attr) { + attr_name = kunit_attr_list[i].name; + attr_str = kunit_attr_list[i].to_string(attr, &to_free); + if (test) { + kunit_log(KERN_INFO, test, "%*s# %s.%s: %s", + KUNIT_INDENT_LEN * test_level, "", test->name, + attr_name, attr_str); + } else { + kunit_log(KERN_INFO, suite, "%*s# %s: %s", + KUNIT_INDENT_LEN * test_level, "", attr_name, attr_str); + } + + /* Free to_string of attribute if needed */ + if (to_free) + kfree(attr_str); + } + } +} diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c index 74982b83707c..767a84e32f06 100644 --- a/lib/kunit/executor.c +++ b/lib/kunit/executor.c @@ -2,6 +2,7 @@ #include <linux/reboot.h> #include <kunit/test.h> +#include <kunit/attributes.h> #include <linux/glob.h> #include <linux/moduleparam.h> @@ -180,10 +181,17 @@ static void kunit_exec_list_tests(struct suite_set *suite_set) /* Hack: print a ktap header so kunit.py can find the start of KUnit output. */ pr_info("KTAP version 1\n"); - for (suites = suite_set->start; suites < suite_set->end; suites++) + for (suites = suite_set->start; suites < suite_set->end; suites++) { + /* Print suite name and suite attributes */ + pr_info("%s\n", (*suites)->name); + kunit_print_attr((void *)(*suites), false, 0); + + /* Print test case name and attributes in suite */ kunit_suite_for_each_test_case((*suites), test_case) { pr_info("%s.%s\n", (*suites)->name, test_case->name); + kunit_print_attr((void *)test_case, true, 0); } + } } int kunit_run_all_tests(void) diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 84e4666555c9..9ee55139ecd1 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -9,6 +9,7 @@ #include <kunit/resource.h> #include <kunit/test.h> #include <kunit/test-bug.h> +#include <kunit/attributes.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -168,6 +169,13 @@ size_t kunit_suite_num_test_cases(struct kunit_suite *suite) } EXPORT_SYMBOL_GPL(kunit_suite_num_test_cases); +/* Currently supported test levels */ +enum { + KUNIT_LEVEL_SUITE = 0, + KUNIT_LEVEL_CASE, + KUNIT_LEVEL_CASE_PARAM, +}; + static void kunit_print_suite_start(struct kunit_suite *suite) { /* @@ -181,17 +189,11 @@ static void kunit_print_suite_start(struct kunit_suite *suite) pr_info(KUNIT_SUBTEST_INDENT "KTAP version 1\n"); pr_info(KUNIT_SUBTEST_INDENT "# Subtest: %s\n", suite->name); + kunit_print_attr((void *)suite, false, KUNIT_LEVEL_CASE); pr_info(KUNIT_SUBTEST_INDENT "1..%zd\n", kunit_suite_num_test_cases(suite)); } -/* Currently supported test levels */ -enum { - KUNIT_LEVEL_SUITE = 0, - KUNIT_LEVEL_CASE, - KUNIT_LEVEL_CASE_PARAM, -}; - static void kunit_print_ok_not_ok(struct kunit *test, unsigned int test_level, enum kunit_status status, @@ -651,6 +653,7 @@ int kunit_run_tests(struct kunit_suite *suite) } } + kunit_print_attr((void *)test_case, true, KUNIT_LEVEL_CASE); kunit_print_test_stats(&test, param_stats);
Add the basic structure of the test attribute API to KUnit, which can be used to save and access test associated data. Add attributes.c and attributes.h to hold associated structs and functions for the API. Create a struct that holds a variety of associated helper functions for each test attribute. These helper functions will be used to get the attribute value, convert the value to a string, and filter based on the value. This struct is flexible by design to allow for attributes of numerous types and contexts. Add a method to print test attributes in the format of "# [<test_name if not suite>.]<attribute_name>: <attribute_value>". Example for a suite: "# speed: slow" Example for a test case: "# test_case.speed: very_slow" Use this method to report attributes in the KTAP output and _list_tests output. In test.h, add fields and associated helper functions to test cases and suites to hold user-inputted test attributes. Signed-off-by: Rae Moar <rmoar@google.com> --- include/kunit/attributes.h | 19 +++++++++++ include/kunit/test.h | 33 +++++++++++++++++++ lib/kunit/Makefile | 3 +- lib/kunit/attributes.c | 65 ++++++++++++++++++++++++++++++++++++++ lib/kunit/executor.c | 10 +++++- lib/kunit/test.c | 17 ++++++---- 6 files changed, 138 insertions(+), 9 deletions(-) create mode 100644 include/kunit/attributes.h create mode 100644 lib/kunit/attributes.c