Commit b6d99331 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-kunit-6.19-rc1' of... 

Merge tag 'linux_kselftest-kunit-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kunit updates from Shuah Khan:

 - Make filter parameters configurable via Kconfig

 - Add description of kunit.enable parameter to documentation

* tag 'linux_kselftest-kunit-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kunit: Make filter parameters configurable via Kconfig
  Documentation: kunit: add description of kunit.enable parameter
parents 2488655b 7bc16e72

Documentation/dev-tools/kunit/run_manual.rst

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ or be built into the kernel. 
	a good way of quickly testing everything applicable to the current

	config.



	KUnit can be enabled or disabled at boot time, and this behavior is

	controlled by the kunit.enable kernel parameter.

	By default, kunit.enable is set to 1 because KUNIT_DEFAULT_ENABLED is

	enabled by default. To ensure that tests are executed as expected,

	verify that kunit.enable=1 at boot time.



Once we have built our kernel (and/or modules), it is simple to run

the tests. If the tests are built-in, they will run automatically on the

kernel boot. The results will be written to the kernel log (``dmesg``)

lib/kunit/Kconfig

+24 −0
Original line number Diff line number Diff line
@@ -93,6 +93,30 @@ config KUNIT_AUTORUN_ENABLED 
	  In most cases this should be left as Y. Only if additional opt-in

	  behavior is needed should this be set to N.



config KUNIT_DEFAULT_FILTER_GLOB

	string "Default value of the filter_glob module parameter"

	help

	  Sets the default value of kunit.filter_glob. If set to a non-empty

	  string only matching tests are executed.



	  If unsure, leave empty so all tests are executed.



config KUNIT_DEFAULT_FILTER

	string "Default value of the filter module parameter"

	help

	  Sets the default value of kunit.filter. If set to a non-empty

	  string only matching tests are executed.



	  If unsure, leave empty so all tests are executed.



config KUNIT_DEFAULT_FILTER_ACTION

	string "Default value of the filter_action module parameter"

	help

	  Sets the default value of kunit.filter_action. If set to a non-empty

	  string only matching tests are executed.



	  If unsure, leave empty so all tests are executed.



config KUNIT_DEFAULT_TIMEOUT

	int "Default value of the timeout module parameter"

	default 300

lib/kunit/executor.c

+5 −3
Original line number Diff line number Diff line
@@ -45,9 +45,11 @@ bool kunit_autorun(void) 
	return autorun_param;

}



static char *filter_glob_param;

static char *filter_param;

static char *filter_action_param;

#define PARAM_FROM_CONFIG(config) (config[0] ? config : NULL)



static char *filter_glob_param = PARAM_FROM_CONFIG(CONFIG_KUNIT_DEFAULT_FILTER_GLOB);

static char *filter_param = PARAM_FROM_CONFIG(CONFIG_KUNIT_DEFAULT_FILTER);

static char *filter_action_param = PARAM_FROM_CONFIG(CONFIG_KUNIT_DEFAULT_FILTER_ACTION);



module_param_named(filter_glob, filter_glob_param, charp, 0600);

MODULE_PARM_DESC(filter_glob,