Safe fallback for known "conflicting overrides" during rename.

tools/clang/scripts/run_tool.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Wrapper script to help run clang tools across Chromium code.
 
 How to use run_tool.py:
 If you want to run a clang tool across all Chromium code:
 run_tool.py <tool> <path/to/compiledb>
 
@@ skipping 90 matching lines @@
     toolname: Name of the clang tool to execute.
     tool_args: Arguments to be passed to the clang tool. Can be None.
     build_directory: Directory that contains the compile database.
     filename: The file to run the clang tool over.
 
   Returns:
     A dictionary that must contain the key "status" and a boolean value
     associated with it.
 
     If status is True, then the generated output is stored with the key
-    "stdout_text" in the dictionary.
+    "stdout_text" in the dictionary.  Same for "stderr_text".
 
     Otherwise, the filename and the output from stderr are associated with the
     keys "filename" and "stderr_text" respectively.
   """
   args = [toolname, '-p', build_directory, filename]
   if (tool_args):
     args.extend(tool_args)
   command = subprocess.Popen(
       args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   stdout_text, stderr_text = command.communicate()
   if command.returncode != 0:
     return {'status': False, 'filename': filename, 'stderr_text': stderr_text}
   else:
-    return {'status': True, 'filename': filename, 'stdout_text': stdout_text}
+    return {'status': True, 'filename': filename, 'stdout_text': stdout_text,
+            'stderr_text': stderr_text}
 
 
 class _CompilerDispatcher(object):
   """Multiprocessing controller for running clang tools in parallel."""
 
   def __init__(self, toolname, tool_args, build_directory, filenames):
     """Initializer method.
 
     Args:
       toolname: Path to the tool to execute.
@@ skipping 25 matching lines @@
 
   def __ProcessResult(self, result):
     """Handles result processing.
 
     Args:
       result: The result dictionary returned by _ExecuteTool.
     """
     if result['status']:
       self.__success_count += 1
       sys.stdout.write(result['stdout_text'])
+      sys.stderr.write(result['stderr_text'])

[Łukasz Anforowicz, 2017/01/05 18:45:19]

Needed to stop eating stderr (which might contain warnings) upon success.

[danakj, 2017/01/05 18:55:19]

assert if we're going to print things seems best so I don't think u need these
changes?

[Łukasz Anforowicz, 2017/01/05 19:04:44]

Okay - reverted.  I think I still want to do this change, but I'll do this in a
separate CL.

     else:
       self.__failed_count += 1
       sys.stderr.write('\nFailed to process %s\n' % result['filename'])
       sys.stderr.write(result['stderr_text'])
       sys.stderr.write('\n')
     done_count = self.__success_count + self.__failed_count
     percentage = (float(done_count) / len(self.__filenames)) * 100
     sys.stderr.write(
         'Processed %d files with %s tool (%d failures) [%.2f%%]\r' %
         (done_count, self.__toolname, self.__failed_count, percentage))
@@ skipping 41 matching lines @@
 
   dispatcher = _CompilerDispatcher(args.tool, args.tool_args,
                                    args.compile_database,
                                    source_filenames)
   dispatcher.Run()
   return -dispatcher.failed_count
 
 
 if __name__ == '__main__':
   sys.exit(main())