Merge tag 'linux_kselftest-kunit-7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kunit update from Shuah Khan:
 "A single fix to kunit_run_all_tests() to return void since callers
  don't check the return value and the integer return type is a remnant
  from when the function was executed as initcall which is no longer the
  case"

* tag 'linux_kselftest-kunit-7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kunit: Return void from kunit_run_all_tests()
This commit is contained in:
Linus Torvalds
2026-10-22 08:23:28 -10:00
2 changed files with 4 additions and 6 deletions
+2 -3
View File
@@ -400,11 +400,10 @@ struct kunit_suite_set kunit_merge_suite_sets(struct kunit_suite_set init_suite_
const void *kunit_array_gen_params(struct kunit *test, const void *prev, char *desc);
#if IS_BUILTIN(CONFIG_KUNIT)
int kunit_run_all_tests(void);
void kunit_run_all_tests(void);
#else
static inline int kunit_run_all_tests(void)
static inline void kunit_run_all_tests(void)
{
return 0;
}
#endif /* IS_BUILTIN(CONFIG_KUNIT) */
+2 -3
View File
@@ -371,7 +371,7 @@ static void kunit_handle_shutdown(void)
}
int kunit_run_all_tests(void)
void kunit_run_all_tests(void)
{
struct kunit_suite_set suite_set = {NULL, NULL};
struct kunit_suite_set filtered_suite_set = {NULL, NULL};
@@ -382,7 +382,7 @@ int kunit_run_all_tests(void)
__kunit_suites_start, __kunit_suites_end,
};
size_t init_num_suites = init_suite_set.end - init_suite_set.start;
int err = 0;
int err;
if (init_num_suites > 0) {
suite_set = kunit_merge_suite_sets(init_suite_set, normal_suite_set);
@@ -432,7 +432,6 @@ free_out:
out:
kunit_handle_shutdown();
return err;
}
#if IS_BUILTIN(CONFIG_KUNIT_TEST)