| Message ID | 20211002022656.1681956-1-jk@codeconstruct.com.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,1/2] mctp: test: disallow MCTP_TEST when building as a module | expand |
| Context | Check | Description |
|---|---|---|
| netdev/apply | fail | Patch does not apply to net-next |
| netdev/tree_selection | success | Clearly marked for net-next |
On Sat, Oct 2, 2021 at 10:27 AM Jeremy Kerr <jk@codeconstruct.com.au> 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 <lkp@intel.com> > 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 <davidgow@google.com> -- David > 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 >
From: Jeremy Kerr <jk@codeconstruct.com.au> Date: Sat, 2 Oct 2021 10:26:55 +0800 > 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 <lkp@intel.com> > Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au> Jeremy I had to revert your entire series because of this. You will need rseubmit the entire series with this build failure fixed. Thasnk you.
Hi David, > Jeremy I had to revert your entire series because of this. > > You will need rseubmit the entire series with this build failure > fixed. OK, thanks for letting me know, apologies for the breakage. Looks like my MCTP=m pre-send check didn't end up enabling MCTP_TEST... v2 coming shortly. Cheers, Jeremy
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
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 <lkp@intel.com> Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au> --- net/mctp/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)