Commit 29128da2 authored Aug 13, 2025 by Thomas Weißschuh Committed by Shuah Khan Aug 15, 2025

kunit: Always descend into kunit directory during build

For kbuild to properly clean up these build artifacts in the subdirectory,
even after CONFIG_KUNIT changed do disabled, the directory needs to be
processed always.

Pushing the special logic for hook.o into the kunit Makefile also makes the
logic easier to understand.

Link: https://lore.kernel.org/r/20250813-kunit-always-descend-v1-1-7bbd387ff13b@linutronix.de


Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

parent 8f5ae30d

lib/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -109,11 +109,7 @@ test_fpu-y := test_fpu_glue.o test_fpu_impl.o
		CFLAGS_test_fpu_impl.o += $(CC_FLAGS_FPU)
		CFLAGS_REMOVE_test_fpu_impl.o += $(CC_FLAGS_NO_FPU)

		# Some KUnit files (hooks.o) need to be built-in even when KUnit is a module,
		# so we can't just use obj-$(CONFIG_KUNIT).
		ifdef CONFIG_KUNIT
		obj-y += kunit/
		endif

		ifeq ($(CONFIG_DEBUG_KOBJECT),y)
		CFLAGS_kobject.o += -DDEBUG

lib/kunit/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ kunit-objs += debugfs.o
		endif

		# KUnit 'hooks' are built-in even when KUnit is built as a module.
		obj-y += hooks.o
		obj-$(if $(CONFIG_KUNIT),y) += hooks.o

		obj-$(CONFIG_KUNIT_TEST) += kunit-test.o
		obj-$(CONFIG_KUNIT_TEST) += platform-test.o