kunit: building kunit as a module breaks allmodconfig

kunit tests that do not support module build should depend
on KUNIT=y rather than just KUNIT in Kconfig, otherwise
they will trigger compilation errors for "make allmodconfig"
builds.

Fixes: 9fe124bf1b77 ("kunit: allow kunit to be loaded as a module")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index c3b3b5c0b0da71ac9e4be727efddf0bc7ee5f542..5f0bc74d2409a2c71e91d35403bb35f50e457abb 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -150,7 +150,7 @@ config DEBUG_TEST_DRIVER_REMOVE
 
 config PM_QOS_KUNIT_TEST
        bool "KUnit Test for PM QoS features"
-       depends on KUNIT
+       depends on KUNIT=y
 
 config HMEM_REPORTING
        bool

diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
index d54793073d1ca0a5638852390e5a002629c2ff8a..0fe336860773bbc14a6684d648e991233c6513a9 100644 (file)
--- a/security/apparmor/Kconfig
+++ b/security/apparmor/Kconfig
@@ -71,7 +71,7 @@ config SECURITY_APPARMOR_DEBUG_MESSAGES
 
 config SECURITY_APPARMOR_KUNIT_TEST
        bool "Build KUnit tests for policy_unpack.c"
-       depends on KUNIT && SECURITY_APPARMOR
+       depends on KUNIT=y && SECURITY_APPARMOR
        help
          This builds the AppArmor KUnit tests.