Re: [PATCH v2 6/6] unicode: kunit: change tests filename and path

[Kees Cook <kees@kernel.org>]

On Wed, Feb 12, 2025 at 10:40:34AM -0500, Gabriel Krisman Bertazi wrote:
> Kees Cook <kees@kernel.org> writes:
> 
> > From: Gabriela Bittencourt <gbittencourt@lkcamp.dev>
> >
> > Change utf8 kunit test filename and path to follow the style
> > convention on Documentation/dev-tools/kunit/style.rst
> >
> > Co-developed-by: Pedro Orlando <porlando@lkcamp.dev>
> > Signed-off-by: Pedro Orlando <porlando@lkcamp.dev>
> > Co-developed-by: Danilo Pereira <dpereira@lkcamp.dev>
> > Signed-off-by: Danilo Pereira <dpereira@lkcamp.dev>
> > Signed-off-by: Gabriela Bittencourt <gbittencourt@lkcamp.dev>
> > Reviewed-by: David Gow <davidgow@google.com>
> > Acked-by: Gabriel Krisman Bertazi <krisman@suse.de>
> > Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
> > Reviewed-by: Rae Moar <rmoar@google.com>
> > Link: https://lore.kernel.org/r/20241202075545.3648096-7-davidgow@google.com
> > Signed-off-by: Kees Cook <kees@kernel.org>
> 
> Hi Kees,
> 
> Last time this was submitted, I have reported this patch breaks the
> build when the kunit is built as a module, and it wasn't fixed before
> resubmission.  Thorsten Leemhuis just reported the same issue is now on
> linux-next and I confirmed it is still there.
> 
> https://lore.kernel.org/lkml/2c26c5e4-9cf3-4020-b0be-637dc826b4e9@leemhuis.info/T/#m2e2ddb3b2600274e5eae50b93ea821914dc85f20
> 
> The build error is:
> 
> fs/unicode/tests/utf8_kunit.c:11:10: fatal error: utf8n.h: No such file or directory
>    11 | #include "utf8n.h"
>       |          ^~~~~~~~~
> 
> The problem is that the patch moves utf8_kunit.c into tests/ but doesn't
> fix the include line above.  Can you fix it in your tree since it is
> already merged?

Ah-ha! Thanks. Yes, I've updated this now.

-Kees

> 
> Thanks,
> 
> > ---
> >  fs/unicode/Makefile                                | 2 +-
> >  fs/unicode/{ => tests}/.kunitconfig                | 0
> >  fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} | 0
> >  3 files changed, 1 insertion(+), 1 deletion(-)
> >  rename fs/unicode/{ => tests}/.kunitconfig (100%)
> >  rename fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} (100%)
> >
> > diff --git a/fs/unicode/Makefile b/fs/unicode/Makefile
> > index 37bbcbc628a1..d95be7fb9f6b 100644
> > --- a/fs/unicode/Makefile
> > +++ b/fs/unicode/Makefile
> > @@ -4,7 +4,7 @@ ifneq ($(CONFIG_UNICODE),)
> >  obj-y			+= unicode.o
> >  endif
> >  obj-$(CONFIG_UNICODE)	+= utf8data.o
> > -obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += utf8-selftest.o
> > +obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += tests/utf8_kunit.o
> >  
> >  unicode-y := utf8-norm.o utf8-core.o
> >  
> > diff --git a/fs/unicode/.kunitconfig b/fs/unicode/tests/.kunitconfig
> > similarity index 100%
> > rename from fs/unicode/.kunitconfig
> > rename to fs/unicode/tests/.kunitconfig
> > diff --git a/fs/unicode/utf8-selftest.c b/fs/unicode/tests/utf8_kunit.c
> > similarity index 100%
> > rename from fs/unicode/utf8-selftest.c
> > rename to fs/unicode/tests/utf8_kunit.c
> 
> -- 
> Gabriel Krisman Bertazi

-- 
Kees Cook