| Message ID | 20190501230126.229218-7-brendanhiggins@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | kunit: introduce KUnit, the Linux kernel unit testing framework | expand |
On Thu, May 2, 2019 at 8:03 AM Brendan Higgins <brendanhiggins@google.com> wrote: > > Add KUnit to root Kconfig and Makefile allowing it to actually be built. > > Signed-off-by: Brendan Higgins <brendanhiggins@google.com> You need to make sure to not break git-bisect'abililty. With this commit, I see build error. CC kunit/test.o kunit/test.c:11:10: fatal error: os.h: No such file or directory #include <os.h> ^~~~~~ compilation terminated. make[1]: *** [scripts/Makefile.build;279: kunit/test.o] Error 1 make: *** [Makefile;1763: kunit/] Error 2 > --- > 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 2b99679148dc7..77368f498d84c 100644 > --- a/Makefile > +++ b/Makefile > @@ -969,7 +969,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.21.0.593.g511ec345e18-goog >
> On Thu, May 2, 2019 at 8:03 AM Brendan Higgins > <brendanhiggins@google.com> wrote: > > > > Add KUnit to root Kconfig and Makefile allowing it to actually be built. > > > > Signed-off-by: Brendan Higgins <brendanhiggins@google.com> > > You need to make sure > to not break git-bisect'abililty. > > > With this commit, I see build error. > > CC kunit/test.o > kunit/test.c:11:10: fatal error: os.h: No such file or directory > #include <os.h> > ^~~~~~ > compilation terminated. > make[1]: *** [scripts/Makefile.build;279: kunit/test.o] Error 1 > make: *** [Makefile;1763: kunit/] Error 2 Nice catch! That header shouldn't even be in there. Sorry about that. I will have it fixed in the next revision.
On Fri, May 10, 2019 at 7:27 PM Brendan Higgins <brendanhiggins@google.com> wrote: > > > On Thu, May 2, 2019 at 8:03 AM Brendan Higgins > > <brendanhiggins@google.com> wrote: > > > > > > Add KUnit to root Kconfig and Makefile allowing it to actually be built. > > > > > > Signed-off-by: Brendan Higgins <brendanhiggins@google.com> > > > > You need to make sure > > to not break git-bisect'abililty. > > > > > > With this commit, I see build error. > > > > CC kunit/test.o > > kunit/test.c:11:10: fatal error: os.h: No such file or directory > > #include <os.h> > > ^~~~~~ > > compilation terminated. > > make[1]: *** [scripts/Makefile.build;279: kunit/test.o] Error 1 > > make: *** [Makefile;1763: kunit/] Error 2 > > Nice catch! That header shouldn't even be in there. > > Sorry about that. I will have it fixed in the next revision. BTW, I applied whole of this series to my kernel.org repository. 0day bot started to report issues. I hope several reports reached you, and they are useful to fix your code.
> On Fri, May 10, 2019 at 7:27 PM Brendan Higgins > <brendanhiggins@google.com> wrote: > > > > > On Thu, May 2, 2019 at 8:03 AM Brendan Higgins > > > <brendanhiggins@google.com> wrote: > > > > > > > > Add KUnit to root Kconfig and Makefile allowing it to actually be built. > > > > > > > > Signed-off-by: Brendan Higgins <brendanhiggins@google.com> > > > > > > You need to make sure > > > to not break git-bisect'abililty. > > > > > > > > > With this commit, I see build error. > > > > > > CC kunit/test.o > > > kunit/test.c:11:10: fatal error: os.h: No such file or directory > > > #include <os.h> > > > ^~~~~~ > > > compilation terminated. > > > make[1]: *** [scripts/Makefile.build;279: kunit/test.o] Error 1 > > > make: *** [Makefile;1763: kunit/] Error 2 > > > > Nice catch! That header shouldn't even be in there. > > > > Sorry about that. I will have it fixed in the next revision. > > > BTW, I applied whole of this series > to my kernel.org repository. > > 0day bot started to report issues. > I hope several reports reached you, > and they are useful to fix your code. Yep, I have received several. They are very helpful. I greatly appreciate it. Thanks!
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 2b99679148dc7..77368f498d84c 100644 --- a/Makefile +++ b/Makefile @@ -969,7 +969,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) \
Add KUnit to root Kconfig and Makefile allowing it to actually be built. Signed-off-by: Brendan Higgins <brendanhiggins@google.com> --- Kconfig | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)