Skip to content

[run-clang-tidy] Accept export directory if PyYAML is not installed #69700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PiotrZSL merged 1 commit into from
Oct 20, 2023
Merged

[run-clang-tidy] Accept export directory if PyYAML is not installed #69700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,15 @@ def main():
"parameter is a directory, the fixes of each compilation unit are "
"stored in individual yaml files in the directory.",
)
else:
parser.add_argument(
"-export-fixes",
metavar="DIRECTORY",
dest="export_fixes",
help="A directory to store suggested fixes in, which can be applied "
"with clang-apply-replacements. The fixes of each compilation unit are "
"stored in individual yaml files in the directory.",
)
parser.add_argument(
"-extra-arg",
dest="extra_arg",
Expand Down Expand Up @@ -270,7 +279,12 @@ def main():
):
os.makedirs(args.export_fixes)

if not os.path.isdir(args.export_fixes) and yaml:
if not os.path.isdir(args.export_fixes):
if not yaml:
raise RuntimeError(
"Cannot combine fixes in one yaml file. Either install PyYAML or specify an output directory."
)

combine_fixes = True

if os.path.isdir(args.export_fixes):
Expand Down
16 changes: 15 additions & 1 deletion clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,15 @@ def main():
"parameter is a directory, the fixes of each compilation unit are "
"stored in individual yaml files in the directory.",
)
else:
parser.add_argument(
"-export-fixes",
metavar="directory",
dest="export_fixes",
help="A directory to store suggested fixes in, which can be applied "
"with clang-apply-replacements. The fixes of each compilation unit are "
"stored in individual yaml files in the directory.",
)
parser.add_argument(
"-j",
type=int,
Expand Down Expand Up @@ -401,7 +410,12 @@ def main():
):
os.makedirs(args.export_fixes)

if not os.path.isdir(args.export_fixes) and yaml:
if not os.path.isdir(args.export_fixes):
if not yaml:
raise RuntimeError(
"Cannot combine fixes in one yaml file. Either install PyYAML or specify an output directory."
)

combine_fixes = True

if os.path.isdir(args.export_fixes):
Expand Down