Merge tag 'linux-kselftest-kunit-5.6-rc4' of... (b98cce1e) · Commits · 戴 / test

Documentation/dev-tools/kunit/usage.rst

+1 −0

Original line number	Diff line number	Diff line
		@@ -551,6 +551,7 @@ options to your ``.config``:
		Once the kernel is built and installed, a simple

		.. code-block:: bash

		modprobe example-test

		...will run the tests.

tools/testing/kunit/kunit.py

+12 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ KunitResult = namedtuple('KunitResult', ['status','result'])

		KunitRequest = namedtuple('KunitRequest', ['raw_output','timeout', 'jobs', 'build_dir', 'defconfig'])

		KernelDirectoryPath = sys.argv[0].split('tools/testing/kunit/')[0]

		class KunitStatus(Enum):
		SUCCESS = auto()
		CONFIG_FAILURE = auto()
		@@ -35,6 +37,13 @@ def create_default_kunitconfig():
		shutil.copyfile('arch/um/configs/kunit_defconfig',
		kunit_kernel.kunitconfig_path)

		def get_kernel_root_path():
		parts = sys.argv[0] if not __file__ else __file__
		parts = os.path.realpath(parts).split('tools/testing/kunit')
		if len(parts) != 2:
		sys.exit(1)
		return parts[0]

		def run_tests(linux: kunit_kernel.LinuxSourceTree,
		request: KunitRequest) -> KunitResult:
		config_start = time.time()
		@@ -114,6 +123,9 @@ def main(argv, linux=None):
		cli_args = parser.parse_args(argv)

		if cli_args.subcommand == 'run':
		if get_kernel_root_path():
		os.chdir(get_kernel_root_path())

		if cli_args.build_dir:
		if not os.path.exists(cli_args.build_dir):
		os.mkdir(cli_args.build_dir)

tools/testing/kunit/kunit_kernel.py

+16 −12

Original line number	Diff line number	Diff line
		@@ -93,6 +93,20 @@ class LinuxSourceTree(object):
		return False
		return True

		def validate_config(self, build_dir):
		kconfig_path = get_kconfig_path(build_dir)
		validated_kconfig = kunit_config.Kconfig()
		validated_kconfig.read_from_file(kconfig_path)
		if not self._kconfig.is_subset_of(validated_kconfig):
		invalid = self._kconfig.entries() - validated_kconfig.entries()
		message = 'Provided Kconfig is not contained in validated .config. Following fields found in kunitconfig, ' \
		'but not in .config: %s' % (
		', '.join([str(e) for e in invalid])
		)
		logging.error(message)
		return False
		return True

		def build_config(self, build_dir):
		kconfig_path = get_kconfig_path(build_dir)
		if build_dir and not os.path.exists(build_dir):
		@@ -103,12 +117,7 @@ class LinuxSourceTree(object):
		except ConfigError as e:
		logging.error(e)
		return False
		validated_kconfig = kunit_config.Kconfig()
		validated_kconfig.read_from_file(kconfig_path)
		if not self._kconfig.is_subset_of(validated_kconfig):
		logging.error('Provided Kconfig is not contained in validated .config!')
		return False
		return True
		return self.validate_config(build_dir)

		def build_reconfig(self, build_dir):
		"""Creates a new .config if it is not a subset of the .kunitconfig."""
		@@ -133,12 +142,7 @@ class LinuxSourceTree(object):
		except (ConfigError, BuildError) as e:
		logging.error(e)
		return False
		used_kconfig = kunit_config.Kconfig()
		used_kconfig.read_from_file(get_kconfig_path(build_dir))
		if not self._kconfig.is_subset_of(used_kconfig):
		logging.error('Provided Kconfig is not contained in final config!')
		return False
		return True
		return self.validate_config(build_dir)

		def run_kernel(self, args=[], timeout=None, build_dir=''):
		args.extend(['mem=256M'])

Admin message