staging: comedi: Add Kconfig options to build unit test modules

The comedi unit-test modules in "drivers/staging/comedi/drivers/tests/"
are built if the `CONFIG_COMEDI_TESTS` option is enabled, but the comedi
Kconfig file contains no code to enable the option.  Add config options
to allow each of the unit-test modules to be enabled individually.  The
"ni_route_tests" module depends on the "ni_routing" module, so select it
if the "ni_route_tests" module is configured to be built.

Cc: Spencer E. Olson <olsonse@umich.edu>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20210407181342.1117754-7-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 049b659..1fbc517 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -1319,4 +1319,37 @@ config COMEDI_NI_TIO
 config COMEDI_NI_ROUTING
        tristate
 
+config COMEDI_TESTS
+       tristate "Comedi unit tests"
+       help
+         Enable comedi unit-test modules to be built.
+
+         Note that the answer to this question won't directly affect the
+         kernel: saying N will just cause the configurator to skip all
+         the questions about comedi unit-test modules.
+
+if COMEDI_TESTS
+
+config COMEDI_TESTS_EXAMPLE
+       tristate "Comedi example unit-test module"
+       help
+         Enable support for an example unit-test module.  This is just a
+         silly example to be used as a basis for writing other unit-test
+         modules.
+
+         To compile this as a module, choose M here: the module will be called
+         comedi_example_test.
+
+config COMEDI_TESTS_NI_ROUTES
+       tristate "NI routing unit-test module"
+       select NI_ROUTING
+       help
+         Enable support for a unit-test module to test the signal routing
+         code used by comedi drivers for various National Instruments cards.
+
+         To compile this as a module, choose M here: the module will be called
+         ni_routes_test.
+
+endif # COMEDI_TESTS
+
 endif # COMEDI

diff --git a/drivers/staging/comedi/drivers/tests/Makefile b/drivers/staging/comedi/drivers/tests/Makefile
index a7883e4..5ff7cdc 100644 (file)
--- a/drivers/staging/comedi/drivers/tests/Makefile
+++ b/drivers/staging/comedi/drivers/tests/Makefile
@@ -3,6 +3,6 @@
 #
 ccflags-$(CONFIG_COMEDI_DEBUG)         := -DDEBUG
 
-obj-$(CONFIG_COMEDI_TESTS)             += comedi_example_test.o
-obj-$(CONFIG_COMEDI_TESTS)             += ni_routes_test.o
+obj-$(CONFIG_COMEDI_TESTS_EXAMPLE)     += comedi_example_test.o
+obj-$(CONFIG_COMEDI_TESTS_NI_ROUTES)   += ni_routes_test.o
 CFLAGS_ni_routes_test.o                        := -DDEBUG