Commit fe678fed authored Sep 29, 2021 by Daniel Latypov Committed by Shuah Khan Oct 19, 2021

kunit: tool: show list of valid --arch options when invalid



Consider this attempt to run KUnit in QEMU:
$ ./tools/testing/kunit/kunit.py run --arch=x86

Before you'd get this error message:
kunit_kernel.ConfigError: x86 is not a valid arch

After:
kunit_kernel.ConfigError: x86 is not a valid arch, options are ['alpha', 'arm', 'arm64', 'i386', 'powerpc', 'riscv', 's390', 'sparc', 'x86_64']

This should make it a bit easier for people to notice when they make
typos, etc. Currently, one would have to dive into the python code to
figure out what the valid set is.

Signed-off-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

parent a54ea2e0

tools/testing/kunit/kunit_kernel.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -198,8 +198,9 @@ def get_source_tree_ops(arch: str, cross_compile: Optional[str]) -> LinuxSourceT
		return LinuxSourceTreeOperationsUml(cross_compile=cross_compile)
		elif os.path.isfile(config_path):
		return get_source_tree_ops_from_qemu_config(config_path, cross_compile)[1]
		else:
		raise ConfigError(arch + ' is not a valid arch')

		options = [f[:-3] for f in os.listdir(QEMU_CONFIGS_DIR) if f.endswith('.py')]
		raise ConfigError(arch + ' is not a valid arch, options are ' + str(sorted(options)))

		def get_source_tree_ops_from_qemu_config(config_path: str,
		cross_compile: Optional[str]) -> Tuple[

tools/testing/kunit/kunit_tool_test.py

+4 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,10 @@ class LinuxSourceTreeTest(unittest.TestCase):
		pass
		kunit_kernel.LinuxSourceTree('', kunitconfig_path=dir)

		def test_invalid_arch(self):
		with self.assertRaisesRegex(kunit_kernel.ConfigError, 'not a valid arch, options are.*x86_64'):
		kunit_kernel.LinuxSourceTree('', arch='invalid')

		# TODO: add more test cases.