lkl: define LKL_CONFIG_KASAN_KUNIT_TEST and use for test

CONFIG_KASAN_KUNIT_TEST is a kernel specific build option, so expose it
via the arch config.h instead of the tools-generated lkl_autoconf.h.
Both LKL_HOST_CONFIG_KASAN and LKL_HOST_CONFIG_KASAN_KUNIT_TEST are now
unused so can be removed.

Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
David Disseldorp
2025-06-13 07:33:35 +02:00
parent ed768b65c9
commit 88a4280e01
3 changed files with 3 additions and 4 deletions

View File

@@ -68,6 +68,7 @@ core-y += arch/lkl/drivers/
configh-y = printf "/* this header is autogenerated */\n"
configh-$(CONFIG_64BIT) += && printf '\#define LKL_CONFIG_64BIT 1\n'
configh-$(CONFIG_CPU_BIG_ENDIAN) += && printf '\#define LKL_CONFIG_CPU_BIG_ENDIAN 1\n'
configh-$(CONFIG_KASAN_KUNIT_TEST) += && printf '\#define LKL_CONFIG_KASAN_KUNIT_TEST 1\n'
quiet_cmd_gen_configh = GEN $@
cmd_gen_configh = mkdir -p $(dir $@); ($(configh-y)) > $@

View File

@@ -111,14 +111,12 @@ define nt_host
endef
define kasan_test_enable
$(call set_autoconf_var,KASAN_TEST,y)
$(call set_kernel_config,KUNIT,y)
$(call set_kernel_config,BUILTIN_CMDLINE,\"kunit.filter_glob=\")
$(call set_kernel_config,KASAN_KUNIT_TEST,y)
endef
define kasan_enable
$(call set_autoconf_var,KASAN,y)
$(call set_kernel_config,KASAN,y)
$(if $(filter yes,$(kasan_test)), $(call kasan_test_enable))
endef

View File

@@ -555,7 +555,7 @@ static int lkl_test_join(void)
static const char *boot_log;
#ifdef LKL_HOST_CONFIG_KASAN_TEST
#ifdef LKL_CONFIG_KASAN_KUNIT_TEST
#define KASAN_CMD_LINE "kunit.filter_glob=kasan* "
@@ -707,7 +707,7 @@ struct lkl_test tests[] = {
LKL_TEST(semaphore),
LKL_TEST(join),
LKL_TEST(start_kernel),
#ifdef LKL_HOST_CONFIG_KASAN_TEST
#ifdef LKL_CONFIG_KASAN_KUNIT_TEST
LKL_TEST(kasan),
#endif
LKL_TEST(getpid),