Skip to content

Commit

Permalink
kcsan: Make test follow KUnit style recommendations
Browse files Browse the repository at this point in the history
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.

Reviewed-by: David Gow <[email protected]>
Signed-off-by: Marco Elver <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>
  • Loading branch information
melver authored and paulmckrcu committed Mar 8, 2021
1 parent e36299e commit a146fed
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions kernel/kcsan/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion kernel/kcsan/kcsan-test.c → kernel/kcsan/kcsan_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions lib/Kconfig.kcsan
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a146fed

Please sign in to comment.