Safe fallback for known "conflicting overrides" during rename.

tools/clang/scripts/run_tool.py

Index: tools/clang/scripts/run_tool.py
diff --git a/tools/clang/scripts/run_tool.py b/tools/clang/scripts/run_tool.py
index c3482df0c39b6de49cb968b67f54bb865b8894fb..d66034e141cc3d8191c7aacb4d0bf403c993a61e 100755
--- a/tools/clang/scripts/run_tool.py
+++ b/tools/clang/scripts/run_tool.py
@@ -108,7 +108,7 @@ def _ExecuteTool(toolname, tool_args, build_directory, filename):
     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.
@@ -122,7 +122,8 @@ def _ExecuteTool(toolname, tool_args, build_directory, filename):
   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):
@@ -168,6 +169,7 @@ class _CompilerDispatcher(object):
     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'])