Skip to contentSkip to conversation

ASoC: cs-amp-lib-test: Don't select SND_SOC_CS_AMP_LIB

PATCH In review Richard Fitzgerald 2 participants 5 messages Apr 9, 2025 – Apr 14, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: cs-amp-lib-test: Don't select SND_SOC_CS_AMP_LIB

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")
---
 sound/soc/codecs/Kconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
sound/soc/codecs/Kconfig +2 -3
index 083e8db05b9f..3eb9af28b53a 100644
@@ -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.
Signature · 1 line
2.39.5
maintainer
#1 lore raw
Quoted 7 lines · Richard Fitzgerald

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

sound/soc/codecs/Kconfig config SND_SOC_CS_AMP_LIB · line 787

Quoted 9 lines
sound/soc/codecs/Kconfig +2 -3
-	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.

#2 lore raw
Quoted 7 lines · Mark Brown
Quoted 5 lines · Richard Fitzgerald

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.

Quoted 15 lines

sound/soc/codecs/Kconfig config SND_SOC_CS_AMP_LIB · line 787

Quoted 10 lines

config SND_SOC_CS_AMP_LIB_TEST

sound/soc/codecs/Kconfig +2 -3
-	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.

maintainer
#3 lore raw
Quoted 11 lines · Richard Fitzgerald
Quoted 4 lines · Mark Brown

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...

maintainer
#4 lore raw
In reply to Richard Fitzgerald
Quoted 8 lines · Richard Fitzgerald

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