Re: [PATCH] kunit: fix Kconfig for build-in tests USB4 and Nitro Enclaves

"Paraschiv, Andra-Irina" <andraprs@xxxxxxxxxx> · Mon, 15 Aug 2022 08:44:42 +0300

On 11.08.2022 02:40, Nico Pache wrote:

Both the USB4 and Nitro Enclaves KUNIT tests are now able to be compiled
if KUNIT is compiled as a module. This leads to issues if KUNIT is being
packaged separately from the core kernel and when KUNIT is run baremetal
without the required driver compiled into the kernel.

Fixes: 635dcd16844b ("thunderbolt: test: Use kunit_test_suite() macro")
Fixes: fe5be808fa6c ("nitro_enclaves: test: Use kunit_test_suite() macro")
Signed-off-by: Nico Pache <npache@xxxxxxxxxx>
---
  drivers/thunderbolt/Kconfig         | 3 +--
  drivers/virt/nitro_enclaves/Kconfig | 2 +-
  2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig
index e76a6c173637..f12d0a3ee3e2 100644
--- a/drivers/thunderbolt/Kconfig
+++ b/drivers/thunderbolt/Kconfig
@@ -29,8 +29,7 @@ config USB4_DEBUGFS_WRITE

  config USB4_KUNIT_TEST
         bool "KUnit tests" if !KUNIT_ALL_TESTS
-       depends on (USB4=m || KUNIT=y)
-       depends on KUNIT
+       depends on USB4 && KUNIT=y
         default KUNIT_ALL_TESTS

  config USB4_DMA_TEST
diff --git a/drivers/virt/nitro_enclaves/Kconfig b/drivers/virt/nitro_enclaves/Kconfig
index ce91add81401..dc4d25c26256 100644
--- a/drivers/virt/nitro_enclaves/Kconfig
+++ b/drivers/virt/nitro_enclaves/Kconfig
@@ -17,7 +17,7 @@ config NITRO_ENCLAVES

  config NITRO_ENCLAVES_MISC_DEV_TEST
         bool "Tests for the misc device functionality of the Nitro Enclaves" if !KUNIT_ALL_TESTS
-       depends on NITRO_ENCLAVES && KUNIT
+       depends on NITRO_ENCLAVES && KUNIT=y
         default KUNIT_ALL_TESTS
         help
           Enable KUnit tests for the misc device functionality of the Nitro


For the Nitro Enclaves part:

Reviewed-by: Andra Paraschiv <andraprs@xxxxxxxxxx>

Thank you.

Andra

--
2.36.1




Amazon Development Center (Romania) S.R.L. registered office: 27A Sf. Lazar Street, UBC5, floor 2, Iasi, Iasi County, 700045, Romania. Registered in Romania. Registration number J22/2621/2005.







