Add -extra-arg-clang-tidy to {clang-tidy-diff,run-clang-tidy}.py

[Xavier]

Summary

This small patch adds a new -extra-arg-clang-tidy option to clang-tidy-diff and run-clang-tidy scripts. This is especially handy in addition to the -checks option, to tune the executed checks.

Example:

clang-tidy-diff.py -checks='-*,clang-analyzer-*' -extra-arg-clang-tidy='-warnings-as-errors=-*,clang-analyzer-*'

[Xavier]

Note: manually tested the two scripts;

• For clang-tidy-diff.py

git diff -U0 --no-prefix --no-color $(git merge-base origin/master HEAD)..HEAD \
    | ~/git/llvm-project/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py -quiet -clang-tidy-binary clang-tidy-12 -path=build -j8 \
    -checks='-*,clang-analyzer-*' -extra-arg-clang-tidy='-warnings-as-errors=-*,clang-analyzer-*'

• For run-clang-tidy.py

~/git/llvm-project/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py \
    -checks='-*,clang-analyzer-*' -clang-tidy-binary clang-tidy-12 -p build -extra-arg-clang-tidy='-warnings-as-errors=-*,clang-analyzer-*'

[Xavier]

I realize there is a much better approach: https://reviews.llvm.org/D49864

[Xavier]

https://reviews.llvm.org/D49864

clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py

def main():
   parser.add_argument('-extra-arg', dest='extra_arg',
                       action='append', default=[],
                       help='Additional argument to append to the compiler '
                       'command line.')
   parser.add_argument('-extra-arg-before', dest='extra_arg_before',
                       action='append', default=[],
                       help='Additional argument to prepend to the compiler '
                       'command line.')
+  parser.add_argument('-extra-arg-clang-tidy', dest='extra_arg_clang_tidy',
+                      action='append', default=[],
+                      help='Additional argument to use with clang-tidy.')
   parser.add_argument('-quiet', action='store_true', default=False,
                       help='Run clang-tidy in quiet mode')
   clang_tidy_args = []
   argv = sys.argv[1:]
   if '--' in argv:
     clang_tidy_args.extend(argv[argv.index('--'):])
     argv = argv[:argv.index('--')]
 
def main():
   if args.build_path is not None:
     common_clang_tidy_args.append('-p=%s' % args.build_path)
   if args.use_color:
     common_clang_tidy_args.append('--use-color')
   for arg in args.extra_arg:
     common_clang_tidy_args.append('-extra-arg=%s' % arg)
   for arg in args.extra_arg_before:
     common_clang_tidy_args.append('-extra-arg-before=%s' % arg)
+  common_clang_tidy_args += args.extra_arg_clang_tidy
 
   for name in lines_by_file:
     line_filter_json = json.dumps(
       [{"name": name, "lines": lines_by_file[name]}],
       separators=(',', ':'))
 
     # Run clang-tidy on files containing changes.
     command = [args.clang_tidy_binary]

clang-tools-extra/clang-tidy/tool/run-clang-tidy.py

 def make_absolute(f, directory):
   if os.path.isabs(f):
     return f
   return os.path.normpath(os.path.join(directory, f))
 
 
 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,
-                        line_filter):
+                        extra_arg, extra_arg_before, extra_arg_clang_tidy,
+                        quiet, config, line_filter):
   """Gets a command line for clang-tidy."""
   start = [clang_tidy_binary, '--use-color']
   if allow_enabling_alpha_checkers:
     start.append('-allow-enabling-analyzer-alpha-checkers')
   if header_filter is not None:
     start.append('-header-filter=' + header_filter)
   if line_filter is not None:
     start.append('-line-filter=' + line_filter)
for arg in extra_arg:
       start.append('-extra-arg=%s' % arg)
   for arg in extra_arg_before:
       start.append('-extra-arg-before=%s' % arg)
   start.append('-p=' + build_path)
   if quiet:
       start.append('-quiet')
   if config:
       start.append('-config=' + config)
+  start += extra_arg_clang_tidy
   start.append(f)
   return start
 
 
 def merge_replacement_files(tmpdir, mergefile):
   """Merge all replacement files in a directory into a single file"""
   # The fixes suggested by clang-tidy >= 4.0.0 are given under
   # the top level key 'Diagnostics' in the output yaml files

 def run_tidy(args, tmpdir, build_path, queue, lock, failed_files):
   """Takes filenames out of queue and runs clang-tidy on them."""
   while True:
     name = queue.get()
     invocation = get_tidy_invocation(name, args.clang_tidy_binary, args.checks,
                                      tmpdir, build_path, args.header_filter,
                                      args.allow_enabling_alpha_checkers,
                                      args.extra_arg, args.extra_arg_before,
-                                     args.quiet, args.config, args.line_filter)
+                                     args.extra_arg_clang_tidy, args.quiet,
+                                     args.config, args.line_filter)
 
     proc = subprocess.Popen(invocation, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     output, err = proc.communicate()
     if proc.returncode != 0:
       if proc.returncode < 0:
         msg = "%s: terminated by signal %d\n" % (name, -proc.returncode)
         err += msg.encode('utf-8')
       failed_files.append(name)
def main():
   parser.add_argument('-extra-arg', dest='extra_arg',
                       action='append', default=[],
                       help='Additional argument to append to the compiler '
                       'command line.')
   parser.add_argument('-extra-arg-before', dest='extra_arg_before',
                       action='append', default=[],
                       help='Additional argument to prepend to the compiler '
                       'command line.')
+  parser.add_argument('-extra-arg-clang-tidy', dest='extra_arg_clang_tidy',
+                      action='append', default=[],
+                      help='Additional argument to use with clang-tidy.')
   parser.add_argument('-quiet', action='store_true',
                       help='Run clang-tidy in quiet mode')
   args = parser.parse_args()
 
   db_path = 'compile_commands.json'
 
   if args.build_path is not None:
     build_path = args.build_path