summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-09-07 14:48:08 +0100
committerMark Brown <broonie@kernel.org>2026-09-07 14:48:08 +0100
commit2f21ac3310eb7da2551a3bacd9c04f2d769b1a49 (patch)
treecc1c4a63b65b453e750d658b52c8e7c4be7092d6
parent81c92f53e0aabf6a1ba9402a3ceff4bfcb959a0f (diff)
parente38f53f0482468efd04397f66bda4648b70ac9fa (diff)
downloadlinux-next-2f21ac3310eb7da2551a3bacd9c04f2d769b1a49.tar.gz
linux-next-2f21ac3310eb7da2551a3bacd9c04f2d769b1a49.zip
Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
-rw-r--r--include/kunit/test.h5
-rw-r--r--lib/kunit/executor.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/include/kunit/test.h b/include/kunit/test.h
index da5312e0dfa5..31d549578f8e 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -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) */
diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
index b0f8a41d61d3..c798a02470d8 100644
--- a/lib/kunit/executor.c
+++ b/lib/kunit/executor.c
@@ -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)