Skip to content

Commit

Permalink
Fix typo in new -config-file option
Browse files Browse the repository at this point in the history
The new -config-file option introduced by 9e1f4f1 was accidentally
referenced as args.config_path on the python side. This patch renames
args.config_path to args.config_file.

To avoid confusion with python file objects, the input argument for
get_tidy_invocation has been renamed from config_path to
config_file_path.

See GitHub issue #54728 for a discussion.
  • Loading branch information
aaronmondal authored and AaronBallman committed Apr 5, 2022
1 parent 01055ed commit 04b42c9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
Expand Up @@ -90,7 +90,7 @@ def make_absolute(f, directory):

def get_tidy_invocation(f, clang_tidy_binary, checks, tmpdir, build_path,
header_filter, allow_enabling_alpha_checkers,
extra_arg, extra_arg_before, quiet, config_path,
extra_arg, extra_arg_before, quiet, config_file_path,
config, line_filter, use_color):
"""Gets a command line for clang-tidy."""
start = [clang_tidy_binary]
Expand Down Expand Up @@ -121,8 +121,8 @@ def get_tidy_invocation(f, clang_tidy_binary, checks, tmpdir, build_path,
start.append('-p=' + build_path)
if quiet:
start.append('-quiet')
if config_path:
start.append('--config-file=' + config_path)
if config_file_path:
start.append('--config-file=' + config_file_path)
elif config:
start.append('-config=' + config)
start.append(f)
Expand Down Expand Up @@ -194,7 +194,7 @@ def run_tidy(args, clang_tidy_binary, tmpdir, build_path, queue, lock,
tmpdir, build_path, args.header_filter,
args.allow_enabling_alpha_checkers,
args.extra_arg, args.extra_arg_before,
args.quiet, args.config_path, args.config,
args.quiet, args.config_file, args.config,
args.line_filter, args.use_color)

proc = subprocess.Popen(invocation, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
Expand Down Expand Up @@ -304,7 +304,7 @@ def main():
None, build_path, args.header_filter,
args.allow_enabling_alpha_checkers,
args.extra_arg, args.extra_arg_before,
args.quiet, args.config_path, args.config,
args.quiet, args.config_file, args.config,
args.line_filter, args.use_color)
invocation.append('-list-checks')
invocation.append('-')
Expand Down

0 comments on commit 04b42c9

Please sign in to comment.