From 6d961aa91d468af8b41cbd7615a5fbbe0f69f516 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Fri, 8 Jan 2021 09:37:55 -0800 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_KUNIT Enable the KUNIT core, which has a small ABI impact, and also the DEBUGFS feature so that results can be reaped. This change does not actually enable any KUNIT tests or the internal selftests, those must be enabled by downstream builds. Bug: 176228452 Change-Id: I2817cb1495fe7bf0485e63f877a68b1971e26cc5 Signed-off-by: Alistair Delva --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 11052b5b8ce6..c257158aa1c8 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -604,4 +604,6 @@ CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_TRACE_MMIO_ACCESS=y +CONFIG_KUNIT=y +CONFIG_KUNIT_DEBUGFS=y # CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 330fbf1f253b..7dac823d480c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -540,3 +540,5 @@ CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_UNWINDER_FRAME_POINTER=y +CONFIG_KUNIT=y +CONFIG_KUNIT_DEBUGFS=y