On Tue, Jul 9, 2019 at 3:34 PM Brendan Higgins <brendanhiggins@xxxxxxxxxx> wrote: > > KUnit is a new unit testing framework for the kernel and when used is > built into the kernel as a part of it. Add KUnit to the root Kconfig and > Makefile to allow it to be actually built. > > Signed-off-by: Brendan Higgins <brendanhiggins@xxxxxxxxxx> > Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> > Cc: Michal Marek <michal.lkml@xxxxxxxxxxx> > Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Reviewed-by: Logan Gunthorpe <logang@xxxxxxxxxxxx> > --- > Kconfig | 2 ++ > Makefile | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Kconfig b/Kconfig > index 48a80beab6853..10428501edb78 100644 > --- a/Kconfig > +++ b/Kconfig > @@ -30,3 +30,5 @@ source "crypto/Kconfig" > source "lib/Kconfig" > > source "lib/Kconfig.debug" > + > +source "kunit/Kconfig" > diff --git a/Makefile b/Makefile > index 3e4868a6498b2..60cf4f0813e0d 100644 > --- a/Makefile > +++ b/Makefile > @@ -991,7 +991,7 @@ endif > PHONY += prepare0 > > ifeq ($(KBUILD_EXTMOD),) > -core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ > +core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ kunit/ > > vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ > $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ > -- > 2.22.0.410.gd8fdbe21b5-goog This is so trivial, and do not need to get ack from me. Just a nit. When CONFIG_KUNIT is disable, is there any point in descending into kunit/ ? core-$(CONFIG_KUNIT) += kunit/ ... might be useful to skip kunit/ entirely. If you look at the top-level Makefile, some entries are doing this: init-y := init/ drivers-y := drivers/ sound/ drivers-$(CONFIG_SAMPLES) += samples/ drivers-$(CONFIG_KERNEL_HEADER_TEST) += include/ net-y := net/ libs-y := lib/ core-y := usr/ -- Best Regards Masahiro Yamada
