Skip to content

Commit

Permalink
kunit: use KUnit defconfig by default
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vitor Massaru Iha authored and Shuah Khan committed May 22, 2020
1 parent ddbd60c commit 9bdf64b
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions tools/testing/kunit/kunit.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
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]

Expand All @@ -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:
Expand Down Expand Up @@ -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 '
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 9bdf64b

Please sign in to comment.