kunit: Add module attribute

Add module attribute to the test attribute API. This attribute stores the
module name associated with the test using KBUILD_MODNAME.

The name of a test suite and the module name often do not match. A
reference to the module name associated with the suite could be extremely
helpful in running tests as modules without needing to check the codebase.

This attribute will be printed for each suite.

Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Rae Moar <rmoar@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/include/kunit/test.h b/include/kunit/test.h
index ed5f5000a0952ec056f9b554ed4c9c323d509e4a..011e0d6bb506cd7a611ded5b5caeb31910b0ac97 100644 (file)
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -131,6 +131,7 @@ struct kunit_case {
 
        /* private: internal use only. */
        enum kunit_status status;
+       char *module_name;
        char *log;
 };
 
@@ -155,7 +156,9 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status)
  * &struct kunit_case object from it. See the documentation for
  * &struct kunit_case for an example on how to use it.
  */
-#define KUNIT_CASE(test_name) { .run_case = test_name, .name = #test_name }
+#define KUNIT_CASE(test_name)                  \
+               { .run_case = test_name, .name = #test_name,    \
+                 .module_name = KBUILD_MODNAME}
 
 /**
  * KUNIT_CASE_ATTR - A helper for creating a &struct kunit_case
@@ -167,7 +170,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status)
  */
 #define KUNIT_CASE_ATTR(test_name, attributes)                 \
                { .run_case = test_name, .name = #test_name,    \
-                 .attr = attributes }
+                 .attr = attributes, .module_name = KBUILD_MODNAME}
 
 /**
  * KUNIT_CASE_SLOW - A helper for creating a &struct kunit_case
@@ -178,7 +181,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status)
 
 #define KUNIT_CASE_SLOW(test_name)                     \
                { .run_case = test_name, .name = #test_name,    \
-                 .attr.speed = KUNIT_SPEED_SLOW }
+                 .attr.speed = KUNIT_SPEED_SLOW, .module_name = KBUILD_MODNAME}
 
 /**
  * KUNIT_CASE_PARAM - A helper for creation a parameterized &struct kunit_case
@@ -199,7 +202,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status)
  */
 #define KUNIT_CASE_PARAM(test_name, gen_params)                        \
                { .run_case = test_name, .name = #test_name,    \
-                 .generate_params = gen_params }
+                 .generate_params = gen_params, .module_name = KBUILD_MODNAME}
 
 /**
  * KUNIT_CASE_PARAM_ATTR - A helper for creating a parameterized &struct
@@ -213,7 +216,7 @@ static inline char *kunit_status_to_ok_not_ok(enum kunit_status status)
 #define KUNIT_CASE_PARAM_ATTR(test_name, gen_params, attributes)       \
                { .run_case = test_name, .name = #test_name,    \
                  .generate_params = gen_params,                                \
-                 .attr = attributes }
+                 .attr = attributes, .module_name = KBUILD_MODNAME}
 
 /**
  * struct kunit_suite - describes a related collection of &struct kunit_case

diff --git a/lib/kunit/attributes.c b/lib/kunit/attributes.c
index ffd0d692b334d18c0f4e5d7769876b5ada97af27..9dce4f4d726cb6cb05606628a875bd0890a556ff 100644 (file)
--- a/lib/kunit/attributes.c
+++ b/lib/kunit/attributes.c
@@ -61,6 +61,12 @@ static const char *attr_speed_to_string(void *attr, bool *to_free)
        return attr_enum_to_string(attr, speed_str_list, to_free);
 }
 
+static const char *attr_string_to_string(void *attr, bool *to_free)
+{
+       *to_free = false;
+       return (char *) attr;
+}
+
 /* Get Attribute Methods */
 
 static void *attr_speed_get(void *test_or_suite, bool is_test)
@@ -74,6 +80,18 @@ static void *attr_speed_get(void *test_or_suite, bool is_test)
                return ((void *) suite->attr.speed);
 }
 
+static void *attr_module_get(void *test_or_suite, bool is_test)
+{
+       struct kunit_suite *suite = is_test ? NULL : test_or_suite;
+       struct kunit_case *test = is_test ? test_or_suite : NULL;
+
+       // Suites get their module attribute from their first test_case
+       if (test)
+               return ((void *) test->module_name);
+       else
+               return ((void *) suite->test_cases[0].module_name);
+}
+
 /* List of all Test Attributes */
 
 static struct kunit_attr kunit_attr_list[] = {
@@ -84,6 +102,13 @@ static struct kunit_attr kunit_attr_list[] = {
                .attr_default = (void *)KUNIT_SPEED_NORMAL,
                .print = PRINT_ALWAYS,
        },
+       {
+               .name = "module",
+               .get_attr = attr_module_get,
+               .to_string = attr_string_to_string,
+               .attr_default = (void *)"",
+               .print = PRINT_SUITE,
+       }
 };
 
 /* Helper Functions to Access Attributes */