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

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

[Thorsten Leemhuis]

On 04.10.24 21:00, Gabriel Krisman Bertazi wrote:
> Pedro Orlando <porlando@lkcamp.dev> 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>
>> ---
>>  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
> 
> This breaks compilation for me.
> 
> fs/unicode/tests/utf8_kunit.c:11:10: fatal error: utf8n.h: No such file or directory
>    11 | #include "utf8n.h"
>       |          ^~~~~~~~~

I encountered the same error when building -next using the Fedora
rawhide config today. Given that this patch landed in -next today I
suspect it might be due to this change, but I'm on the road and unable
to verify that right now.

Log:
https://download.copr.fedorainfracloud.org/results/@kernel-vanilla/next/fedora-rawhide-x86_64/08642966-next-next-all/builder-live.log.gz

Cioa, Thorsten

> After this patch that local header is now in the parent directory.
> 
> I'm building with:
> 
> CONFIG_UNICODE=m
> CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST=m
> 
>>  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
> 

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

[David Gow]

[-- Attachment #1: Type: text/plain, Size: 2388 bytes --]

On Wed, 12 Feb 2025 at 14:45, Thorsten Leemhuis <linux@leemhuis.info> wrote:
>
> On 04.10.24 21:00, Gabriel Krisman Bertazi wrote:
> > Pedro Orlando <porlando@lkcamp.dev> 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>
> >> ---
> >>  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
> >
> > This breaks compilation for me.
> >
> > fs/unicode/tests/utf8_kunit.c:11:10: fatal error: utf8n.h: No such file or directory
> >    11 | #include "utf8n.h"
> >       |          ^~~~~~~~~
>
> I encountered the same error when building -next using the Fedora
> rawhide config today. Given that this patch landed in -next today I
> suspect it might be due to this change, but I'm on the road and unable
> to verify that right now.
>
> Log:
> https://download.copr.fedorainfracloud.org/results/@kernel-vanilla/next/fedora-rawhide-x86_64/08642966-next-next-all/builder-live.log.gz
>
> Cioa, Thorsten
>

Hmm... this definitely seems like a problem, but I haven't been able
to reproduce it here (either under x86_64 or UML, both as a module and
built-in). The suggested fix of changing the path to "../utf8n.h"
doesn't seem to have broken it, though.

Cheers,
-- David

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 5294 bytes --]

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

[Kees Cook]

On Wed, Feb 12, 2025 at 05:31:59PM +0800, David Gow wrote:
> On Wed, 12 Feb 2025 at 14:45, Thorsten Leemhuis <linux@leemhuis.info> wrote:
> >
> > On 04.10.24 21:00, Gabriel Krisman Bertazi wrote:
> > > Pedro Orlando <porlando@lkcamp.dev> 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>
> > >> ---
> > >>  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
> > >
> > > This breaks compilation for me.
> > >
> > > fs/unicode/tests/utf8_kunit.c:11:10: fatal error: utf8n.h: No such file or directory
> > >    11 | #include "utf8n.h"
> > >       |          ^~~~~~~~~
> >
> > I encountered the same error when building -next using the Fedora
> > rawhide config today. Given that this patch landed in -next today I
> > suspect it might be due to this change, but I'm on the road and unable
> > to verify that right now.
> >
> > Log:
> > https://download.copr.fedorainfracloud.org/results/@kernel-vanilla/next/fedora-rawhide-x86_64/08642966-next-next-all/builder-live.log.gz
> >
> > Cioa, Thorsten
> >
> 
> Hmm... this definitely seems like a problem, but I haven't been able
> to reproduce it here (either under x86_64 or UML, both as a module and
> built-in). The suggested fix of changing the path to "../utf8n.h"
> doesn't seem to have broken it, though.

Thanks for the reports! I've squashed this path correction into my tree
and it should be fix in the next -next. :)

-Kees

-- 
Kees Cook

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

[Thorsten Leemhuis]

On 12.02.25 07:45, Thorsten Leemhuis wrote:
> On 04.10.24 21:00, Gabriel Krisman Bertazi wrote:
>> Pedro Orlando <porlando@lkcamp.dev> writes:
> [...]
>> This breaks compilation for me.
>>
>> fs/unicode/tests/utf8_kunit.c:11:10: fatal error: utf8n.h: No such file or directory
>>    11 | #include "utf8n.h"
>>       |          ^~~~~~~~~
> 
> I encountered the same error when building -next using the Fedora
> rawhide config today. Given that this patch landed in -next today I
> suspect it might be due to this change, but I'm on the road and unable
> to verify that right now.

Did that now and this patch was indeed the culprit, as reverting
be6f498e7391 ("unicode: kunit: change tests filename and path") from
-next fixed the build error for me.

Ciao, Thorsten

> Log:
> https://download.copr.fedorainfracloud.org/results/@kernel-vanilla/next/fedora-rawhide-x86_64/08642966-next-next-all/builder-live.log.gz
>
>> After this patch that local header is now in the parent directory.
>>
>> I'm building with:
>>
>> CONFIG_UNICODE=m
>> CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST=m
>>
>>>  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
>>
>