[clang-tools-extra] 4294bca - [clang-tidy] Add exit code support to clang-tidy-diff.py
Piotr Zegar via cfe-commits
cfe-commits at lists.llvm.org
Thu Aug 31 13:02:15 PDT 2023
Author: Piotr Zegar
Date: 2023-08-31T19:58:15Z
New Revision: 4294bca5e4f6e6e8cfdbd9fbe8751c5e5415fd47
URL: https://github.com/llvm/llvm-project/commit/4294bca5e4f6e6e8cfdbd9fbe8751c5e5415fd47
DIFF: https://github.com/llvm/llvm-project/commit/4294bca5e4f6e6e8cfdbd9fbe8751c5e5415fd47.diff
LOG: [clang-tidy] Add exit code support to clang-tidy-diff.py
Modify script to fail when some run clang-tidy
command fails. Based on run_clang-tidy.
Fixes: #65000
Reviewed By: carlosgalvezp
Differential Revision: https://reviews.llvm.org/D158929
Added:
Modified:
clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
clang-tools-extra/docs/ReleaseNotes.rst
Removed:
################################################################################
diff --git a/clang-tools-extra/clang-tidy/tool/clang-tidy-
diff .py b/clang-tools-extra/clang-tidy/tool/clang-tidy-
diff .py
index c8a83bd49f0d2e..06f2cebe7c09e6 100755
--- a/clang-tools-extra/clang-tidy/tool/clang-tidy-
diff .py
+++ b/clang-tools-extra/clang-tidy/tool/clang-tidy-
diff .py
@@ -49,7 +49,7 @@
import queue as queue
-def run_tidy(task_queue, lock, timeout):
+def run_tidy(task_queue, lock, timeout, failed_files):
watchdog = None
while True:
command = task_queue.get()
@@ -63,6 +63,14 @@ def run_tidy(task_queue, lock, timeout):
watchdog.start()
stdout, stderr = proc.communicate()
+ if proc.returncode != 0:
+ if proc.returncode < 0:
+ msg = "Terminated by signal %d : %s\n" % (
+ -proc.returncode,
+ " ".join(command),
+ )
+ stderr += msg.encode("utf-8")
+ failed_files.append(command)
with lock:
sys.stdout.write(stdout.decode("utf-8") + "\n")
@@ -84,9 +92,9 @@ def run_tidy(task_queue, lock, timeout):
task_queue.task_done()
-def start_workers(max_tasks, tidy_caller, task_queue, lock, timeout):
+def start_workers(max_tasks, tidy_caller, arguments):
for _ in range(max_tasks):
- t = threading.Thread(target=tidy_caller, args=(task_queue, lock, timeout))
+ t = threading.Thread(target=tidy_caller, args=arguments)
t.daemon = True
t.start()
@@ -259,8 +267,13 @@ def main():
# A lock for console output.
lock = threading.Lock()
+ # List of files with a non-zero return code.
+ failed_files = []
+
# Run a pool of clang-tidy workers.
- start_workers(max_task_count, run_tidy, task_queue, lock, args.timeout)
+ start_workers(
+ max_task_count, run_tidy, (task_queue, lock, args.timeout, failed_files)
+ )
# Form the common args list.
common_clang_tidy_args = []
@@ -301,8 +314,15 @@ def main():
task_queue.put(command)
+ # Application return code
+ return_code = 0
+
# Wait for all threads to be done.
task_queue.join()
+ # Application return code
+ return_code = 0
+ if failed_files:
+ return_code = 1
if yaml and args.export_fixes:
print("Writing fixes to " + args.export_fixes + " ...")
@@ -311,9 +331,11 @@ def main():
except:
sys.stderr.write("Error exporting fixes.\n")
traceback.print_exc()
+ return_code = 1
if tmpdir:
shutil.rmtree(tmpdir)
+ sys.exit(return_code)
if __name__ == "__main__":
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst
index 69bc981a7931ea..69f7268bc3779d 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -113,6 +113,10 @@ Improvements to clang-tidy
- Improved `--dump-config` to print check options in alphabetical order.
+- Improved :program:`clang-tidy-
diff .py` script. It now returns exit code `1`
+ if any :program:`clang-tidy` subprocess exits with a non-zero code or if
+ exporting fixes fails.
+
New checks
^^^^^^^^^^
More information about the cfe-commits
mailing list