On Sat, Oct 2, 2021 at 10:27 AM Jeremy Kerr [off-list ref] wrote:
The current kunit infrastructure defines its own module_init() when
built as a module, which conflicts with the mctp core's own.
So, only allow MCTP_TEST when both MCTP and KUNIT are built-in.
Reported-by: kernel test robot <redacted>
Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
---
This looks good to me. I don't think you'll be the only person to hit
this issue, so -- while it's probably overall nicer if tests can sit
in their own module -- we'll look into finding a way of supporting
this with KUnit at some point. In the meantime, though, this is a
reasonable workaround.
Reviewed-by: David Gow <redacted>
-- David
quoted hunk ↗ jump to hunk
net/mctp/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mctp/Kconfig b/net/mctp/Kconfig
index 15267a5043d9..868c92272cbd 100644
--- a/net/mctp/Kconfig
+++ b/net/mctp/Kconfig
@@ -13,6 +13,6 @@ menuconfig MCTP
channel.
config MCTP_TEST
- tristate "MCTP core tests" if !KUNIT_ALL_TESTS
- depends on MCTP && KUNIT
+ bool "MCTP core tests" if !KUNIT_ALL_TESTS
+ depends on MCTP=y && KUNIT=y
default KUNIT_ALL_TESTS
--2.30.2