LinuxLists.cc - [PATCH 3/3] kunit: Allow kunit test modules to use test filtering

2023-07-28 16:00:18

Subject: [PATCH 3/3] kunit: Allow kunit test modules to use test filtering

External tools, e.g., Intel GPU tools (IGT), support execution of
individual selftests provided by kernel modules. That could be also
applicable to kunit test modules if they provided test filtering. But
test filtering is now possible only when kunit code is built into the
kernel. Moreover, a filter can be specified only at boot time, then
reboot is required each time a different filter is needed.

Build the test filtering code also when kunit is configured as a module,
expose test filtering functions to other kunit source files, and use them
in kunit module notifier callback functions. Userspace can then reload
the kunit module with a value of the filter_glob parameter tuned to a
specific kunit test module every time it wants to limit the scope of tests
executed on that module load. Make the kunit.filter_glob parameter
visible in sysfs for user convenience.

Signed-off-by: Janusz Krzysztofik <[email protected]>
---
include/kunit/test.h | 13 +++++++++++++
lib/kunit/executor.c | 36 ++++++++++++++++++------------------
lib/kunit/test.c | 22 ++++++++++++++++++++++
3 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/include/kunit/test.h b/include/kunit/test.h
index 6d693f21a4833..14ff12e72252a 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -190,6 +190,12 @@ struct kunit_suite {
int suite_init_err;
};

+/* Stores an array of suites, end points one past the end */
+struct kunit_suite_set {
+ struct kunit_suite * const *start;
+ struct kunit_suite * const *end;
+};
+
/**
* struct kunit - represents a running instance of a test.
*
@@ -238,6 +244,7 @@ static inline void kunit_set_failure(struct kunit *test)

bool kunit_enabled(void);
const char *kunit_action(void);
+const char *kunit_filter_glob(void);

void kunit_init_test(struct kunit *test, const char *name, char *log);

@@ -248,6 +255,12 @@ size_t kunit_suite_num_test_cases(struct kunit_suite *suite);
unsigned int kunit_test_case_num(struct kunit_suite *suite,
struct kunit_case *test_case);

+struct kunit_suite_set
+kunit_filter_suites(const struct kunit_suite_set *suite_set,
+ const char *filter_glob,
+ int *err);
+void kunit_free_suite_set(struct kunit_suite_set suite_set);
+
int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_suites);

void __kunit_test_suites_exit(struct kunit_suite **suites, int num_suites);
diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
index d1c0616569dfd..816e14f4fcb64 100644
--- a/lib/kunit/executor.c
+++ b/lib/kunit/executor.c
@@ -25,14 +25,17 @@ const char *kunit_action(void)
return action_param;
}

-#if IS_BUILTIN(CONFIG_KUNIT)
-
static char *filter_glob_param;

-module_param_named(filter_glob, filter_glob_param, charp, 0);
+module_param_named(filter_glob, filter_glob_param, charp, 0400);
MODULE_PARM_DESC(filter_glob,
"Filter which KUnit test suites/tests run at boot-time, e.g. list* or list*.*del_test");

+const char *kunit_filter_glob(void)
+{
+ return filter_glob_param;
+}
+
/* glob_match() needs NULL terminated strings, so we need a copy of filter_glob_param. */
struct kunit_test_filter {
char *suite_glob;
@@ -96,16 +99,7 @@ kunit_filter_tests(const struct kunit_suite *const suite, const char *test_glob)
return copy;
}

-static char *kunit_shutdown;
-core_param(kunit_shutdown, kunit_shutdown, charp, 0644);
-
-/* Stores an array of suites, end points one past the end */
-struct suite_set {
- struct kunit_suite * const *start;
- struct kunit_suite * const *end;
-};
-
-static void kunit_free_suite_set(struct suite_set suite_set)
+void kunit_free_suite_set(struct kunit_suite_set suite_set)
{
struct kunit_suite * const *suites;

@@ -114,13 +108,14 @@ static void kunit_free_suite_set(struct suite_set suite_set)
kfree(suite_set.start);
}

-static struct suite_set kunit_filter_suites(const struct suite_set *suite_set,
- const char *filter_glob,
- int *err)
+struct kunit_suite_set
+kunit_filter_suites(const struct kunit_suite_set *suite_set,
+ const char *filter_glob,
+ int *err)
{
int i;
struct kunit_suite **copy, *filtered_suite;
- struct suite_set filtered;
+ struct kunit_suite_set filtered;
struct kunit_test_filter filter;

const size_t max = suite_set->end - suite_set->start;
@@ -155,6 +150,11 @@ static struct suite_set kunit_filter_suites(const struct suite_set *suite_set,
return filtered;
}

+#if IS_BUILTIN(CONFIG_KUNIT)
+
+static char *kunit_shutdown;
+core_param(kunit_shutdown, kunit_shutdown, charp, 0644);
+
static void kunit_handle_shutdown(void)
{
if (!kunit_shutdown)
@@ -169,7 +169,7 @@ static void kunit_handle_shutdown(void)

}

-static void kunit_exec_run_tests(struct suite_set *suite_set)
+static void kunit_exec_run_tests(struct kunit_suite_set *suite_set)
{
size_t num_suites = suite_set->end - suite_set->start;

diff --git a/lib/kunit/test.c b/lib/kunit/test.c
index 413d9fd364a8d..bfc2f65bd1dae 100644
--- a/lib/kunit/test.c
+++ b/lib/kunit/test.c
@@ -757,6 +757,22 @@ EXPORT_SYMBOL_GPL(__kunit_test_suites_exit);
#ifdef CONFIG_MODULES
static void kunit_module_init(struct module *mod)
{
+ struct kunit_suite_set suite_set = {
+ mod->kunit_suites, mod->kunit_suites + mod->num_kunit_suites,
+ };
+ int err = 0;
+
+ suite_set = kunit_filter_suites(&suite_set,
+ kunit_filter_glob() ?: "*.*", &err);
+ if (err) {
+ pr_err("kunit module: error filtering suites: %d\n",
+ err);
+ kfree(suite_set.start);
+ suite_set.start = NULL;
+ }
+ mod->kunit_suites = (struct kunit_suite **)suite_set.start;
+ mod->num_kunit_suites = suite_set.end - suite_set.start;
+
if (mod->num_kunit_suites > 0) {
pr_info("KTAP version 1\n");
pr_info("1..%d\n", mod->num_kunit_suites);
@@ -767,7 +783,13 @@ static void kunit_module_init(struct module *mod)

static void kunit_module_exit(struct module *mod)
{
+ struct kunit_suite_set suite_set = {
+ mod->kunit_suites, mod->kunit_suites + mod->num_kunit_suites,
+ };
+
__kunit_test_suites_exit(mod->kunit_suites, mod->num_kunit_suites);
+ if (suite_set.start)
+ kunit_free_suite_set(suite_set);
}

static int kunit_module_notify(struct notifier_block *nb, unsigned long val,
--
2.41.0

2023-07-28 18:18:08

by kernel test robot

[permalink] [raw]

Subject: Re: [PATCH 3/3] kunit: Allow kunit test modules to use test filtering

Hi Janusz,

kernel test robot noticed the following build errors:

[auto build test ERROR on shuah-kselftest/kunit-fixes]
[also build test ERROR on linus/master v6.5-rc3]
[cannot apply to shuah-kselftest/kunit next-20230728]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url: https://github.com/intel-lab-lkp/linux/commits/Janusz-Krzysztofik/kunit-Report-the-count-of-test-suites-in-a-module/20230728-234736
base: https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes
patch link: https://lore.kernel.org/r/20230728154419.1810177-8-janusz.krzysztofik%40linux.intel.com
patch subject: [PATCH 3/3] kunit: Allow kunit test modules to use test filtering
config: arc-randconfig-r043-20230728 (https://download.01.org/0day-ci/archive/20230729/[email protected]/config)
compiler: arc-elf-gcc (GCC) 12.3.0
reproduce: (https://download.01.org/0day-ci/archive/20230729/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All error/warnings (new ones prefixed by >>):

>> lib/kunit/executor.c:182:42: warning: 'struct suite_set' declared inside parameter list will not be visible outside of this definition or declaration
182 | static void kunit_exec_list_tests(struct suite_set *suite_set)
| ^~~~~~~~~
lib/kunit/executor.c: In function 'kunit_exec_list_tests':
>> lib/kunit/executor.c:190:32: error: invalid use of undefined type 'struct suite_set'
190 | for (suites = suite_set->start; suites < suite_set->end; suites++)
| ^~
lib/kunit/executor.c:190:59: error: invalid use of undefined type 'struct suite_set'
190 | for (suites = suite_set->start; suites < suite_set->end; suites++)
| ^~
lib/kunit/executor.c: In function 'kunit_run_all_tests':
>> lib/kunit/executor.c:198:16: error: variable 'suite_set' has initializer but incomplete type
198 | struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
| ^~~~~~~~~
>> lib/kunit/executor.c:198:39: warning: excess elements in struct initializer
198 | struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
| ^~~~~~~~~~~~~~~~~~~~
lib/kunit/executor.c:198:39: note: (near initialization for 'suite_set')
lib/kunit/executor.c:198:61: warning: excess elements in struct initializer
198 | struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
| ^~~~~~~~~~~~~~~~~~
lib/kunit/executor.c:198:61: note: (near initialization for 'suite_set')
>> lib/kunit/executor.c:198:26: error: storage size of 'suite_set' isn't known
198 | struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
| ^~~~~~~~~
lib/kunit/executor.c:198:26: warning: unused variable 'suite_set' [-Wunused-variable]
In file included from lib/kunit/executor.c:230:
lib/kunit/executor_test.c: In function 'filter_suites_test':
>> lib/kunit/executor_test.c:45:16: error: variable 'suite_set' has initializer but incomplete type
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
>> lib/kunit/executor_test.c:45:40: error: 'struct suite_set' has no member named 'start'
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~
>> lib/kunit/executor_test.c:45:48: warning: excess elements in struct initializer
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~
lib/kunit/executor_test.c:45:48: note: (near initialization for 'suite_set')
>> lib/kunit/executor_test.c:45:59: error: 'struct suite_set' has no member named 'end'
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~
lib/kunit/executor_test.c:45:65: warning: excess elements in struct initializer
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^
lib/kunit/executor_test.c:45:65: note: (near initialization for 'suite_set')
>> lib/kunit/executor_test.c:45:26: error: storage size of 'suite_set' isn't known
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
>> lib/kunit/executor_test.c:46:26: error: storage size of 'got' isn't known
46 | struct suite_set got;
| ^~~
In file included from lib/kunit/executor.c:4:
>> include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:54:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
54 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/linux/rwsem.h:17,
from include/linux/notifier.h:15,
from include/linux/reboot.h:6,
from lib/kunit/executor.c:3:
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
>> include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:54:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
54 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:744:64: note: (near initialization for '__assertion.value')
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:54:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
54 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:59:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
59 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
>> include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:59:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
59 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:744:64: note: (near initialization for '__assertion.value')
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:59:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
59 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:46:26: warning: unused variable 'got' [-Wunused-variable]
46 | struct suite_set got;
| ^~~
lib/kunit/executor_test.c:45:26: warning: unused variable 'suite_set' [-Wunused-variable]
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c: In function 'filter_suites_test_glob_test':
lib/kunit/executor_test.c:69:16: error: variable 'suite_set' has initializer but incomplete type
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c:69:40: error: 'struct suite_set' has no member named 'start'
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~
lib/kunit/executor_test.c:69:48: warning: excess elements in struct initializer
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~
lib/kunit/executor_test.c:69:48: note: (near initialization for 'suite_set')
lib/kunit/executor_test.c:69:59: error: 'struct suite_set' has no member named 'end'
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~
lib/kunit/executor_test.c:69:65: warning: excess elements in struct initializer
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^
lib/kunit/executor_test.c:69:65: note: (near initialization for 'suite_set')
lib/kunit/executor_test.c:69:26: error: storage size of 'suite_set' isn't known
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c:70:26: error: storage size of 'got' isn't known
70 | struct suite_set got;
| ^~~
>> include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:78:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
78 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
>> include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:78:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
78 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:744:64: note: (near initialization for '__assertion.value')
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:78:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
78 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:83:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
83 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
>> include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:83:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
83 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:744:64: note: (near initialization for '__assertion.value')
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:83:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
83 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:88:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
88 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]->test_cases);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:88:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
88 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]->test_cases);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:744:64: note: (near initialization for '__assertion.value')
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:88:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
88 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]->test_cases);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:70:26: warning: unused variable 'got' [-Wunused-variable]
70 | struct suite_set got;
| ^~~
lib/kunit/executor_test.c:69:26: warning: unused variable 'suite_set' [-Wunused-variable]
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c: In function 'filter_suites_to_empty_test':
lib/kunit/executor_test.c:96:16: error: variable 'suite_set' has initializer but incomplete type
96 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c:96:40: error: 'struct suite_set' has no member named 'start'
96 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~
lib/kunit/executor_test.c:96:48: warning: excess elements in struct initializer
96 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~
lib/kunit/executor_test.c:96:48: note: (near initialization for 'suite_set')
lib/kunit/executor_test.c:96:59: error: 'struct suite_set' has no member named 'end'
96 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~
lib/kunit/executor_test.c:96:65: warning: excess elements in struct initializer
96 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^
lib/kunit/executor_test.c:96:65: note: (near initialization for 'suite_set')
lib/kunit/executor_test.c:96:26: error: storage size of 'suite_set' isn't known
96 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c:97:26: error: storage size of 'got' isn't known
97 | struct suite_set got;
| ^~~
include/kunit/test.h:628:55: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
628 | .left_value = __left, \
| ^~~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:627:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
627 | KUNIT_INIT_ASSERT(.text = &__text, \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:656:9: note: in expansion of macro 'KUNIT_BASE_BINARY_ASSERTION'
656 | KUNIT_BASE_BINARY_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:825:9: note: in expansion of macro 'KUNIT_BINARY_PTR_ASSERTION'
825 | KUNIT_BINARY_PTR_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:107:9: note: in expansion of macro 'KUNIT_EXPECT_PTR_EQ_MSG'
107 | KUNIT_EXPECT_PTR_EQ_MSG(test, got.start, got.end,
| ^~~~~~~~~~~~~~~~~~~~~~~

vim +190 lib/kunit/executor.c

9c6b0e1d8993e4 Daniel Latypov 2021-09-30 181
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 @182 static void kunit_exec_list_tests(struct suite_set *suite_set)
aac35468ca20a3 Alan Maguire 2020-08-04 183 {
e5857d396f35e5 Daniel Latypov 2022-07-09 184 struct kunit_suite * const *suites;
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 185 struct kunit_case *test_case;
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 186
6c738b52316c58 Rae Moar 2022-11-23 187 /* Hack: print a ktap header so kunit.py can find the start of KUnit output. */
6c738b52316c58 Rae Moar 2022-11-23 188 pr_info("KTAP version 1\n");
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 189
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 @190 for (suites = suite_set->start; suites < suite_set->end; suites++)
e5857d396f35e5 Daniel Latypov 2022-07-09 191 kunit_suite_for_each_test_case((*suites), test_case) {
e5857d396f35e5 Daniel Latypov 2022-07-09 192 pr_info("%s.%s\n", (*suites)->name, test_case->name);
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 193 }
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 194 }
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 195
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 196 int kunit_run_all_tests(void)
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 197 {
e5857d396f35e5 Daniel Latypov 2022-07-09 @198 struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
1b11063d32d7e1 Daniel Latypov 2022-05-13 199 int err = 0;
d20a6ba5e3be5f Joe Fradley 2022-08-23 200 if (!kunit_enabled()) {
d20a6ba5e3be5f Joe Fradley 2022-08-23 201 pr_info("kunit: disabled\n");
d20a6ba5e3be5f Joe Fradley 2022-08-23 202 goto out;
d20a6ba5e3be5f Joe Fradley 2022-08-23 203 }
aac35468ca20a3 Alan Maguire 2020-08-04 204
a02353f491622e Daniel Latypov 2022-05-11 205 if (filter_glob_param) {
a02353f491622e Daniel Latypov 2022-05-11 206 suite_set = kunit_filter_suites(&suite_set, filter_glob_param, &err);
a02353f491622e Daniel Latypov 2022-05-11 207 if (err) {
a02353f491622e Daniel Latypov 2022-05-11 208 pr_err("kunit executor: error filtering suites: %d\n", err);
1b11063d32d7e1 Daniel Latypov 2022-05-13 209 goto out;
a02353f491622e Daniel Latypov 2022-05-11 210 }
a02353f491622e Daniel Latypov 2022-05-11 211 }
45dcbb6f5ef78b Brendan Higgins 2020-08-04 212
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 213 if (!action_param)
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 214 kunit_exec_run_tests(&suite_set);
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 215 else if (strcmp(action_param, "list") == 0)
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 216 kunit_exec_list_tests(&suite_set);
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 217 else
9c6b0e1d8993e4 Daniel Latypov 2021-09-30 218 pr_err("kunit executor: unknown action '%s'\n", action_param);
aac35468ca20a3 Alan Maguire 2020-08-04 219
e5857d396f35e5 Daniel Latypov 2022-07-09 220 if (filter_glob_param) { /* a copy was made of each suite */
a127b154a8f231 Daniel Latypov 2021-09-14 221 kunit_free_suite_set(suite_set);
5d31f71efcb6bc Daniel Latypov 2021-02-05 222 }
5d31f71efcb6bc Daniel Latypov 2021-02-05 223
1b11063d32d7e1 Daniel Latypov 2022-05-13 224 out:
1b11063d32d7e1 Daniel Latypov 2022-05-13 225 kunit_handle_shutdown();
1b11063d32d7e1 Daniel Latypov 2022-05-13 226 return err;
aac35468ca20a3 Alan Maguire 2020-08-04 227 }
aac35468ca20a3 Alan Maguire 2020-08-04 228

--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

2023-07-28 19:51:25

by kernel test robot

[permalink] [raw]

Subject: Re: [PATCH 3/3] kunit: Allow kunit test modules to use test filtering

2023-07-28 20:04:08

by kernel test robot

[permalink] [raw]

Subject: Re: [PATCH 3/3] kunit: Allow kunit test modules to use test filtering

2023-07-28 23:23:17

by kernel test robot

[permalink] [raw]

Subject: Re: [PATCH 3/3] kunit: Allow kunit test modules to use test filtering

Hi Janusz,

kernel test robot noticed the following build warnings:

[auto build test WARNING on shuah-kselftest/kunit-fixes]
[also build test WARNING on linus/master v6.5-rc3]
[cannot apply to shuah-kselftest/kunit next-20230728]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url: https://github.com/intel-lab-lkp/linux/commits/Janusz-Krzysztofik/kunit-Report-the-count-of-test-suites-in-a-module/20230728-234736
base: https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes
patch link: https://lore.kernel.org/r/20230728154419.1810177-8-janusz.krzysztofik%40linux.intel.com
patch subject: [PATCH 3/3] kunit: Allow kunit test modules to use test filtering
config: i386-allyesconfig (https://download.01.org/0day-ci/archive/20230729/[email protected]/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce: (https://download.01.org/0day-ci/archive/20230729/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

lib/kunit/executor.c:182:42: warning: 'struct suite_set' declared inside parameter list will not be visible outside of this definition or declaration
182 | static void kunit_exec_list_tests(struct suite_set *suite_set)
| ^~~~~~~~~
lib/kunit/executor.c: In function 'kunit_exec_list_tests':
lib/kunit/executor.c:190:32: error: invalid use of undefined type 'struct suite_set'
190 | for (suites = suite_set->start; suites < suite_set->end; suites++)
| ^~
lib/kunit/executor.c:190:59: error: invalid use of undefined type 'struct suite_set'
190 | for (suites = suite_set->start; suites < suite_set->end; suites++)
| ^~
lib/kunit/executor.c: In function 'kunit_run_all_tests':
lib/kunit/executor.c:198:16: error: variable 'suite_set' has initializer but incomplete type
198 | struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
| ^~~~~~~~~
lib/kunit/executor.c:198:39: warning: excess elements in struct initializer
198 | struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
| ^~~~~~~~~~~~~~~~~~~~
lib/kunit/executor.c:198:39: note: (near initialization for 'suite_set')
lib/kunit/executor.c:198:61: warning: excess elements in struct initializer
198 | struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
| ^~~~~~~~~~~~~~~~~~
lib/kunit/executor.c:198:61: note: (near initialization for 'suite_set')
lib/kunit/executor.c:198:26: error: storage size of 'suite_set' isn't known
198 | struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
| ^~~~~~~~~
>> lib/kunit/executor.c:198:26: warning: unused variable 'suite_set' [-Wunused-variable]
In file included from lib/kunit/executor.c:230:
lib/kunit/executor_test.c: In function 'filter_suites_test':
lib/kunit/executor_test.c:45:16: error: variable 'suite_set' has initializer but incomplete type
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c:45:40: error: 'struct suite_set' has no member named 'start'
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~
lib/kunit/executor_test.c:45:48: warning: excess elements in struct initializer
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~
lib/kunit/executor_test.c:45:48: note: (near initialization for 'suite_set')
lib/kunit/executor_test.c:45:59: error: 'struct suite_set' has no member named 'end'
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~
lib/kunit/executor_test.c:45:65: warning: excess elements in struct initializer
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^
lib/kunit/executor_test.c:45:65: note: (near initialization for 'suite_set')
lib/kunit/executor_test.c:45:26: error: storage size of 'suite_set' isn't known
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c:46:26: error: storage size of 'got' isn't known
46 | struct suite_set got;
| ^~~
In file included from lib/kunit/executor.c:4:
include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:54:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
54 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from arch/x86/include/asm/processor.h:36,
from arch/x86/include/asm/cpufeature.h:5,
from arch/x86/include/asm/thread_info.h:53,
from include/linux/thread_info.h:60,
from arch/x86/include/asm/preempt.h:9,
from include/linux/preempt.h:79,
from include/linux/smp.h:110,
from include/linux/lockdep.h:14,
from include/linux/mutex.h:17,
from include/linux/notifier.h:14,
from include/linux/reboot.h:6,
from lib/kunit/executor.c:3:
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:54:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
54 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:744:64: note: (near initialization for '__assertion.value')
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:54:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
54 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:59:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
59 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:59:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
59 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:744:64: note: (near initialization for '__assertion.value')
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:59:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
59 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> lib/kunit/executor_test.c:46:26: warning: unused variable 'got' [-Wunused-variable]
46 | struct suite_set got;
| ^~~
>> lib/kunit/executor_test.c:45:26: warning: unused variable 'suite_set' [-Wunused-variable]
45 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c: In function 'filter_suites_test_glob_test':
lib/kunit/executor_test.c:69:16: error: variable 'suite_set' has initializer but incomplete type
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c:69:40: error: 'struct suite_set' has no member named 'start'
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~
lib/kunit/executor_test.c:69:48: warning: excess elements in struct initializer
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~
lib/kunit/executor_test.c:69:48: note: (near initialization for 'suite_set')
lib/kunit/executor_test.c:69:59: error: 'struct suite_set' has no member named 'end'
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~
lib/kunit/executor_test.c:69:65: warning: excess elements in struct initializer
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^
lib/kunit/executor_test.c:69:65: note: (near initialization for 'suite_set')
lib/kunit/executor_test.c:69:26: error: storage size of 'suite_set' isn't known
69 | struct suite_set suite_set = {.start = subsuite, .end = &subsuite[2]};
| ^~~~~~~~~
lib/kunit/executor_test.c:70:26: error: storage size of 'got' isn't known
70 | struct suite_set got;
| ^~~
include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:78:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
78 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:78:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
78 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:744:64: note: (near initialization for '__assertion.value')
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'
510 | const struct assert_class __assertion = INITIALIZER; \
| ^~~~~~~~~~~
include/kunit/test.h:744:23: note: in expansion of macro 'KUNIT_INIT_ASSERT'
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~~~~~~~~~~~~~
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:78:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
78 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:737:29: warning: passing argument 1 of 'IS_ERR_OR_NULL' makes pointer from integer without a cast [-Wint-conversion]
737 | if (!IS_ERR_OR_NULL(__ptr)) \
| ^~~~~
| |
| int
include/kunit/test.h:1418:9: note: in expansion of macro 'KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION'
1418 | KUNIT_PTR_NOT_ERR_OR_NULL_MSG_ASSERTION(test, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/kunit/test.h:1415:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG'
1415 | KUNIT_ASSERT_NOT_ERR_OR_NULL_MSG(test, ptr, NULL)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/kunit/executor_test.c:83:9: note: in expansion of macro 'KUNIT_ASSERT_NOT_ERR_OR_NULL'
83 | KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/err.h:70:68: note: expected 'const void *' but argument is of type 'int'
70 | static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
| ~~~~~~~~~~~~^~~
include/kunit/test.h:744:64: warning: initialization of 'const void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
744 | KUNIT_INIT_ASSERT(.text = #ptr, .value = __ptr), \
| ^~~~~
include/kunit/test.h:510:49: note: in definition of macro '_KUNIT_FAILED'

vim +/suite_set +198 lib/kunit/executor.c

9c6b0e1d8993e47 Daniel Latypov 2021-09-30 195
9c6b0e1d8993e47 Daniel Latypov 2021-09-30 196 int kunit_run_all_tests(void)
9c6b0e1d8993e47 Daniel Latypov 2021-09-30 197 {
e5857d396f35e59 Daniel Latypov 2022-07-09 @198 struct suite_set suite_set = {__kunit_suites_start, __kunit_suites_end};
1b11063d32d7e11 Daniel Latypov 2022-05-13 199 int err = 0;
d20a6ba5e3be5f8 Joe Fradley 2022-08-23 200 if (!kunit_enabled()) {
d20a6ba5e3be5f8 Joe Fradley 2022-08-23 201 pr_info("kunit: disabled\n");
d20a6ba5e3be5f8 Joe Fradley 2022-08-23 202 goto out;
d20a6ba5e3be5f8 Joe Fradley 2022-08-23 203 }
aac35468ca20a3a Alan Maguire 2020-08-04 204
a02353f491622e4 Daniel Latypov 2022-05-11 205 if (filter_glob_param) {
a02353f491622e4 Daniel Latypov 2022-05-11 206 suite_set = kunit_filter_suites(&suite_set, filter_glob_param, &err);
a02353f491622e4 Daniel Latypov 2022-05-11 207 if (err) {
a02353f491622e4 Daniel Latypov 2022-05-11 208 pr_err("kunit executor: error filtering suites: %d\n", err);
1b11063d32d7e11 Daniel Latypov 2022-05-13 209 goto out;
a02353f491622e4 Daniel Latypov 2022-05-11 210 }
a02353f491622e4 Daniel Latypov 2022-05-11 211 }
45dcbb6f5ef78b0 Brendan Higgins 2020-08-04 212
9c6b0e1d8993e47 Daniel Latypov 2021-09-30 213 if (!action_param)
9c6b0e1d8993e47 Daniel Latypov 2021-09-30 214 kunit_exec_run_tests(&suite_set);
9c6b0e1d8993e47 Daniel Latypov 2021-09-30 215 else if (strcmp(action_param, "list") == 0)
9c6b0e1d8993e47 Daniel Latypov 2021-09-30 216 kunit_exec_list_tests(&suite_set);
9c6b0e1d8993e47 Daniel Latypov 2021-09-30 217 else
9c6b0e1d8993e47 Daniel Latypov 2021-09-30 218 pr_err("kunit executor: unknown action '%s'\n", action_param);
aac35468ca20a3a Alan Maguire 2020-08-04 219
e5857d396f35e59 Daniel Latypov 2022-07-09 220 if (filter_glob_param) { /* a copy was made of each suite */
a127b154a8f2317 Daniel Latypov 2021-09-14 221 kunit_free_suite_set(suite_set);
5d31f71efcb6bce Daniel Latypov 2021-02-05 222 }
5d31f71efcb6bce Daniel Latypov 2021-02-05 223
1b11063d32d7e11 Daniel Latypov 2022-05-13 224 out:
1b11063d32d7e11 Daniel Latypov 2022-05-13 225 kunit_handle_shutdown();
1b11063d32d7e11 Daniel Latypov 2022-05-13 226 return err;
aac35468ca20a3a Alan Maguire 2020-08-04 227 }
aac35468ca20a3a Alan Maguire 2020-08-04 228

--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

2023-07-29 18:02:33

by Janusz Krzysztofik

[permalink] [raw]

Subject: Re: [PATCH 3/3] kunit: Allow kunit test modules to use test filtering

On Friday, 28 July 2023 19:24:55 CEST kernel test robot wrote:
> >> lib/kunit/executor.c:182:42: warning: declaration of 'struct suite_set'
will not be visible outside of this function [-Wvisibility]
> 182 | static void kunit_exec_list_tests(struct suite_set *suite_set)
> | ^

I've apparently broken this patch while reordering patches in the series.
Sorry for submitting that untested. Please expect v2 soon.

Thanks,
Janusz