2020-11-23 14:15:33 +00:00
|
|
|
#!/usr/bin/env python3
|
2019-09-23 09:02:43 +00:00
|
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
#
|
|
|
|
# A thin wrapper on top of the KUnit Kernel
|
|
|
|
#
|
|
|
|
# Copyright (C) 2019, Google LLC.
|
|
|
|
# Author: Felix Guo <felixguoxiuping@gmail.com>
|
|
|
|
# Author: Brendan Higgins <brendanhiggins@google.com>
|
|
|
|
|
|
|
|
import argparse
|
|
|
|
import sys
|
|
|
|
import os
|
|
|
|
import time
|
|
|
|
|
2021-07-12 19:52:58 +00:00
|
|
|
assert sys.version_info >= (3, 7), "Python version is too old"
|
|
|
|
|
2019-09-23 09:02:43 +00:00
|
|
|
from collections import namedtuple
|
|
|
|
from enum import Enum, auto
|
2021-09-22 16:39:21 +00:00
|
|
|
from typing import Iterable, Sequence
|
2019-09-23 09:02:43 +00:00
|
|
|
|
2020-08-11 21:27:56 +00:00
|
|
|
import kunit_json
|
2019-09-23 09:02:43 +00:00
|
|
|
import kunit_kernel
|
|
|
|
import kunit_parser
|
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
KunitResult = namedtuple('KunitResult', ['status','result','elapsed_time'])
|
2019-09-23 09:02:43 +00:00
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
KunitConfigRequest = namedtuple('KunitConfigRequest',
|
kunit: Fix TabError, remove defconfig code and handle when there is no kunitconfig
The identation before this code
(`if not os.path.exists(cli_args.build_dir):``)
was with spaces instead of tabs after fixed up merge conflits,
this commit revert spaces to tabs:
[iha@bbking linux]$ tools/testing/kunit/kunit.py run
File "tools/testing/kunit/kunit.py", line 247
if not linux:
^
TabError: inconsistent use of tabs and spaces in indentation
[iha@bbking linux]$ tools/testing/kunit/kunit.py run
Traceback (most recent call last):
File "tools/testing/kunit/kunit.py", line 338, in <module>
main(sys.argv[1:])
File "tools/testing/kunit/kunit.py", line 215, in main
add_config_opts(config_parser)
[iha@bbking linux]$ tools/testing/kunit/kunit.py run
Traceback (most recent call last):
File "tools/testing/kunit/kunit.py", line 337, in <module>
main(sys.argv[1:])
File "tools/testing/kunit/kunit.py", line 255, in main
result = run_tests(linux, request)
File "tools/testing/kunit/kunit.py", line 133, in run_tests
request.defconfig,
AttributeError: 'KunitRequest' object has no attribute 'defconfig'
Handles when there is no .kunitconfig, the error due to merge conflicts
between the following:
commit 9bdf64b35117 ("kunit: use KUnit defconfig by default")
commit 45ba7a893ad8 ("kunit: kunit_tool: Separate out
config/build/exec/parse")
[iha@bbking linux]$ tools/testing/kunit/kunit.py run
Traceback (most recent call last):
File "tools/testing/kunit/kunit.py", line 335, in <module>
main(sys.argv[1:])
File "tools/testing/kunit/kunit.py", line 246, in main
linux = kunit_kernel.LinuxSourceTree()
File "../tools/testing/kunit/kunit_kernel.py", line 109, in __init__
self._kconfig.read_from_file(kunitconfig_path)
File "t../ools/testing/kunit/kunit_config.py", line 88, in read_from_file
with open(path, 'r') as f:
FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
Signed-off-by: Vitor Massaru Iha <vitor@massaru.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
2020-05-29 19:28:45 +00:00
|
|
|
['build_dir', 'make_options'])
|
2020-05-01 04:27:01 +00:00
|
|
|
KunitBuildRequest = namedtuple('KunitBuildRequest',
|
|
|
|
['jobs', 'build_dir', 'alltests',
|
|
|
|
'make_options'])
|
|
|
|
KunitExecRequest = namedtuple('KunitExecRequest',
|
2021-07-15 16:08:19 +00:00
|
|
|
['timeout', 'build_dir', 'alltests',
|
|
|
|
'filter_glob', 'kernel_args'])
|
2020-05-01 04:27:01 +00:00
|
|
|
KunitParseRequest = namedtuple('KunitParseRequest',
|
2021-09-30 22:20:46 +00:00
|
|
|
['raw_output', 'build_dir', 'json'])
|
2020-03-16 20:21:25 +00:00
|
|
|
KunitRequest = namedtuple('KunitRequest', ['raw_output','timeout', 'jobs',
|
2021-02-06 00:08:53 +00:00
|
|
|
'build_dir', 'alltests', 'filter_glob',
|
2021-07-15 16:08:19 +00:00
|
|
|
'kernel_args', 'json', 'make_options'])
|
2019-09-23 09:02:43 +00:00
|
|
|
|
2020-02-18 22:19:16 +00:00
|
|
|
KernelDirectoryPath = sys.argv[0].split('tools/testing/kunit/')[0]
|
|
|
|
|
2019-09-23 09:02:43 +00:00
|
|
|
class KunitStatus(Enum):
|
|
|
|
SUCCESS = auto()
|
|
|
|
CONFIG_FAILURE = auto()
|
|
|
|
BUILD_FAILURE = auto()
|
|
|
|
TEST_FAILURE = auto()
|
|
|
|
|
2021-01-15 00:39:11 +00:00
|
|
|
def get_kernel_root_path() -> str:
|
|
|
|
path = sys.argv[0] if not __file__ else __file__
|
|
|
|
parts = os.path.realpath(path).split('tools/testing/kunit')
|
2020-02-18 22:19:16 +00:00
|
|
|
if len(parts) != 2:
|
|
|
|
sys.exit(1)
|
|
|
|
return parts[0]
|
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
def config_tests(linux: kunit_kernel.LinuxSourceTree,
|
|
|
|
request: KunitConfigRequest) -> KunitResult:
|
|
|
|
kunit_parser.print_with_timestamp('Configuring KUnit Kernel ...')
|
|
|
|
|
2019-09-23 09:02:43 +00:00
|
|
|
config_start = time.time()
|
2020-03-23 19:04:59 +00:00
|
|
|
success = linux.build_reconfig(request.build_dir, request.make_options)
|
2019-09-23 09:02:43 +00:00
|
|
|
config_end = time.time()
|
|
|
|
if not success:
|
2020-05-01 04:27:01 +00:00
|
|
|
return KunitResult(KunitStatus.CONFIG_FAILURE,
|
|
|
|
'could not configure kernel',
|
|
|
|
config_end - config_start)
|
|
|
|
return KunitResult(KunitStatus.SUCCESS,
|
|
|
|
'configured kernel successfully',
|
|
|
|
config_end - config_start)
|
2019-09-23 09:02:43 +00:00
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
def build_tests(linux: kunit_kernel.LinuxSourceTree,
|
|
|
|
request: KunitBuildRequest) -> KunitResult:
|
2019-09-23 09:02:43 +00:00
|
|
|
kunit_parser.print_with_timestamp('Building KUnit Kernel ...')
|
|
|
|
|
|
|
|
build_start = time.time()
|
2021-05-26 21:24:06 +00:00
|
|
|
success = linux.build_kernel(request.alltests,
|
|
|
|
request.jobs,
|
|
|
|
request.build_dir,
|
|
|
|
request.make_options)
|
2019-09-23 09:02:43 +00:00
|
|
|
build_end = time.time()
|
|
|
|
if not success:
|
2020-06-16 06:47:30 +00:00
|
|
|
return KunitResult(KunitStatus.BUILD_FAILURE,
|
|
|
|
'could not build kernel',
|
|
|
|
build_end - build_start)
|
2020-05-01 04:27:01 +00:00
|
|
|
if not success:
|
|
|
|
return KunitResult(KunitStatus.BUILD_FAILURE,
|
|
|
|
'could not build kernel',
|
|
|
|
build_end - build_start)
|
|
|
|
return KunitResult(KunitStatus.SUCCESS,
|
|
|
|
'built kernel successfully',
|
|
|
|
build_end - build_start)
|
2019-09-23 09:02:43 +00:00
|
|
|
|
2021-09-30 22:20:46 +00:00
|
|
|
def exec_tests(linux: kunit_kernel.LinuxSourceTree, request: KunitExecRequest,
|
|
|
|
parse_request: KunitParseRequest) -> KunitResult:
|
2019-09-23 09:02:43 +00:00
|
|
|
kunit_parser.print_with_timestamp('Starting KUnit Kernel ...')
|
|
|
|
test_start = time.time()
|
2021-09-30 22:20:46 +00:00
|
|
|
run_result = linux.run_kernel(
|
2021-07-15 16:08:19 +00:00
|
|
|
args=request.kernel_args,
|
2020-03-16 20:21:25 +00:00
|
|
|
timeout=None if request.alltests else request.timeout,
|
2021-09-30 22:20:46 +00:00
|
|
|
filter_glob=request.filter_glob,
|
2020-03-16 20:21:25 +00:00
|
|
|
build_dir=request.build_dir)
|
2020-05-01 04:27:01 +00:00
|
|
|
|
kunit: tool: actually track how long it took to run tests
This is a long standing bug in kunit tool.
Since these files were added, run_kernel() has always yielded lines.
That means, the call to run_kernel() returns before the kernel finishes
executing tests, potentially before a single line of output is even
produced.
So code like this
time_start = time.time()
result = linux.run_kernel(...)
time_end = time.time()
would only measure the time taken for python to give back the generator
object.
From a caller's perspective, the only way to know the kernel has exited
is for us to consume all the output from the `result` generator object.
Alternatively, we could change run_kernel() to try and do its own book
keeping and return the total time, but that doesn't seem worth it.
This change makes us record `time_end` after we're done parsing all the
output (which should mean we've consumed all of it, or errored out).
That means we're including in the parsing time as well, but that should
be quite small, and it's better than claiming it took 0s to run tests.
Let's use this as an example:
$ ./tools/testing/kunit/kunit.py run --kunitconfig=lib/kunit example
Before:
Elapsed time: 7.684s total, 0.001s configuring, 4.692s building, 0.000s running
After:
Elapsed time: 6.283s total, 0.001s configuring, 3.202s building, 3.079s running
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>
2021-09-30 22:20:47 +00:00
|
|
|
result = parse_tests(parse_request, run_result)
|
|
|
|
|
|
|
|
# run_kernel() doesn't block on the kernel exiting.
|
|
|
|
# That only happens after we get the last line of output from `run_result`.
|
|
|
|
# So exec_time here actually contains parsing + execution time, which is fine.
|
2020-05-01 04:27:01 +00:00
|
|
|
test_end = time.time()
|
2021-09-30 22:20:46 +00:00
|
|
|
exec_time = test_end - test_start
|
2020-05-01 04:27:01 +00:00
|
|
|
|
2021-09-30 22:20:46 +00:00
|
|
|
return KunitResult(status=result.status, result=result.result, elapsed_time=exec_time)
|
2020-05-01 04:27:01 +00:00
|
|
|
|
2021-09-30 22:20:46 +00:00
|
|
|
def parse_tests(request: KunitParseRequest, input_data: Iterable[str]) -> KunitResult:
|
2020-05-01 04:27:01 +00:00
|
|
|
parse_start = time.time()
|
|
|
|
|
|
|
|
test_result = kunit_parser.TestResult(kunit_parser.TestStatus.SUCCESS,
|
|
|
|
[],
|
|
|
|
'Tests not Parsed.')
|
2020-08-11 21:27:56 +00:00
|
|
|
|
2019-09-23 09:02:43 +00:00
|
|
|
if request.raw_output:
|
2021-09-30 22:20:46 +00:00
|
|
|
output: Iterable[str] = input_data
|
2021-08-05 23:51:44 +00:00
|
|
|
if request.raw_output == 'all':
|
|
|
|
pass
|
|
|
|
elif request.raw_output == 'kunit':
|
|
|
|
output = kunit_parser.extract_tap_lines(output)
|
|
|
|
else:
|
|
|
|
print(f'Unknown --raw_output option "{request.raw_output}"', file=sys.stderr)
|
|
|
|
for line in output:
|
|
|
|
print(line.rstrip())
|
|
|
|
|
2019-09-23 09:02:43 +00:00
|
|
|
else:
|
2021-09-30 22:20:46 +00:00
|
|
|
test_result = kunit_parser.parse_run_tests(input_data)
|
2020-05-01 04:27:01 +00:00
|
|
|
parse_end = time.time()
|
|
|
|
|
2020-08-11 21:27:56 +00:00
|
|
|
if request.json:
|
|
|
|
json_obj = kunit_json.get_json_result(
|
|
|
|
test_result=test_result,
|
|
|
|
def_config='kunit_defconfig',
|
|
|
|
build_dir=request.build_dir,
|
|
|
|
json_path=request.json)
|
|
|
|
if request.json == 'stdout':
|
|
|
|
print(json_obj)
|
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
if test_result.status != kunit_parser.TestStatus.SUCCESS:
|
|
|
|
return KunitResult(KunitStatus.TEST_FAILURE, test_result,
|
|
|
|
parse_end - parse_start)
|
|
|
|
|
|
|
|
return KunitResult(KunitStatus.SUCCESS, test_result,
|
|
|
|
parse_end - parse_start)
|
|
|
|
|
|
|
|
def run_tests(linux: kunit_kernel.LinuxSourceTree,
|
|
|
|
request: KunitRequest) -> KunitResult:
|
|
|
|
run_start = time.time()
|
|
|
|
|
|
|
|
config_request = KunitConfigRequest(request.build_dir,
|
|
|
|
request.make_options)
|
|
|
|
config_result = config_tests(linux, config_request)
|
|
|
|
if config_result.status != KunitStatus.SUCCESS:
|
|
|
|
return config_result
|
|
|
|
|
|
|
|
build_request = KunitBuildRequest(request.jobs, request.build_dir,
|
|
|
|
request.alltests,
|
|
|
|
request.make_options)
|
|
|
|
build_result = build_tests(linux, build_request)
|
|
|
|
if build_result.status != KunitStatus.SUCCESS:
|
|
|
|
return build_result
|
|
|
|
|
|
|
|
exec_request = KunitExecRequest(request.timeout, request.build_dir,
|
2021-07-15 16:08:19 +00:00
|
|
|
request.alltests, request.filter_glob,
|
|
|
|
request.kernel_args)
|
2020-05-01 04:27:01 +00:00
|
|
|
parse_request = KunitParseRequest(request.raw_output,
|
2020-08-11 21:27:56 +00:00
|
|
|
request.build_dir,
|
|
|
|
request.json)
|
2021-09-30 22:20:46 +00:00
|
|
|
|
|
|
|
exec_result = exec_tests(linux, exec_request, parse_request)
|
2020-05-01 04:27:01 +00:00
|
|
|
|
|
|
|
run_end = time.time()
|
2019-09-23 09:02:43 +00:00
|
|
|
|
|
|
|
kunit_parser.print_with_timestamp((
|
|
|
|
'Elapsed time: %.3fs total, %.3fs configuring, %.3fs ' +
|
|
|
|
'building, %.3fs running\n') % (
|
2020-05-01 04:27:01 +00:00
|
|
|
run_end - run_start,
|
|
|
|
config_result.elapsed_time,
|
|
|
|
build_result.elapsed_time,
|
|
|
|
exec_result.elapsed_time))
|
2021-09-30 22:20:46 +00:00
|
|
|
return exec_result
|
2020-05-01 04:27:01 +00:00
|
|
|
|
2021-09-22 16:39:21 +00:00
|
|
|
# Problem:
|
|
|
|
# $ kunit.py run --json
|
|
|
|
# works as one would expect and prints the parsed test results as JSON.
|
|
|
|
# $ kunit.py run --json suite_name
|
|
|
|
# would *not* pass suite_name as the filter_glob and print as json.
|
|
|
|
# argparse will consider it to be another way of writing
|
|
|
|
# $ kunit.py run --json=suite_name
|
|
|
|
# i.e. it would run all tests, and dump the json to a `suite_name` file.
|
|
|
|
# So we hackily automatically rewrite --json => --json=stdout
|
|
|
|
pseudo_bool_flag_defaults = {
|
|
|
|
'--json': 'stdout',
|
|
|
|
'--raw_output': 'kunit',
|
|
|
|
}
|
|
|
|
def massage_argv(argv: Sequence[str]) -> Sequence[str]:
|
|
|
|
def massage_arg(arg: str) -> str:
|
|
|
|
if arg not in pseudo_bool_flag_defaults:
|
|
|
|
return arg
|
|
|
|
return f'{arg}={pseudo_bool_flag_defaults[arg]}'
|
|
|
|
return list(map(massage_arg, argv))
|
|
|
|
|
2021-01-15 00:39:11 +00:00
|
|
|
def add_common_opts(parser) -> None:
|
2020-05-01 04:27:01 +00:00
|
|
|
parser.add_argument('--build_dir',
|
|
|
|
help='As in the make command, it specifies the build '
|
|
|
|
'directory.',
|
2021-08-05 23:51:44 +00:00
|
|
|
type=str, default='.kunit', metavar='build_dir')
|
2020-05-01 04:27:01 +00:00
|
|
|
parser.add_argument('--make_options',
|
|
|
|
help='X=Y make option, can be repeated.',
|
|
|
|
action='append')
|
|
|
|
parser.add_argument('--alltests',
|
|
|
|
help='Run all KUnit tests through allyesconfig',
|
|
|
|
action='store_true')
|
2021-02-01 20:55:14 +00:00
|
|
|
parser.add_argument('--kunitconfig',
|
2021-02-22 22:52:41 +00:00
|
|
|
help='Path to Kconfig fragment that enables KUnit tests.'
|
|
|
|
' If given a directory, (e.g. lib/kunit), "/.kunitconfig" '
|
|
|
|
'will get automatically appended.',
|
2021-02-01 20:55:14 +00:00
|
|
|
metavar='kunitconfig')
|
2020-05-01 04:27:01 +00:00
|
|
|
|
2021-05-26 21:24:06 +00:00
|
|
|
parser.add_argument('--arch',
|
|
|
|
help=('Specifies the architecture to run tests under. '
|
|
|
|
'The architecture specified here must match the '
|
|
|
|
'string passed to the ARCH make param, '
|
|
|
|
'e.g. i386, x86_64, arm, um, etc. Non-UML '
|
|
|
|
'architectures run on QEMU.'),
|
|
|
|
type=str, default='um', metavar='arch')
|
|
|
|
|
|
|
|
parser.add_argument('--cross_compile',
|
|
|
|
help=('Sets make\'s CROSS_COMPILE variable; it should '
|
|
|
|
'be set to a toolchain path prefix (the prefix '
|
|
|
|
'of gcc and other tools in your toolchain, for '
|
|
|
|
'example `sparc64-linux-gnu-` if you have the '
|
|
|
|
'sparc toolchain installed on your system, or '
|
|
|
|
'`$HOME/toolchains/microblaze/gcc-9.2.0-nolibc/microblaze-linux/bin/microblaze-linux-` '
|
|
|
|
'if you have downloaded the microblaze toolchain '
|
|
|
|
'from the 0-day website to a directory in your '
|
|
|
|
'home directory called `toolchains`).'),
|
|
|
|
metavar='cross_compile')
|
|
|
|
|
|
|
|
parser.add_argument('--qemu_config',
|
|
|
|
help=('Takes a path to a path to a file containing '
|
|
|
|
'a QemuArchParams object.'),
|
|
|
|
type=str, metavar='qemu_config')
|
|
|
|
|
2021-01-15 00:39:11 +00:00
|
|
|
def add_build_opts(parser) -> None:
|
2020-05-01 04:27:01 +00:00
|
|
|
parser.add_argument('--jobs',
|
|
|
|
help='As in the make command, "Specifies the number of '
|
|
|
|
'jobs (commands) to run simultaneously."',
|
|
|
|
type=int, default=8, metavar='jobs')
|
|
|
|
|
2021-01-15 00:39:11 +00:00
|
|
|
def add_exec_opts(parser) -> None:
|
2020-05-01 04:27:01 +00:00
|
|
|
parser.add_argument('--timeout',
|
|
|
|
help='maximum number of seconds to allow for all tests '
|
|
|
|
'to run. This does not include time taken to build the '
|
|
|
|
'tests.',
|
|
|
|
type=int,
|
|
|
|
default=300,
|
|
|
|
metavar='timeout')
|
2021-02-06 00:08:53 +00:00
|
|
|
parser.add_argument('filter_glob',
|
2021-09-14 21:03:48 +00:00
|
|
|
help='Filter which KUnit test suites/tests run at '
|
|
|
|
'boot-time, e.g. list* or list*.*del_test',
|
2021-02-06 00:08:53 +00:00
|
|
|
type=str,
|
|
|
|
nargs='?',
|
|
|
|
default='',
|
|
|
|
metavar='filter_glob')
|
2021-07-15 16:08:19 +00:00
|
|
|
parser.add_argument('--kernel_args',
|
|
|
|
help='Kernel command-line parameters. Maybe be repeated',
|
|
|
|
action='append')
|
2020-05-01 04:27:01 +00:00
|
|
|
|
2021-01-15 00:39:11 +00:00
|
|
|
def add_parse_opts(parser) -> None:
|
2021-08-05 23:51:44 +00:00
|
|
|
parser.add_argument('--raw_output', help='If set don\'t format output from kernel. '
|
|
|
|
'If set to --raw_output=kunit, filters to just KUnit output.',
|
|
|
|
type=str, nargs='?', const='all', default=None)
|
2020-08-11 21:27:56 +00:00
|
|
|
parser.add_argument('--json',
|
|
|
|
nargs='?',
|
|
|
|
help='Stores test results in a JSON, and either '
|
|
|
|
'prints to stdout or saves to file if a '
|
|
|
|
'filename is specified',
|
|
|
|
type=str, const='stdout', default=None)
|
2019-09-23 09:02:43 +00:00
|
|
|
|
2019-09-23 09:02:44 +00:00
|
|
|
def main(argv, linux=None):
|
2019-09-23 09:02:43 +00:00
|
|
|
parser = argparse.ArgumentParser(
|
|
|
|
description='Helps writing and running KUnit tests.')
|
|
|
|
subparser = parser.add_subparsers(dest='subcommand')
|
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
# The 'run' command will config, build, exec, and parse in one go.
|
2019-09-23 09:02:43 +00:00
|
|
|
run_parser = subparser.add_parser('run', help='Runs KUnit tests.')
|
2020-05-01 04:27:01 +00:00
|
|
|
add_common_opts(run_parser)
|
|
|
|
add_build_opts(run_parser)
|
|
|
|
add_exec_opts(run_parser)
|
|
|
|
add_parse_opts(run_parser)
|
|
|
|
|
|
|
|
config_parser = subparser.add_parser('config',
|
|
|
|
help='Ensures that .config contains all of '
|
|
|
|
'the options in .kunitconfig')
|
|
|
|
add_common_opts(config_parser)
|
|
|
|
|
|
|
|
build_parser = subparser.add_parser('build', help='Builds a kernel with KUnit tests')
|
|
|
|
add_common_opts(build_parser)
|
|
|
|
add_build_opts(build_parser)
|
|
|
|
|
|
|
|
exec_parser = subparser.add_parser('exec', help='Run a kernel with KUnit tests')
|
|
|
|
add_common_opts(exec_parser)
|
|
|
|
add_exec_opts(exec_parser)
|
|
|
|
add_parse_opts(exec_parser)
|
|
|
|
|
|
|
|
# The 'parse' option is special, as it doesn't need the kernel source
|
|
|
|
# (therefore there is no need for a build_dir, hence no add_common_opts)
|
|
|
|
# and the '--file' argument is not relevant to 'run', so isn't in
|
|
|
|
# add_parse_opts()
|
|
|
|
parse_parser = subparser.add_parser('parse',
|
|
|
|
help='Parses KUnit results from a file, '
|
|
|
|
'and parses formatted results.')
|
|
|
|
add_parse_opts(parse_parser)
|
|
|
|
parse_parser.add_argument('file',
|
|
|
|
help='Specifies the file to read results from.',
|
|
|
|
type=str, nargs='?', metavar='input_file')
|
2020-03-23 19:04:59 +00:00
|
|
|
|
2021-09-22 16:39:21 +00:00
|
|
|
cli_args = parser.parse_args(massage_argv(argv))
|
2019-09-23 09:02:43 +00:00
|
|
|
|
2020-08-11 21:27:55 +00:00
|
|
|
if get_kernel_root_path():
|
|
|
|
os.chdir(get_kernel_root_path())
|
|
|
|
|
2019-09-23 09:02:43 +00:00
|
|
|
if cli_args.subcommand == 'run':
|
kunit: Fix TabError, remove defconfig code and handle when there is no kunitconfig
The identation before this code
(`if not os.path.exists(cli_args.build_dir):``)
was with spaces instead of tabs after fixed up merge conflits,
this commit revert spaces to tabs:
[iha@bbking linux]$ tools/testing/kunit/kunit.py run
File "tools/testing/kunit/kunit.py", line 247
if not linux:
^
TabError: inconsistent use of tabs and spaces in indentation
[iha@bbking linux]$ tools/testing/kunit/kunit.py run
Traceback (most recent call last):
File "tools/testing/kunit/kunit.py", line 338, in <module>
main(sys.argv[1:])
File "tools/testing/kunit/kunit.py", line 215, in main
add_config_opts(config_parser)
[iha@bbking linux]$ tools/testing/kunit/kunit.py run
Traceback (most recent call last):
File "tools/testing/kunit/kunit.py", line 337, in <module>
main(sys.argv[1:])
File "tools/testing/kunit/kunit.py", line 255, in main
result = run_tests(linux, request)
File "tools/testing/kunit/kunit.py", line 133, in run_tests
request.defconfig,
AttributeError: 'KunitRequest' object has no attribute 'defconfig'
Handles when there is no .kunitconfig, the error due to merge conflicts
between the following:
commit 9bdf64b35117 ("kunit: use KUnit defconfig by default")
commit 45ba7a893ad8 ("kunit: kunit_tool: Separate out
config/build/exec/parse")
[iha@bbking linux]$ tools/testing/kunit/kunit.py run
Traceback (most recent call last):
File "tools/testing/kunit/kunit.py", line 335, in <module>
main(sys.argv[1:])
File "tools/testing/kunit/kunit.py", line 246, in main
linux = kunit_kernel.LinuxSourceTree()
File "../tools/testing/kunit/kunit_kernel.py", line 109, in __init__
self._kconfig.read_from_file(kunitconfig_path)
File "t../ools/testing/kunit/kunit_config.py", line 88, in read_from_file
with open(path, 'r') as f:
FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
Signed-off-by: Vitor Massaru Iha <vitor@massaru.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
2020-05-29 19:28:45 +00:00
|
|
|
if not os.path.exists(cli_args.build_dir):
|
|
|
|
os.mkdir(cli_args.build_dir)
|
2020-09-28 20:02:27 +00:00
|
|
|
|
2019-09-23 09:02:44 +00:00
|
|
|
if not linux:
|
2021-05-26 21:24:06 +00:00
|
|
|
linux = kunit_kernel.LinuxSourceTree(cli_args.build_dir,
|
|
|
|
kunitconfig_path=cli_args.kunitconfig,
|
|
|
|
arch=cli_args.arch,
|
|
|
|
cross_compile=cli_args.cross_compile,
|
|
|
|
qemu_config_path=cli_args.qemu_config)
|
2020-10-26 16:59:25 +00:00
|
|
|
|
2019-09-23 09:02:43 +00:00
|
|
|
request = KunitRequest(cli_args.raw_output,
|
|
|
|
cli_args.timeout,
|
|
|
|
cli_args.jobs,
|
2019-09-23 09:02:44 +00:00
|
|
|
cli_args.build_dir,
|
2020-03-23 19:04:59 +00:00
|
|
|
cli_args.alltests,
|
2021-02-06 00:08:53 +00:00
|
|
|
cli_args.filter_glob,
|
2021-07-15 16:08:19 +00:00
|
|
|
cli_args.kernel_args,
|
2020-08-11 21:27:56 +00:00
|
|
|
cli_args.json,
|
2020-03-23 19:04:59 +00:00
|
|
|
cli_args.make_options)
|
2019-09-23 09:02:43 +00:00
|
|
|
result = run_tests(linux, request)
|
|
|
|
if result.status != KunitStatus.SUCCESS:
|
|
|
|
sys.exit(1)
|
2020-05-01 04:27:01 +00:00
|
|
|
elif cli_args.subcommand == 'config':
|
2020-09-28 20:02:27 +00:00
|
|
|
if cli_args.build_dir and (
|
|
|
|
not os.path.exists(cli_args.build_dir)):
|
|
|
|
os.mkdir(cli_args.build_dir)
|
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
if not linux:
|
2021-05-26 21:24:06 +00:00
|
|
|
linux = kunit_kernel.LinuxSourceTree(cli_args.build_dir,
|
|
|
|
kunitconfig_path=cli_args.kunitconfig,
|
|
|
|
arch=cli_args.arch,
|
|
|
|
cross_compile=cli_args.cross_compile,
|
|
|
|
qemu_config_path=cli_args.qemu_config)
|
2020-10-26 16:59:25 +00:00
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
request = KunitConfigRequest(cli_args.build_dir,
|
|
|
|
cli_args.make_options)
|
|
|
|
result = config_tests(linux, request)
|
|
|
|
kunit_parser.print_with_timestamp((
|
|
|
|
'Elapsed time: %.3fs\n') % (
|
|
|
|
result.elapsed_time))
|
|
|
|
if result.status != KunitStatus.SUCCESS:
|
|
|
|
sys.exit(1)
|
|
|
|
elif cli_args.subcommand == 'build':
|
|
|
|
if not linux:
|
2021-05-26 21:24:06 +00:00
|
|
|
linux = kunit_kernel.LinuxSourceTree(cli_args.build_dir,
|
|
|
|
kunitconfig_path=cli_args.kunitconfig,
|
|
|
|
arch=cli_args.arch,
|
|
|
|
cross_compile=cli_args.cross_compile,
|
|
|
|
qemu_config_path=cli_args.qemu_config)
|
2020-10-26 16:59:25 +00:00
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
request = KunitBuildRequest(cli_args.jobs,
|
|
|
|
cli_args.build_dir,
|
|
|
|
cli_args.alltests,
|
|
|
|
cli_args.make_options)
|
|
|
|
result = build_tests(linux, request)
|
|
|
|
kunit_parser.print_with_timestamp((
|
|
|
|
'Elapsed time: %.3fs\n') % (
|
|
|
|
result.elapsed_time))
|
|
|
|
if result.status != KunitStatus.SUCCESS:
|
|
|
|
sys.exit(1)
|
|
|
|
elif cli_args.subcommand == 'exec':
|
|
|
|
if not linux:
|
2021-05-26 21:24:06 +00:00
|
|
|
linux = kunit_kernel.LinuxSourceTree(cli_args.build_dir,
|
|
|
|
kunitconfig_path=cli_args.kunitconfig,
|
|
|
|
arch=cli_args.arch,
|
|
|
|
cross_compile=cli_args.cross_compile,
|
|
|
|
qemu_config_path=cli_args.qemu_config)
|
2020-10-26 16:59:25 +00:00
|
|
|
|
2020-05-01 04:27:01 +00:00
|
|
|
exec_request = KunitExecRequest(cli_args.timeout,
|
|
|
|
cli_args.build_dir,
|
2021-02-06 00:08:53 +00:00
|
|
|
cli_args.alltests,
|
2021-07-15 16:08:19 +00:00
|
|
|
cli_args.filter_glob,
|
|
|
|
cli_args.kernel_args)
|
2020-05-01 04:27:01 +00:00
|
|
|
parse_request = KunitParseRequest(cli_args.raw_output,
|
2020-08-11 21:27:56 +00:00
|
|
|
cli_args.build_dir,
|
|
|
|
cli_args.json)
|
2021-09-30 22:20:46 +00:00
|
|
|
result = exec_tests(linux, exec_request, parse_request)
|
2020-05-01 04:27:01 +00:00
|
|
|
kunit_parser.print_with_timestamp((
|
2021-09-30 22:20:46 +00:00
|
|
|
'Elapsed time: %.3fs\n') % (result.elapsed_time))
|
2020-05-01 04:27:01 +00:00
|
|
|
if result.status != KunitStatus.SUCCESS:
|
|
|
|
sys.exit(1)
|
|
|
|
elif cli_args.subcommand == 'parse':
|
|
|
|
if cli_args.file == None:
|
|
|
|
kunit_output = sys.stdin
|
|
|
|
else:
|
|
|
|
with open(cli_args.file, 'r') as f:
|
|
|
|
kunit_output = f.read().splitlines()
|
|
|
|
request = KunitParseRequest(cli_args.raw_output,
|
2020-10-21 07:16:03 +00:00
|
|
|
None,
|
2020-08-11 21:27:56 +00:00
|
|
|
cli_args.json)
|
2021-09-30 22:20:46 +00:00
|
|
|
result = parse_tests(request, kunit_output)
|
2020-05-01 04:27:01 +00:00
|
|
|
if result.status != KunitStatus.SUCCESS:
|
|
|
|
sys.exit(1)
|
2019-09-23 09:02:43 +00:00
|
|
|
else:
|
|
|
|
parser.print_help()
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
2019-09-23 09:02:44 +00:00
|
|
|
main(sys.argv[1:])
|