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

[linux-2.6-microblaze.git] / tools / testing / kunit / kunit.py

diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
index 6276ce0..5a93145 100755 (executable)
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -16,6 +16,7 @@ assert sys.version_info >= (3, 7), "Python version is too old"
 
 from collections import namedtuple
 from enum import Enum, auto
+from typing import Iterable
 
 import kunit_config
 import kunit_json
@@ -30,12 +31,13 @@ KunitBuildRequest = namedtuple('KunitBuildRequest',
                               ['jobs', 'build_dir', 'alltests',
                                'make_options'])
 KunitExecRequest = namedtuple('KunitExecRequest',
-                             ['timeout', 'build_dir', 'alltests', 'filter_glob'])
+                              ['timeout', 'build_dir', 'alltests',
+                               'filter_glob', 'kernel_args'])
 KunitParseRequest = namedtuple('KunitParseRequest',
                               ['raw_output', 'input_data', 'build_dir', 'json'])
 KunitRequest = namedtuple('KunitRequest', ['raw_output','timeout', 'jobs',
                                           'build_dir', 'alltests', 'filter_glob',
-                                          'json', 'make_options'])
+                                          'kernel_args', 'json', 'make_options'])
 
 KernelDirectoryPath = sys.argv[0].split('tools/testing/kunit/')[0]
 
@@ -94,6 +96,7 @@ def exec_tests(linux: kunit_kernel.LinuxSourceTree,
        kunit_parser.print_with_timestamp('Starting KUnit Kernel ...')
        test_start = time.time()
        result = linux.run_kernel(
+               args=request.kernel_args,
                timeout=None if request.alltests else request.timeout,
                 filter_glob=request.filter_glob,
                build_dir=request.build_dir)
@@ -112,7 +115,16 @@ def parse_tests(request: KunitParseRequest) -> KunitResult:
                                              'Tests not Parsed.')
 
        if request.raw_output:
-               kunit_parser.raw_output(request.input_data)
+               output: Iterable[str] = request.input_data
+               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())
+
        else:
                test_result = kunit_parser.parse_run_tests(request.input_data)
        parse_end = time.time()
@@ -133,7 +145,6 @@ def parse_tests(request: KunitParseRequest) -> KunitResult:
        return KunitResult(KunitStatus.SUCCESS, test_result,
                                parse_end - parse_start)
 
-
 def run_tests(linux: kunit_kernel.LinuxSourceTree,
              request: KunitRequest) -> KunitResult:
        run_start = time.time()
@@ -152,7 +163,8 @@ def run_tests(linux: kunit_kernel.LinuxSourceTree,
                return build_result
 
        exec_request = KunitExecRequest(request.timeout, request.build_dir,
-                                       request.alltests, request.filter_glob)
+                                request.alltests, request.filter_glob,
+                                request.kernel_args)
        exec_result = exec_tests(linux, exec_request)
        if exec_result.status != KunitStatus.SUCCESS:
                return exec_result
@@ -178,7 +190,7 @@ def add_common_opts(parser) -> None:
        parser.add_argument('--build_dir',
                            help='As in the make command, it specifies the build '
                            'directory.',
-                            type=str, default='.kunit', metavar='build_dir')
+                           type=str, default='.kunit', metavar='build_dir')
        parser.add_argument('--make_options',
                            help='X=Y make option, can be repeated.',
                            action='append')
@@ -238,10 +250,14 @@ def add_exec_opts(parser) -> None:
                            nargs='?',
                            default='',
                            metavar='filter_glob')
+       parser.add_argument('--kernel_args',
+                           help='Kernel command-line parameters. Maybe be repeated',
+                            action='append')
 
 def add_parse_opts(parser) -> None:
-       parser.add_argument('--raw_output', help='don\'t format output from kernel',
-                           action='store_true')
+       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)
        parser.add_argument('--json',
                            nargs='?',
                            help='Stores test results in a JSON, and either '
@@ -309,6 +325,7 @@ def main(argv, linux=None):
                                       cli_args.build_dir,
                                       cli_args.alltests,
                                       cli_args.filter_glob,
+                                      cli_args.kernel_args,
                                       cli_args.json,
                                       cli_args.make_options)
                result = run_tests(linux, request)
@@ -363,7 +380,8 @@ def main(argv, linux=None):
                exec_request = KunitExecRequest(cli_args.timeout,
                                                cli_args.build_dir,
                                                cli_args.alltests,
-                                               cli_args.filter_glob)
+                                               cli_args.filter_glob,
+                                               cli_args.kernel_args)
                exec_result = exec_tests(linux, exec_request)
                parse_request = KunitParseRequest(cli_args.raw_output,
                                                  exec_result.result,