From: Brendan Higgins <brendanhiggins@google.com> To: jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, arnd@arndb.de, keescook@chromium.org, skhan@linuxfoundation.org, alan.maguire@oracle.com, yzaikin@google.com, davidgow@google.com, akpm@linux-foundation.org, rppt@linux.ibm.com, frowand.list@gmail.com Cc: gregkh@linuxfoundation.org, sboyd@kernel.org, logang@deltatee.com, mcgrof@kernel.org, knut.omang@oracle.com, linux-um@lists.infradead.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Brendan Higgins <brendanhiggins@google.com> Subject: [PATCH v1 4/7] init: main: add KUnit to kernel init Date: Mon, 27 Jan 2020 23:19:59 -0800 [thread overview] Message-ID: <20200128072002.79250-5-brendanhiggins@google.com> (raw) In-Reply-To: <20200128072002.79250-1-brendanhiggins@google.com> Remove KUnit from init calls entirely, instead call directly from kernel_init(). Co-developed-by: Alan Maguire <alan.maguire@oracle.com> Signed-off-by: Alan Maguire <alan.maguire@oracle.com> Signed-off-by: Brendan Higgins <brendanhiggins@google.com> --- include/kunit/test.h | 9 +++++++++ init/main.c | 4 ++++ lib/kunit/executor.c | 4 +--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index 8a02f93a6b505..8689dd1459844 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -197,6 +197,15 @@ void kunit_init_test(struct kunit *test, const char *name); int kunit_run_tests(struct kunit_suite *suite); +#if IS_BUILTIN(CONFIG_KUNIT) +int kunit_run_all_tests(void); +#else +static inline int kunit_run_all_tests(void) +{ + return 0; +} +#endif /* IS_BUILTIN(CONFIG_KUNIT) */ + /* * If a test suite is built-in, module_init() gets translated into * an initcall which we don't want as the idea is that for builtins diff --git a/init/main.c b/init/main.c index 2cd736059416f..90301d4fbd1bb 100644 --- a/init/main.c +++ b/init/main.c @@ -103,6 +103,8 @@ #define CREATE_TRACE_POINTS #include <trace/events/initcall.h> +#include <kunit/test.h> + static int kernel_init(void *); extern void init_IRQ(void); @@ -1201,6 +1203,8 @@ static noinline void __init kernel_init_freeable(void) do_basic_setup(); + kunit_run_all_tests(); + console_on_rootfs(); /* diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c index 6429927d598a5..b75a46c560847 100644 --- a/lib/kunit/executor.c +++ b/lib/kunit/executor.c @@ -11,7 +11,7 @@ extern struct kunit_suite * const * const __kunit_suites_end[]; #if IS_BUILTIN(CONFIG_KUNIT) -static int kunit_run_all_tests(void) +int kunit_run_all_tests(void) { struct kunit_suite * const * const *suites, * const *subsuite; bool has_test_failed = false; @@ -31,6 +31,4 @@ static int kunit_run_all_tests(void) return 0; } -late_initcall(kunit_run_all_tests); - #endif /* IS_BUILTIN(CONFIG_KUNIT) */ -- 2.25.0.341.g760bfbb309-goog
WARNING: multiple messages have this Message-ID (diff)
From: Brendan Higgins <brendanhiggins@google.com> To: jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, arnd@arndb.de, keescook@chromium.org, skhan@linuxfoundation.org, alan.maguire@oracle.com, yzaikin@google.com, davidgow@google.com, akpm@linux-foundation.org, rppt@linux.ibm.com, frowand.list@gmail.com Cc: linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, sboyd@kernel.org, gregkh@linuxfoundation.org, knut.omang@oracle.com, linux-kernel@vger.kernel.org, linux-um@lists.infradead.org, mcgrof@kernel.org, linux-kselftest@vger.kernel.org, logang@deltatee.com, Brendan Higgins <brendanhiggins@google.com>, kunit-dev@googlegroups.com Subject: [PATCH v1 4/7] init: main: add KUnit to kernel init Date: Mon, 27 Jan 2020 23:19:59 -0800 [thread overview] Message-ID: <20200128072002.79250-5-brendanhiggins@google.com> (raw) In-Reply-To: <20200128072002.79250-1-brendanhiggins@google.com> Remove KUnit from init calls entirely, instead call directly from kernel_init(). Co-developed-by: Alan Maguire <alan.maguire@oracle.com> Signed-off-by: Alan Maguire <alan.maguire@oracle.com> Signed-off-by: Brendan Higgins <brendanhiggins@google.com> --- include/kunit/test.h | 9 +++++++++ init/main.c | 4 ++++ lib/kunit/executor.c | 4 +--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index 8a02f93a6b505..8689dd1459844 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -197,6 +197,15 @@ void kunit_init_test(struct kunit *test, const char *name); int kunit_run_tests(struct kunit_suite *suite); +#if IS_BUILTIN(CONFIG_KUNIT) +int kunit_run_all_tests(void); +#else +static inline int kunit_run_all_tests(void) +{ + return 0; +} +#endif /* IS_BUILTIN(CONFIG_KUNIT) */ + /* * If a test suite is built-in, module_init() gets translated into * an initcall which we don't want as the idea is that for builtins diff --git a/init/main.c b/init/main.c index 2cd736059416f..90301d4fbd1bb 100644 --- a/init/main.c +++ b/init/main.c @@ -103,6 +103,8 @@ #define CREATE_TRACE_POINTS #include <trace/events/initcall.h> +#include <kunit/test.h> + static int kernel_init(void *); extern void init_IRQ(void); @@ -1201,6 +1203,8 @@ static noinline void __init kernel_init_freeable(void) do_basic_setup(); + kunit_run_all_tests(); + console_on_rootfs(); /* diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c index 6429927d598a5..b75a46c560847 100644 --- a/lib/kunit/executor.c +++ b/lib/kunit/executor.c @@ -11,7 +11,7 @@ extern struct kunit_suite * const * const __kunit_suites_end[]; #if IS_BUILTIN(CONFIG_KUNIT) -static int kunit_run_all_tests(void) +int kunit_run_all_tests(void) { struct kunit_suite * const * const *suites, * const *subsuite; bool has_test_failed = false; @@ -31,6 +31,4 @@ static int kunit_run_all_tests(void) return 0; } -late_initcall(kunit_run_all_tests); - #endif /* IS_BUILTIN(CONFIG_KUNIT) */ -- 2.25.0.341.g760bfbb309-goog _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um
next prev parent reply other threads:[~2020-01-28 7:20 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-28 7:19 [PATCH v1 0/7] kunit: create a centralized executor to dispatch all KUnit tests Brendan Higgins 2020-01-28 7:19 ` Brendan Higgins 2020-01-28 7:19 ` [PATCH v1 1/7] vmlinux.lds.h: add linker section for KUnit test suites Brendan Higgins 2020-01-28 7:19 ` Brendan Higgins 2020-01-28 7:19 ` [PATCH v1 2/7] arch: um: " Brendan Higgins 2020-01-28 7:19 ` Brendan Higgins 2020-01-28 7:19 ` [PATCH v1 3/7] kunit: test: create a single centralized executor for all tests Brendan Higgins 2020-01-28 7:19 ` Brendan Higgins 2020-01-29 6:38 ` Stephen Boyd 2020-01-29 6:38 ` Stephen Boyd 2020-01-29 6:38 ` Stephen Boyd 2020-01-29 6:38 ` Stephen Boyd 2020-01-28 7:19 ` Brendan Higgins [this message] 2020-01-28 7:19 ` [PATCH v1 4/7] init: main: add KUnit to kernel init Brendan Higgins 2020-01-29 6:38 ` Stephen Boyd 2020-01-29 6:38 ` Stephen Boyd 2020-01-29 6:38 ` Stephen Boyd 2020-01-29 6:38 ` Stephen Boyd 2020-01-30 22:50 ` Brendan Higgins 2020-01-30 22:50 ` Brendan Higgins 2020-01-30 22:50 ` Brendan Higgins 2020-01-30 22:50 ` Brendan Higgins 2020-01-28 7:20 ` [PATCH v1 5/7] kunit: test: add test plan to KUnit TAP format Brendan Higgins 2020-01-28 7:20 ` Brendan Higgins 2020-01-28 7:20 ` [PATCH v1 6/7] kunit: Add 'kunit_shutdown' option Brendan Higgins 2020-01-28 7:20 ` Brendan Higgins 2020-01-29 6:33 ` Stephen Boyd 2020-01-29 6:33 ` Stephen Boyd 2020-01-29 6:33 ` Stephen Boyd 2020-01-29 6:33 ` Stephen Boyd 2020-01-30 22:56 ` Brendan Higgins 2020-01-30 22:56 ` Brendan Higgins 2020-01-30 22:56 ` Brendan Higgins 2020-01-28 7:20 ` [PATCH v1 7/7] Documentation: Add kunit_shutdown to kernel-parameters.txt Brendan Higgins 2020-01-28 7:20 ` Brendan Higgins 2020-01-29 6:27 ` Stephen Boyd 2020-01-29 6:27 ` Stephen Boyd 2020-01-29 6:27 ` Stephen Boyd 2020-01-29 6:27 ` Stephen Boyd 2020-01-30 23:04 ` Brendan Higgins 2020-01-30 23:04 ` Brendan Higgins 2020-01-30 23:04 ` Brendan Higgins 2020-01-30 23:04 ` Brendan Higgins
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200128072002.79250-5-brendanhiggins@google.com \ --to=brendanhiggins@google.com \ --cc=akpm@linux-foundation.org \ --cc=alan.maguire@oracle.com \ --cc=anton.ivanov@cambridgegreys.com \ --cc=arnd@arndb.de \ --cc=davidgow@google.com \ --cc=frowand.list@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=jdike@addtoit.com \ --cc=keescook@chromium.org \ --cc=knut.omang@oracle.com \ --cc=kunit-dev@googlegroups.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-um@lists.infradead.org \ --cc=logang@deltatee.com \ --cc=mcgrof@kernel.org \ --cc=richard@nod.at \ --cc=rppt@linux.ibm.com \ --cc=sboyd@kernel.org \ --cc=skhan@linuxfoundation.org \ --cc=yzaikin@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.