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
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,
Brendan Higgins <brendanhiggins@google.com>
Subject: [RFC v1 4/6] init: main: add KUnit to kernel init
Date: Mon, 16 Dec 2019 14:05:53 -0800 [thread overview]
Message-ID: <20191216220555.245089-5-brendanhiggins@google.com> (raw)
In-Reply-To: <20191216220555.245089-1-brendanhiggins@google.com>
Remove KUnit from init calls entirely, instead call directly from
kernel_init().
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 c070798ebb765..9da4f2cc1a3fc 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -196,6 +196,15 @@ void kunit_init_test(struct kunit *test, const char *name);
int kunit_run_tests(struct kunit_suite *suite);
+#if IS_ENABLED(CONFIG_KUNIT)
+int kunit_executor_init(void);
+#else
+static inline int kunit_executor_init(void)
+{
+ return 0;
+}
+#endif /* IS_ENABLED(CONFIG_KUNIT) */
+
/**
* kunit_test_suite() - used to register a &struct kunit_suite with KUnit.
*
diff --git a/init/main.c b/init/main.c
index 91f6ebb30ef04..b299396a5466b 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);
@@ -1190,6 +1192,8 @@ static noinline void __init kernel_init_freeable(void)
do_basic_setup();
+ kunit_executor_init();
+
/* Open the /dev/console on the rootfs, this should never fail */
if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
pr_err("Warning: unable to open an initial console.\n");
diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
index 978086cfd257d..ca880224c0bab 100644
--- a/lib/kunit/executor.c
+++ b/lib/kunit/executor.c
@@ -32,12 +32,10 @@ static bool kunit_run_all_tests(void)
return !has_test_failed;
}
-static int kunit_executor_init(void)
+int kunit_executor_init(void)
{
if (kunit_run_all_tests())
return 0;
else
return -EFAULT;
}
-
-late_initcall(kunit_executor_init);
--
2.24.1.735.g03f4e72817-goog
next prev parent reply other threads:[~2019-12-16 22:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 22:05 [RFC v1 0/6] kunit: create a centralized executor to dispatch all KUnit tests Brendan Higgins
2019-12-16 22:05 ` [RFC v1 1/6] vmlinux.lds.h: add linker section for KUnit test suites Brendan Higgins
2019-12-17 8:21 ` Stephen Boyd
2019-12-16 22:05 ` [RFC v1 2/6] arch: um: " Brendan Higgins
2019-12-17 8:21 ` Stephen Boyd
2019-12-16 22:05 ` [RFC v1 3/6] kunit: test: create a single centralized executor for all tests Brendan Higgins
2019-12-17 8:04 ` Stephen Boyd
2020-01-23 22:54 ` Brendan Higgins
2019-12-16 22:05 ` Brendan Higgins [this message]
2019-12-17 7:58 ` [RFC v1 4/6] init: main: add KUnit to kernel init Stephen Boyd
2020-01-23 22:45 ` Brendan Higgins
2019-12-16 22:05 ` [RFC v1 5/6] kunit: test: add test plan to KUnit TAP format Brendan Higgins
2019-12-17 8:18 ` Stephen Boyd
2019-12-16 22:05 ` [RFC v1 6/6] kunit: Add 'kunit_shutdown' option Brendan Higgins
2019-12-17 8:06 ` Stephen Boyd
2020-01-23 22:56 ` Brendan Higgins
2020-01-06 22:40 ` [RFC v1 0/6] kunit: create a centralized executor to dispatch all KUnit tests Luis Chamberlain
2020-01-23 22:40 ` Brendan Higgins
2020-01-27 17:40 ` Frank Rowand
2020-01-28 7:19 ` Brendan Higgins
2020-01-28 18:36 ` Frank Rowand
2020-01-28 19:35 ` Tim.Bird
2020-01-28 19:53 ` Brendan Higgins
2020-01-29 4:24 ` Frank Rowand
2020-01-29 21:18 ` Brendan Higgins
2020-01-29 13:06 ` Alan Maguire
2020-01-29 21:28 ` Brendan Higgins
2020-03-02 19:45 ` Luis Chamberlain
2020-03-02 19:05 ` Luis Chamberlain
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=20191216220555.245089-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=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-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).