kunit: use KUnit defconfig by default

To improve the usability of KUnit, defconfig is used
by default if no kunitconfig is present.

 * https://bugzilla.kernel.org/show_bug.cgi?id=205259

Fixed up minor merge conflicts - Shuah Khan <skhan@linuxfoundation.org>

Signed-off-by: Vitor Massaru Iha <vitor@massaru.org>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
index f3a1803bd71f3346060224dcb4cb678245059954..ec73b07d126582ff5481d54c364d6533bb680277 100755 (executable)
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -32,8 +32,8 @@ KunitExecRequest = namedtuple('KunitExecRequest',
 KunitParseRequest = namedtuple('KunitParseRequest',
                               ['raw_output', 'input_data'])
 KunitRequest = namedtuple('KunitRequest', ['raw_output','timeout', 'jobs',
-                                          'build_dir', 'defconfig',
-                                          'alltests', 'make_options'])
+                                          'build_dir', 'alltests',
+                                          'make_options'])
 
 KernelDirectoryPath = sys.argv[0].split('tools/testing/kunit/')[0]
 
@@ -60,8 +60,7 @@ def config_tests(linux: kunit_kernel.LinuxSourceTree,
        kunit_parser.print_with_timestamp('Configuring KUnit Kernel ...')
 
        config_start = time.time()
-       if request.defconfig:
-               create_default_kunitconfig()
+       create_default_kunitconfig()
        success = linux.build_reconfig(request.build_dir, request.make_options)
        config_end = time.time()
        if not success:
@@ -177,11 +176,6 @@ def add_common_opts(parser):
                            help='Run all KUnit tests through allyesconfig',
                            action='store_true')
 
-def add_config_opts(parser):
-       parser.add_argument('--defconfig',
-                           help='Uses a default .kunitconfig.',
-                           action='store_true')
-
 def add_build_opts(parser):
        parser.add_argument('--jobs',
                            help='As in the make command, "Specifies  the number of '
@@ -210,7 +204,6 @@ def main(argv, linux=None):
        # The 'run' command will config, build, exec, and parse in one go.
        run_parser = subparser.add_parser('run', help='Runs KUnit tests.')
        add_common_opts(run_parser)
-       add_config_opts(run_parser)
        add_build_opts(run_parser)
        add_exec_opts(run_parser)
        add_parse_opts(run_parser)
@@ -258,7 +251,6 @@ def main(argv, linux=None):
                                       cli_args.timeout,
                                       cli_args.jobs,
                                       cli_args.build_dir,
-                                      cli_args.defconfig,
                                       cli_args.alltests,
                                       cli_args.make_options)
                result = run_tests(linux, request)