Per recently added KUnit style recommendations at
Documentation/dev-tools/kunit/style.rst, make the following changes to
the KCSAN test:

        1. Rename 'kcsan-test.c' to 'kcsan_test.c'.

        2. Rename suite name 'kcsan-test' to 'kcsan'.

        3. Rename CONFIG_KCSAN_TEST to CONFIG_KCSAN_KUNIT_TEST and
           default to KUNIT_ALL_TESTS.

Cc: David Gow <david...@google.com>
Signed-off-by: Marco Elver <el...@google.com>
---
 kernel/kcsan/Makefile                       | 4 ++--
 kernel/kcsan/{kcsan-test.c => kcsan_test.c} | 2 +-
 lib/Kconfig.kcsan                           | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename kernel/kcsan/{kcsan-test.c => kcsan_test.c} (99%)

diff --git a/kernel/kcsan/Makefile b/kernel/kcsan/Makefile
index 65ca5539c470..c2bb07f5bcc7 100644
--- a/kernel/kcsan/Makefile
+++ b/kernel/kcsan/Makefile
@@ -13,5 +13,5 @@ CFLAGS_core.o := $(call cc-option,-fno-conserve-stack) \
 obj-y := core.o debugfs.o report.o
 obj-$(CONFIG_KCSAN_SELFTEST) += selftest.o
 
-CFLAGS_kcsan-test.o := $(CFLAGS_KCSAN) -g -fno-omit-frame-pointer
-obj-$(CONFIG_KCSAN_TEST) += kcsan-test.o
+CFLAGS_kcsan_test.o := $(CFLAGS_KCSAN) -g -fno-omit-frame-pointer
+obj-$(CONFIG_KCSAN_KUNIT_TEST) += kcsan_test.o
diff --git a/kernel/kcsan/kcsan-test.c b/kernel/kcsan/kcsan_test.c
similarity index 99%
rename from kernel/kcsan/kcsan-test.c
rename to kernel/kcsan/kcsan_test.c
index ebe7fd245104..f16f632eb416 100644
--- a/kernel/kcsan/kcsan-test.c
+++ b/kernel/kcsan/kcsan_test.c
@@ -1156,7 +1156,7 @@ static void test_exit(struct kunit *test)
 }
 
 static struct kunit_suite kcsan_test_suite = {
-       .name = "kcsan-test",
+       .name = "kcsan",
        .test_cases = kcsan_test_cases,
        .init = test_init,
        .exit = test_exit,
diff --git a/lib/Kconfig.kcsan b/lib/Kconfig.kcsan
index f271ff5fbb5a..0440f373248e 100644
--- a/lib/Kconfig.kcsan
+++ b/lib/Kconfig.kcsan
@@ -69,8 +69,9 @@ config KCSAN_SELFTEST
          panic. Recommended to be enabled, ensuring critical functionality
          works as intended.
 
-config KCSAN_TEST
-       tristate "KCSAN test for integrated runtime behaviour"
+config KCSAN_KUNIT_TEST
+       tristate "KCSAN test for integrated runtime behaviour" if 
!KUNIT_ALL_TESTS
+       default KUNIT_ALL_TESTS
        depends on TRACEPOINTS && KUNIT
        select TORTURE_TEST
        help
-- 
2.30.0.284.gd98b1dd5eaa7-goog

Reply via email to