Depend on SND_SOC_CS_AMP_LIB instead of selecting it.

KUNIT_ALL_TESTS should only build tests for components that are
already being built, it should not cause other stuff to be added
to the build.

Fixes: 177862317a98 ("ASoC: cs-amp-lib: Add KUnit test for calibration helpers")
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
 sound/soc/codecs/Kconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 083e8db05b9f..3eb9af28b53a 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -779,10 +779,9 @@ config SND_SOC_CS_AMP_LIB
 	tristate
 
 config SND_SOC_CS_AMP_LIB_TEST
-	tristate "KUnit test for Cirrus Logic cs-amp-lib"
-	depends on KUNIT
+	tristate "KUnit test for Cirrus Logic cs-amp-lib" if !KUNIT_ALL_TESTS
+	depends on SND_SOC_CS_AMP_LIB && KUNIT
 	default KUNIT_ALL_TESTS
-	select SND_SOC_CS_AMP_LIB
 	help
 	  This builds KUnit tests for the Cirrus Logic common
 	  amplifier library.
-- 
2.39.5

On Wed, 09 Apr 2025 11:45:44 +0100, Richard Fitzgerald wrote:
> Depend on SND_SOC_CS_AMP_LIB instead of selecting it.
> 
> KUNIT_ALL_TESTS should only build tests for components that are
> already being built, it should not cause other stuff to be added
> to the build.
> 
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: cs-amp-lib-test: Don't select SND_SOC_CS_AMP_LIB
      commit: 96014d91cffb335d3b396771524ff2aba3549865

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

On Wed, Apr 09, 2025 at 11:45:44AM +0100, Richard Fitzgerald wrote:
> Depend on SND_SOC_CS_AMP_LIB instead of selecting it.
> 
> KUNIT_ALL_TESTS should only build tests for components that are
> already being built, it should not cause other stuff to be added
> to the build.

>  config SND_SOC_CS_AMP_LIB_TEST
> -	tristate "KUnit test for Cirrus Logic cs-amp-lib"
> -	depends on KUNIT
> +	tristate "KUnit test for Cirrus Logic cs-amp-lib" if !KUNIT_ALL_TESTS
> +	depends on SND_SOC_CS_AMP_LIB && KUNIT
>  	default KUNIT_ALL_TESTS
> -	select SND_SOC_CS_AMP_LIB
>  	help
>  	  This builds KUnit tests for the Cirrus Logic common
>  	  amplifier library.

This by itself results in the Cirrus tests being removed from a kunit
--alltests run which is a regression in coverage.  I'd expect to see
some corresponding updates in the KUnit all_tests.config to keep them
enabled.

On 09/04/2025 3:24 pm, Mark Brown wrote:
> On Wed, Apr 09, 2025 at 11:45:44AM +0100, Richard Fitzgerald wrote:
>> Depend on SND_SOC_CS_AMP_LIB instead of selecting it.
>>
>> KUNIT_ALL_TESTS should only build tests for components that are
>> already being built, it should not cause other stuff to be added
>> to the build.
> 
>>   config SND_SOC_CS_AMP_LIB_TEST
>> -	tristate "KUnit test for Cirrus Logic cs-amp-lib"
>> -	depends on KUNIT
>> +	tristate "KUnit test for Cirrus Logic cs-amp-lib" if !KUNIT_ALL_TESTS
>> +	depends on SND_SOC_CS_AMP_LIB && KUNIT
>>   	default KUNIT_ALL_TESTS
>> -	select SND_SOC_CS_AMP_LIB
>>   	help
>>   	  This builds KUnit tests for the Cirrus Logic common
>>   	  amplifier library.
> 
> This by itself results in the Cirrus tests being removed from a kunit
> --alltests run which is a regression in coverage.  I'd expect to see
> some corresponding updates in the KUnit all_tests.config to keep them
> enabled.

That's the defined behaviour of KUNIT_ALL_TESTS. It shouldn't have been
running as part of an alltests if nothing had selected it. That seems to
make people angry. Probably the same people who would complain if there
was a bug in the code that they didn't want to test.

On Wed, Apr 09, 2025 at 03:34:27PM +0100, Richard Fitzgerald wrote:
> On 09/04/2025 3:24 pm, Mark Brown wrote:

> > This by itself results in the Cirrus tests being removed from a kunit
> > --alltests run which is a regression in coverage.  I'd expect to see
> > some corresponding updates in the KUnit all_tests.config to keep them
> > enabled.

> That's the defined behaviour of KUNIT_ALL_TESTS. It shouldn't have been
> running as part of an alltests if nothing had selected it. That seems to
> make people angry. Probably the same people who would complain if there
> was a bug in the code that they didn't want to test.

Hence the updates to all_tests.config...