| Message ID | 20220621085345.603820-6-davidgow@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rework KUnit test execution in modules | expand |
On Tue, Jun 21, 2022 at 1:54 AM David Gow <davidgow@google.com> wrote: > > The kunit_test_suite() macro is no-longer incompatible with module_add, > so its use can be reinstated. > > Since this fixes parsing with builtins and kunit_tool, also enable the > test by default when KUNIT_ALL_TESTS is enabled. > > The test can now be run via kunit_tool with: > ./tools/testing/kunit/kunit.py run --arch=x86_64 \ > --kconfig_add CONFIG_OF=y --kconfig_add CONFIG_OF_ADDRESS=y \ > --kconfig_add CONFIG_MMC=y --kconfig_add CONFIG_MMC_SDHCI=y \ > --kconfig_add CONFIG_MMC_SDHCI_PLTFM=y \ > --kconfig_add CONFIG_MMC_SDHCI_OF_ASPEED=y \ > 'sdhci-of-aspeed' > > (It may be worth adding a .kunitconfig at some point, as there are > enough dependencies to make that command scarily long.) > > Signed-off-by: David Gow <davidgow@google.com> Acked-by: Daniel Latypov <dlatypov@google.com> Minor, optional suggestion below. > static int __init aspeed_sdc_init(void) > @@ -639,12 +620,6 @@ static int __init aspeed_sdc_init(void) > if (rc < 0) > goto cleanup_sdhci; > > - rc = aspeed_sdc_tests_init(); > - if (rc < 0) { > - platform_driver_unregister(&aspeed_sdc_driver); > - goto cleanup_sdhci; > - } > - > return 0; > > cleanup_sdhci: This goto was added in 4af307f57426 ("mmc: sdhci-of-aspeed: Fix kunit-related build error") to allow for this extra call to aspeed_sdc_tests_init(). This could now be reverted back to what is rc = platform_driver_register(&aspeed_sdc_driver); if (rc < 0) platform_driver_unregister(&aspeed_sdhci_driver); return rc; but let's see what the maintainers think.
On Wed, 22 Jun 2022 at 00:19, Daniel Latypov <dlatypov@google.com> wrote: > > On Tue, Jun 21, 2022 at 1:54 AM David Gow <davidgow@google.com> wrote: > > > > The kunit_test_suite() macro is no-longer incompatible with module_add, > > so its use can be reinstated. > > > > Since this fixes parsing with builtins and kunit_tool, also enable the > > test by default when KUNIT_ALL_TESTS is enabled. > > > > The test can now be run via kunit_tool with: > > ./tools/testing/kunit/kunit.py run --arch=x86_64 \ > > --kconfig_add CONFIG_OF=y --kconfig_add CONFIG_OF_ADDRESS=y \ > > --kconfig_add CONFIG_MMC=y --kconfig_add CONFIG_MMC_SDHCI=y \ > > --kconfig_add CONFIG_MMC_SDHCI_PLTFM=y \ > > --kconfig_add CONFIG_MMC_SDHCI_OF_ASPEED=y \ > > 'sdhci-of-aspeed' > > > > (It may be worth adding a .kunitconfig at some point, as there are > > enough dependencies to make that command scarily long.) > > > > Signed-off-by: David Gow <davidgow@google.com> > > Acked-by: Daniel Latypov <dlatypov@google.com> > > Minor, optional suggestion below. > > > static int __init aspeed_sdc_init(void) > > @@ -639,12 +620,6 @@ static int __init aspeed_sdc_init(void) > > if (rc < 0) > > goto cleanup_sdhci; > > > > - rc = aspeed_sdc_tests_init(); > > - if (rc < 0) { > > - platform_driver_unregister(&aspeed_sdc_driver); > > - goto cleanup_sdhci; > > - } > > - > > return 0; > > > > cleanup_sdhci: > > This goto was added in 4af307f57426 ("mmc: sdhci-of-aspeed: Fix > kunit-related build error") to allow for this extra call to > aspeed_sdc_tests_init(). > > This could now be reverted back to what is > rc = platform_driver_register(&aspeed_sdc_driver); > if (rc < 0) > platform_driver_unregister(&aspeed_sdhci_driver); > > return rc; > > but let's see what the maintainers think. I don't have a strong opinion on this, feel free to pick any of the options. Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index d6144978e32d..10c563999d3d 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -169,8 +169,9 @@ config MMC_SDHCI_OF_ASPEED If unsure, say N. config MMC_SDHCI_OF_ASPEED_TEST - bool "Tests for the ASPEED SDHCI driver" - depends on MMC_SDHCI_OF_ASPEED && KUNIT=y + bool "Tests for the ASPEED SDHCI driver" if !KUNIT_ALL_TESTS + depends on MMC_SDHCI_OF_ASPEED && KUNIT + default KUNIT_ALL_TESTS help Enable KUnit tests for the ASPEED SDHCI driver. Select this option only if you will boot the kernel for the purpose of running diff --git a/drivers/mmc/host/sdhci-of-aspeed-test.c b/drivers/mmc/host/sdhci-of-aspeed-test.c index 1ed4f86291f2..ecb502606c53 100644 --- a/drivers/mmc/host/sdhci-of-aspeed-test.c +++ b/drivers/mmc/host/sdhci-of-aspeed-test.c @@ -96,10 +96,4 @@ static struct kunit_suite aspeed_sdhci_test_suite = { .test_cases = aspeed_sdhci_test_cases, }; -static struct kunit_suite *aspeed_sdc_test_suite_array[] = { - &aspeed_sdhci_test_suite, - NULL, -}; - -static struct kunit_suite **aspeed_sdc_test_suites - __used __section(".kunit_test_suites") = aspeed_sdc_test_suite_array; +kunit_test_suite(aspeed_sdhci_test_suite); diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c index 6e4e132903a6..c10367946bc7 100644 --- a/drivers/mmc/host/sdhci-of-aspeed.c +++ b/drivers/mmc/host/sdhci-of-aspeed.c @@ -606,25 +606,6 @@ static struct platform_driver aspeed_sdc_driver = { #if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST) #include "sdhci-of-aspeed-test.c" - -static inline int aspeed_sdc_tests_init(void) -{ - return __kunit_test_suites_init(aspeed_sdc_test_suites); -} - -static inline void aspeed_sdc_tests_exit(void) -{ - __kunit_test_suites_exit(aspeed_sdc_test_suites); -} -#else -static inline int aspeed_sdc_tests_init(void) -{ - return 0; -} - -static inline void aspeed_sdc_tests_exit(void) -{ -} #endif static int __init aspeed_sdc_init(void) @@ -639,12 +620,6 @@ static int __init aspeed_sdc_init(void) if (rc < 0) goto cleanup_sdhci; - rc = aspeed_sdc_tests_init(); - if (rc < 0) { - platform_driver_unregister(&aspeed_sdc_driver); - goto cleanup_sdhci; - } - return 0; cleanup_sdhci: @@ -656,8 +631,6 @@ module_init(aspeed_sdc_init); static void __exit aspeed_sdc_exit(void) { - aspeed_sdc_tests_exit(); - platform_driver_unregister(&aspeed_sdc_driver); platform_driver_unregister(&aspeed_sdhci_driver); }
The kunit_test_suite() macro is no-longer incompatible with module_add, so its use can be reinstated. Since this fixes parsing with builtins and kunit_tool, also enable the test by default when KUNIT_ALL_TESTS is enabled. The test can now be run via kunit_tool with: ./tools/testing/kunit/kunit.py run --arch=x86_64 \ --kconfig_add CONFIG_OF=y --kconfig_add CONFIG_OF_ADDRESS=y \ --kconfig_add CONFIG_MMC=y --kconfig_add CONFIG_MMC_SDHCI=y \ --kconfig_add CONFIG_MMC_SDHCI_PLTFM=y \ --kconfig_add CONFIG_MMC_SDHCI_OF_ASPEED=y \ 'sdhci-of-aspeed' (It may be worth adding a .kunitconfig at some point, as there are enough dependencies to make that command scarily long.) Signed-off-by: David Gow <davidgow@google.com> --- No changes since v1: https://lore.kernel.org/linux-kselftest/20220618090310.1174932-6-davidgow@google.com/ --- drivers/mmc/host/Kconfig | 5 +++-- drivers/mmc/host/sdhci-of-aspeed-test.c | 8 +------- drivers/mmc/host/sdhci-of-aspeed.c | 27 ------------------------- 3 files changed, 4 insertions(+), 36 deletions(-)