Commit 6234806f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-kunit-fixes-6.0-rc3' of... 

Merge tag 'linux-kselftest-kunit-fixes-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull KUnit fixes from Shuah Khan:
 "Fix for a mmc test and to load .kunit_test_suites section when
  CONFIG_KUNIT=m, and not just when KUnit is built-in"

* tag 'linux-kselftest-kunit-fixes-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  module: kunit: Load .kunit_test_suites section when CONFIG_KUNIT=m
  mmc: sdhci-of-aspeed: test: Fix dependencies when KUNIT=m
parents 3ee3d984 41a55567

drivers/mmc/host/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ config MMC_SDHCI_OF_ASPEED 
config MMC_SDHCI_OF_ASPEED_TEST

	bool "Tests for the ASPEED SDHCI driver" if !KUNIT_ALL_TESTS

	depends on MMC_SDHCI_OF_ASPEED && KUNIT

	depends on (MMC_SDHCI_OF_ASPEED=m || KUNIT=y)

	default KUNIT_ALL_TESTS

	help

	  Enable KUnit tests for the ASPEED SDHCI driver. Select this

kernel/module/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ static int find_module_sections(struct module *mod, struct load_info *info) 
					      sizeof(*mod->static_call_sites),

					      &mod->num_static_call_sites);

#endif

#ifdef CONFIG_KUNIT

#if IS_ENABLED(CONFIG_KUNIT)

	mod->kunit_suites = section_objs(info, ".kunit_test_suites",

					      sizeof(*mod->kunit_suites),

					      &mod->num_kunit_suites);